6 files changed, 2 insertions, 10 deletions
diff --git a/src/core/info.txt b/src/core/info.txt
index d4a48f378..813febac3 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -5,12 +5,7 @@ load_on auto
 define CORE_MODULE
 
 <requires>
-rng
-filters
-hex
-bigint
-libstate
-timer
+utils
 </requires>
 
 <add>
@@ -26,9 +21,5 @@ exceptn.cpp
 exceptn.h
 mem_pool.cpp
 mem_pool.h
-mutex.h
 secmem.h
-sym_algo.h
-symkey.cpp
-symkey.h
 </add>
diff --git a/src/core/sym_algo.h b/src/sym_algo/sym_algo.h
index 02343ed56..02343ed56 100644
--- a/src/core/sym_algo.h
+++ b/src/sym_algo/sym_algo.h
diff --git a/src/core/symkey.cpp b/src/sym_algo/symkey.cpp
index 7cc1bce64..7cc1bce64 100644
--- a/src/core/symkey.cpp
+++ b/src/sym_algo/symkey.cpp
diff --git a/src/core/symkey.h b/src/sym_algo/symkey.h
index f3211eb0f..f3211eb0f 100644
--- a/src/core/symkey.h
+++ b/src/sym_algo/symkey.h
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 0f0a18a35..127ea5e2f 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -24,6 +24,7 @@ entropy.cpp
 loadstor.h
 mem_ops.h
 mlock.cpp
+mutex.h
 parsing.cpp
 parsing.h
 rotate.h
diff --git a/src/core/mutex.h b/src/utils/mutex.h
index e30b48eb0..e30b48eb0 100644
--- a/src/core/mutex.h
+++ b/src/utils/mutex.h