diff --git a/libIRDB/include/util/IRDB_Objects.hpp b/libIRDB/include/core/IRDB_Objects.hpp
similarity index 100%
rename from libIRDB/include/util/IRDB_Objects.hpp
rename to libIRDB/include/core/IRDB_Objects.hpp
diff --git a/libtransform/include/transform_step.h b/libIRDB/include/core/transform_step.h
similarity index 95%
rename from libtransform/include/transform_step.h
rename to libIRDB/include/core/transform_step.h
index 445a4d1f64782c4777abc4008d3fa432705b9811..40f09fbd7d034a26824842db32f71b0ff6c2723e 100644
--- a/libtransform/include/transform_step.h
+++ b/libIRDB/include/core/transform_step.h
@@ -1,8 +1,6 @@
 #ifndef TransformStep_h
 #define TransformStep_h
 
-#include <libIRDB-util.hpp>
-
 
 namespace Transform_SDK
 {
diff --git a/libIRDB/include/libIRDB-core.hpp b/libIRDB/include/libIRDB-core.hpp
index 5680c2fe1a987e84bdcfba6cddd6ee4bb575ac7c..96d47e3053cbafb5bcbb0cebfd4b46e5039ea684 100644
--- a/libIRDB/include/libIRDB-core.hpp
+++ b/libIRDB/include/libIRDB-core.hpp
@@ -56,6 +56,8 @@ class Instruction_t; // forward decl for many classes
 #include <core/eh.hpp>
 #include <core/fileir.hpp>
 #include <core/pqxxdb.hpp>
+#include <core/IRDB_Objects.hpp>
+#include <core/transform_step.h>
 
 };
 
diff --git a/libIRDB/include/libIRDB-util.hpp b/libIRDB/include/libIRDB-util.hpp
index dad1f7ead3becb33cba6ef2426c4190db08d4c9f..c1d852e1ef7df82667b1eba23af7b29c3b844f5e 100644
--- a/libIRDB/include/libIRDB-util.hpp
+++ b/libIRDB/include/libIRDB-util.hpp
@@ -36,7 +36,6 @@ namespace libIRDB
 #include <util/insn_preds.hpp>
 #include <util/IBT_Provenance.hpp>
 #include <util/params.hpp>
-#include <util/IRDB_Objects.hpp>
 
 };
 
diff --git a/libIRDB/src/util/IRDB_Objects.cpp b/libIRDB/src/core/IRDB_Objects.cpp
similarity index 99%
rename from libIRDB/src/util/IRDB_Objects.cpp
rename to libIRDB/src/core/IRDB_Objects.cpp
index b586e1e1b970574b7f664d27ff769f9f5599bb67..60f620c835cfb961a02e7e96fe28387d575917fd 100644
--- a/libIRDB/src/util/IRDB_Objects.cpp
+++ b/libIRDB/src/core/IRDB_Objects.cpp
@@ -1,6 +1,5 @@
 #include <map>
 #include <libIRDB-core.hpp>
-#include <libIRDB-util.hpp>
 #include <utils.hpp>
 #include <utility>
 #include <memory>
diff --git a/libIRDB/src/core/SConscript b/libIRDB/src/core/SConscript
index c42f7419ef14a492131321c105f8738bef81618f..fc85c1a7d9e881bcd692407eb5eeb2c4e695ec90 100644
--- a/libIRDB/src/core/SConscript
+++ b/libIRDB/src/core/SConscript
@@ -25,6 +25,7 @@ files=  '''
 	reloc.cpp
 	decode_cs.cpp
 	operand_cs.cpp
+	IRDB_Objects.cpp
 '''
 unused_files='''
 	decode_bea.cpp
diff --git a/libIRDB/src/util/SConscript b/libIRDB/src/util/SConscript
index 673d28ffa8f9e2f8c23ad3228bf9b7a18f201f76..202ea107ef42cee0a01befee0d72f5adedc9c452 100644
--- a/libIRDB/src/util/SConscript
+++ b/libIRDB/src/util/SConscript
@@ -10,7 +10,6 @@ files=  '''
 	insn_preds.cpp
         IBT_Provenance.cpp
 	params.cpp
-	IRDB_Objects.cpp
 	'''
 cpppath=''' 
 	$SECURITY_TRANSFORMS_HOME/include/
diff --git a/libIRDB/test/SConscript b/libIRDB/test/SConscript
index e157d2ddc1532a02a43919bc61900a2a3a36b0bf..1b75f34de41d11fcec30ab96d0adb746d0943ec7 100644
--- a/libIRDB/test/SConscript
+++ b/libIRDB/test/SConscript
@@ -17,7 +17,6 @@ if 'build_tools' not in myenv or myenv['build_tools'] is None or int(myenv['buil
 		 $SECURITY_TRANSFORMS_HOME/libEXEIO/include 
 		 $SECURITY_TRANSFORMS_HOME/libehp/include 
 		 $SECURITY_TRANSFORMS_HOME/third_party/elfio-code
-		 $SECURITY_TRANSFORMS_HOME/libtransform/include
 		'''
 
 	LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
diff --git a/libIRDB/test/fill_in_cfg.hpp b/libIRDB/test/fill_in_cfg.hpp
index e4e3fa5587838ccbeeb515fe21740b4089afaf0b..53007c207fbaa83a18fc5723c50d94ecbfda5085 100644
--- a/libIRDB/test/fill_in_cfg.hpp
+++ b/libIRDB/test/fill_in_cfg.hpp
@@ -2,13 +2,11 @@
 #define fill_in_cfg_hpp
 
 #include <libIRDB-core.hpp>
-#include <libIRDB-util.hpp>
 #include <stdlib.h>
 #include <map>
 #include <exeio.h>
-#include "transform_step.h"
 
-class PopulateCFG : public Transform_SDK::TransformStep_t
+class PopulateCFG : public libIRDB::Transform_SDK::TransformStep_t
 {
     public:
         PopulateCFG(libIRDB::pqxxDB_t* p_pqxx_interface = NULL,
diff --git a/tools/thanos/thanos.cpp b/tools/thanos/thanos.cpp
index 98ba8207940ddffe9599d0601f72ff44ad0a1bf2..92605d2d13910c6beba4d0e98f5a466cd9e2f131 100644
--- a/tools/thanos/thanos.cpp
+++ b/tools/thanos/thanos.cpp
@@ -1,3 +1,4 @@
+#include <libIRDB-core.hpp>
 #include <libIRDB-util.hpp>
 #include <fcntl.h>
 #include <dlfcn.h>
@@ -6,7 +7,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <map>
-#include <transform_step.h>
 #include <algorithm>
 #include <assert.h>