diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9b1e729e318442b4987462ceaeabfd6c3f2ece9..778bd330d15ffad200655c3283e0d8d27d563fe9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,9 @@ add_subdirectory(Detector)
 # add_subdirectory(Digitisers)
 # add_subdirectory(Examples)
 add_subdirectory(Generator)
+# add_subdirectory(Reconstruction)
+add_subdirectory(Simulation)
+# add_subdirectory(Utilities)
 
 ##############################################################################
 # INSTALL
diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6cb2318c7955c4d1a0f0fbfa587c8fd6d76f077c
--- /dev/null
+++ b/Simulation/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+#add_subdirectory(DetSimAna)
+#add_subdirectory(DetSimCore)
+#add_subdirectory(DetSimDedx)
+#add_subdirectory(DetSimFastModel)
+#add_subdirectory(DetSimGeom)
+add_subdirectory(DetSimInterface)
+#add_subdirectory(DetSimSD)
diff --git a/Simulation/DetSimInterface/CMakeLists.txt b/Simulation/DetSimInterface/CMakeLists.txt
index 8950d300d14e0df6f5319d26bd209a2a79a28b31..ce48e904b3847b1a23820610fb23ac9b44a67a73 100644
--- a/Simulation/DetSimInterface/CMakeLists.txt
+++ b/Simulation/DetSimInterface/CMakeLists.txt
@@ -1,15 +1,13 @@
 
-gaudi_subdir(DetSimInterface v0r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
 
 # DetSimInterface (headers only)
 set(DetSimInterface_srcs
     src/IDetSimSvc.cpp
 )
 
-gaudi_add_library(DetSimInterface ${DetSimInterface_srcs}
-    PUBLIC_HEADERS DetSimInterface
-    LINK_LIBRARIES GaudiKernel
+gaudi_add_library(DetSimInterface
+                 SOURCES ${DetSimInterface_srcs}
+                 LINK Gaudi::GaudiKernel
 )
 
+
diff --git a/Simulation/DetSimInterface/DetSimInterface/IAnaElemTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IAnaElemTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IAnaElemTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IAnaElemTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IDedxSimTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IDedxSimTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IDedxSimTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IDedxSimTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IDetElemTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IDetElemTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IDetElemTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IDetElemTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IDetSimSvc.h b/Simulation/DetSimInterface/include/DetSimInterface/IDetSimSvc.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IDetSimSvc.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IDetSimSvc.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IFastSimG4Tool.h b/Simulation/DetSimInterface/include/DetSimInterface/IFastSimG4Tool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IFastSimG4Tool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IFastSimG4Tool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IG4PrimaryCnvTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IG4PrimaryCnvTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IG4PrimaryCnvTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IG4PrimaryCnvTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/ISensDetTool.h b/Simulation/DetSimInterface/include/DetSimInterface/ISensDetTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/ISensDetTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/ISensDetTool.h