diff --git a/Reconstruction/CMakeLists.txt b/Reconstruction/CMakeLists.txt
index c491cd6e009a54b248617cd8ace551855a063122..99fdf3f7920e4b88dcd584dcead437d11c679bee 100644
--- a/Reconstruction/CMakeLists.txt
+++ b/Reconstruction/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(DCHDedx)
 add_subdirectory(Digi_Calo)
 # add_subdirectory(PFA)
-# add_subdirectory(SiliconTracking)
+add_subdirectory(SiliconTracking)
 # add_subdirectory(Tracking)
diff --git a/Reconstruction/SiliconTracking/CMakeLists.txt b/Reconstruction/SiliconTracking/CMakeLists.txt
index 32864bf2a894d7efb3525f3d92fd1871742a189e..1f35407ba6173b173396978278445247e4d01ca9 100644
--- a/Reconstruction/SiliconTracking/CMakeLists.txt
+++ b/Reconstruction/SiliconTracking/CMakeLists.txt
@@ -1,23 +1,25 @@
-gaudi_subdir(SiliconTracking v0r0)
 
 find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED )
 find_package(EDM4HEP REQUIRED ) 
 find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
-gaudi_depends_on_subdirs(
-    Service/GearSvc
-    Service/EventSeeder
-    Service/TrackSystemSvc
-    Utilities/DataHelper
-    Utilities/KiTrack
-)
-
-set(SiliconTracking_srcs src/*.cpp)
+find_package(k4FWCore)
 
 # Modules
-gaudi_add_module(SiliconTracking ${SiliconTracking_srcs}
-    INCLUDE_DIRS GaudiKernel k4FWCore gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES TrackSystemSvcLib DataHelperLib KiTrackLib GaudiKernel k4FWCore ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} 
+gaudi_add_module(SiliconTracking
+                 SOURCES src/ForwardTrackingAlg.cpp
+                         src/SiliconTrackingAlg.cpp
+                         src/SpacePointBuilderAlg.cpp
+                         src/TrackSubsetAlg.cpp
+                 LINK GearSvc
+                      EventSeeder
+                      TrackSystemSvcLib
+                      DataHelperLib
+                      KiTrackLib
+                      Gaudi::GaudiKernel
+                      k4FWCore::k4FWCore 
+                      ${GEAR_LIBRARIES} 
+                      ${GSL_LIBRARIES} 
+                      ${LCIO_LIBRARIES} 
 )