diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
index aecc9173169474c78437982669c5607a08d6b375..61b94702b1e106ba914b8225dd17a14e522daaa2 100644
--- a/Simulation/CMakeLists.txt
+++ b/Simulation/CMakeLists.txt
@@ -5,4 +5,4 @@ add_subdirectory(DetSimCore)
 #add_subdirectory(DetSimFastModel)
 add_subdirectory(DetSimGeom)
 add_subdirectory(DetSimInterface)
-#add_subdirectory(DetSimSD)
+add_subdirectory(DetSimSD)
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index 33d00e18e00177f47582ad8ab7679c1debc2d08b..82de5e1bcf097f58be7aa350bfae3e15abf8e6e8 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -1,12 +1,4 @@
 
-gaudi_subdir(DetSimSD v0r0)
-
-gaudi_depends_on_subdirs(
-    k4FWCore
-    Detector/DetInterface
-    Simulation/DetSimInterface
-)
-
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
 find_package(DD4hep COMPONENTS DDG4 REQUIRED)
@@ -24,18 +16,20 @@ set(DetSimSD_srcs
     src/TimeProjectionChamberSensitiveDetector.cpp
 )
 
-gaudi_add_module(DetSimSD ${DetSimSD_srcs}
-    INCLUDE_DIRS
-      # DetSimInterface
-      # k4FWCore
-      # DD4hep
-      # GaudiKernel
-      # Geant4 
-    LINK_LIBRARIES
-      # DetSimInterface
-      # k4FWCore
-      DD4hep
-      ${DD4hep_COMPONENT_LIBRARIES} 
-      GaudiKernel
-      # Geant4
+gaudi_add_module(DetSimSD 
+                 SOURCES ${DetSimSD_srcs}
+                 LINK DetSimInterface
+                      DetInterface
+                      ${DD4hep_COMPONENT_LIBRARIES} 
+                      Gaudi::GaudiKernel
 )
+target_include_directories(DetSimSD PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(TARGETS DetSimSD
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
+
diff --git a/Simulation/DetSimSD/DetSimSD/CaloSensitiveDetector.h b/Simulation/DetSimSD/include/DetSimSD/CaloSensitiveDetector.h
similarity index 100%
rename from Simulation/DetSimSD/DetSimSD/CaloSensitiveDetector.h
rename to Simulation/DetSimSD/include/DetSimSD/CaloSensitiveDetector.h
diff --git a/Simulation/DetSimSD/DetSimSD/DDG4SensitiveDetector.h b/Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h
similarity index 100%
rename from Simulation/DetSimSD/DetSimSD/DDG4SensitiveDetector.h
rename to Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h