diff --git a/Service/CMakeLists.txt b/Service/CMakeLists.txt
index 72a2446de1c6f0760d6d985253eaf4e683558e85..f1282e8457656c8227c768ef261d89febaf9bae0 100644
--- a/Service/CMakeLists.txt
+++ b/Service/CMakeLists.txt
@@ -1,3 +1,3 @@
 # add_subdirectory(EventSeeder)
 add_subdirectory(GearSvc)
-# add_subdirectory(TrackSystemSvc)
+add_subdirectory(TrackSystemSvc)
diff --git a/Service/TrackSystemSvc/CMakeLists.txt b/Service/TrackSystemSvc/CMakeLists.txt
index 5d49ae93e9e0bf51c2fb2b51f469c8b74336b63f..1d100cdb0de59ede1be2387ba15eea70fd550e4e 100644
--- a/Service/TrackSystemSvc/CMakeLists.txt
+++ b/Service/TrackSystemSvc/CMakeLists.txt
@@ -9,10 +9,17 @@ find_package(EDM4HEP REQUIRED)
 #find_package(KalDet REQUIRED)
 find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
 
-# gaudi_depends_on_subdirs(Service/GearSvc Detector/DetInterface Utilities/DataHelper Utilities/KalTest Utilities/KalDet)
-
-set(TrackSystemSvc_srcs src/*.cpp)
-set(TrackSystemSvcLib_srcs src/*.cc)
+set(TrackSystemSvc_srcs src/TrackSystemSvc.cpp)
+set(TrackSystemSvcLib_srcs 
+      src/HelixFit.cc
+      src/HelixTrack.cc
+      src/IMarlinTrack.cc
+      src/IMarlinTrkSystem.cc
+      src/LCIOTrackPropagators.cc
+      src/MarlinKalTest.cc
+      src/MarlinKalTestTrack.cc
+      src/MarlinTrkUtils.cc
+)
 
 # gaudi_install_headers(TrackSystemSvc)
 
@@ -24,6 +31,7 @@ gaudi_add_library(TrackSystemSvcLib
                   LINK DataHelperLib 
                        KalTestLib 
                        KalDetLib 
+                       GearSvc
                        Gaudi::GaudiKernel 
                        ${ROOT_LIBRARIES}
                        ${CLHEP_LIBRARIES} 
@@ -38,3 +46,10 @@ gaudi_add_module(TrackSystemSvc
                       Gaudi::GaudiKernel
                       ${GEAR_LIBRARIES}
 )
+
+install(TARGETS TrackSystemSvcLib TrackSystemSvc
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
+
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/ConfigFlags.h b/Service/TrackSystemSvc/include/TrackSystemSvc/ConfigFlags.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/ConfigFlags.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/ConfigFlags.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/HelixFit.h b/Service/TrackSystemSvc/include/TrackSystemSvc/HelixFit.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/HelixFit.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/HelixFit.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/HelixTrack.h b/Service/TrackSystemSvc/include/TrackSystemSvc/HelixTrack.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/HelixTrack.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/HelixTrack.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/IMarlinTrack.h b/Service/TrackSystemSvc/include/TrackSystemSvc/IMarlinTrack.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/IMarlinTrack.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/IMarlinTrack.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/IMarlinTrkSystem.h b/Service/TrackSystemSvc/include/TrackSystemSvc/IMarlinTrkSystem.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/IMarlinTrkSystem.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/IMarlinTrkSystem.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/ITrackSystemSvc.h b/Service/TrackSystemSvc/include/TrackSystemSvc/ITrackSystemSvc.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/ITrackSystemSvc.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/ITrackSystemSvc.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/LCIOTrackPropagators.h b/Service/TrackSystemSvc/include/TrackSystemSvc/LCIOTrackPropagators.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/LCIOTrackPropagators.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/LCIOTrackPropagators.h
diff --git a/Service/TrackSystemSvc/TrackSystemSvc/MarlinTrkUtils.h b/Service/TrackSystemSvc/include/TrackSystemSvc/MarlinTrkUtils.h
similarity index 100%
rename from Service/TrackSystemSvc/TrackSystemSvc/MarlinTrkUtils.h
rename to Service/TrackSystemSvc/include/TrackSystemSvc/MarlinTrkUtils.h