diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index 3e8c3f6ebb21d36f41932496694c4e227ebba188..1d966f477864b93b563a9d2218f6bd168ec34028 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -4,5 +4,5 @@
 # add_subdirectory(DetDriftChamber)
 # add_subdirectory(DetEcalMatrix)
 add_subdirectory(DetInterface)
-# add_subdirectory(DetSegmentation)
+add_subdirectory(DetSegmentation)
 add_subdirectory(GeomSvc)
diff --git a/Detector/DetSegmentation/CMakeLists.txt b/Detector/DetSegmentation/CMakeLists.txt
index f6b2611e35080a64fdb67ecb30a2e67729a5364b..d13ee57e9fa5304cfd3eacbd9b77452d0d3475f3 100644
--- a/Detector/DetSegmentation/CMakeLists.txt
+++ b/Detector/DetSegmentation/CMakeLists.txt
@@ -1,9 +1,6 @@
 #################################################################################
 ##Package : DetSegmentation
 #################################################################################
-gaudi_subdir(DetSegmentation v1r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
 
 find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
 set(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH}  ${DD4hep_ROOT}/cmake )
@@ -13,21 +10,20 @@ include(DD4hep)
 find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED)
 
 gaudi_add_library(DetSegmentation
-                 src/*.cpp
-                 INCLUDE_DIRS DD4hep ROOT
-                 LINK_LIBRARIES GaudiKernel DD4hep ROOT ${DD4hep_COMPONENT_LIBRARIES}
-                 PUBLIC_HEADERS DetSegmentation)
+                  SOURCES src/GridDriftChamber.cpp
+                  LINK Gaudi::GaudiKernel
+                       ${DD4hep_COMPONENT_LIBRARIES}
+                       ${ROOT_LIBRARIES}
+)
 
 gaudi_add_module(DetSegmentationPlugin
-                 src/plugins/*.cpp
-                 INCLUDE_DIRS DD4hep ROOT
-                 LINK_LIBRARIES GaudiKernel DD4hep ROOT ${DD4hep_COMPONENT_LIBRARIES} DetSegmentation)
+                 SOURCES src/plugins/SegmentationFactories.cpp
+                 LINK Gaudi::GaudiKernel
+                      ${ROOT_LIBRARIES}
+                      ${DD4hep_COMPONENT_LIBRARIES}
+                      DetSegmentation)
 
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")
 dd4hep_generate_rootmap(DetSegmentationPlugin)
 
-include(CTest)
-gaudi_add_test(TestSegmentationPhiEta
-               WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-               FRAMEWORK tests/options/phiEtaSegmentation.py)
diff --git a/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h b/Detector/DetSegmentation/include/DetSegmentation/GridDriftChamber.h
similarity index 100%
rename from Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h
rename to Detector/DetSegmentation/include/DetSegmentation/GridDriftChamber.h