diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h b/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h
index c65bdb69bb6b2f27918c2927fdfd80f2c2d09cb3..f2576d69e66ed73fa3880f9288534f9ab2fb1389 100644
--- a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h
+++ b/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h
@@ -24,7 +24,7 @@ namespace Acts {
   class SurfaceBounds;
 }
 
-class FaserActsTrackingGeometrySvc;
+class IFaserActsTrackingGeometrySvc;
 class FaserActsAlignmentStore;
 
 class IdentityHelper;
@@ -87,7 +87,7 @@ private:
   mutable std::mutex m_cacheMutex;
   mutable std::shared_ptr<const Acts::Transform3> m_defTransform;
 
-  const FaserActsTrackingGeometrySvc* m_trackingGeometrySvc;
+  const IFaserActsTrackingGeometrySvc* m_trackingGeometrySvc;
   
   Identifier m_explicitIdentifier;
 
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx
index 8c913b6ad5e1667a83c1f29aedcb650c2ab84c56..5f0735b99c7192d7d761191046157b42340e7cf9 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsAlignmentCondAlg.h"
+#include "FaserActsAlignmentCondAlg.h"
 
 // ATHENA
 #include "EventInfo/EventID.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsAlignmentCondAlg.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsAlignmentCondAlg.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
index 2a790d184273f5aee8c69389500e6d1f94a9ab2d..58ad59dcf8680c74ea5eefee746f341a507cf3ea 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
@@ -11,7 +11,7 @@
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
 // PACKAGE
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
+// #include "FaserActsTrackingGeometrySvc.h"
 #include "FaserActsGeometry/FaserActsAlignmentStore.h"
 #include "FaserActsGeometry/FaserActsGeometryContext.h"
 #include "ActsInterop/IdentityHelper.h"
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx
index 0eca15c20fcd100e2711573588e9c68a3fecf094..429b5cb78f027ca2352e7c6b81839c7df8f08da2 100755
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsExtrapolationAlg.h"
+#include "FaserActsExtrapolationAlg.h"
 
 // ATHENA
 #include "AthenaKernel/RNGWrapper.h"
@@ -24,7 +24,7 @@
 #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 #include "ActsInterop/Logger.h"
 #include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
 //#include "FaserActsGeometry/IFaserActsMaterialTrackWriterSvc.h"
 
 // OTHER
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationAlg.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationAlg.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
index c5351bfaaea0780c843fb1aa3a6ec6fd31cdb3ce..77485eb7f76c235edeac8f8fb91e01548cf8b1a1 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
@@ -2,15 +2,15 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsExtrapolationTool.h"
+#include "FaserActsExtrapolationTool.h"
 
 // ATHENA
 #include "GaudiKernel/IInterface.h"
 #include "GaudiKernel/PhysicalConstants.h"
 
 // PACKAGE
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+// #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometrySvc.h"
+// #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 #include "ActsInterop/Logger.h"
 
 // ACTS
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
index feeb6f7a79425845048565d73f47f044dad45ccf..86c97a2cf92526927a0af0176f6ec5fe16325d5e 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsMaterialJsonWriterTool.h"
+#include "FaserActsMaterialJsonWriterTool.h"
 
 #include "ActsInterop/Logger.h"
 
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialJsonWriterTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialJsonWriterTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx
index 37031b416dca13ce8755914aa89b14dae9fee3ab..fd3e6e15e16a7bf279f246100c7a5ecf8915a922 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsMaterialMapping.h"
+#include "FaserActsMaterialMapping.h"
 
 // ATHENA
 #include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -18,7 +18,7 @@
 
 // PACKAGE
 #include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
 
 // STL
 #include <fstream>
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialMapping.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialMapping.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx
index 35da191fc41ab08138a469e2abce9756d5886c53..e6ac8720afce50a54321625bfc2cc789b507b7fe 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsObjWriterTool.h"
+#include "FaserActsObjWriterTool.h"
 
 // std
 #include <iostream>
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsObjWriterTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsObjWriterTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx
index 6d24eba82942c74fe560ecdb6989daf51a8ce4d1..18b4177289b9e40504350f29ee56dbbfd8d14e37 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsPropStepRootWriterSvc.h"
+#include "FaserActsPropStepRootWriterSvc.h"
 #include "GaudiKernel/IInterface.h"
 
 #include "Acts/Propagator/detail/SteppingLogger.hpp"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsPropStepRootWriterSvc.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.h
similarity index 97%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsPropStepRootWriterSvc.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.h
index eeca580eb76f82fced49477a8ca1067cbea8d472..42a3b52678f7f11dc9782490edbd20568146f20d 100644
--- a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsPropStepRootWriterSvc.h
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.h
@@ -9,7 +9,7 @@
 #include "GaudiKernel/IInterface.h"
 #include "Gaudi/Property.h"  /*no forward decl: typedef*/
 
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
 
 #include "Acts/EventData/TrackParameters.hpp"
 
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
index ac647013bd177fb74ec5eaa1d26ae74935b3cfb1..ac5494ade5e5cd9fa59a04b0a7a711e86fba0b65 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
@@ -2,14 +2,14 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsSurfaceMappingTool.h"
+#include "FaserActsSurfaceMappingTool.h"
 
 // ATHENA
 #include "GaudiKernel/IInterface.h"
 // PACKAGE
 #include "ActsInterop/Logger.h"
 #include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+// #include "FaserActsTrackingGeometryTool.h"
 #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 
 // ACTS
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsSurfaceMappingTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsSurfaceMappingTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
index 94c852743ebd4dec46d3ee734a7f800dd4384a3e..a8091afa98f1620b89169fdda7437036e0cf42c0 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
+#include "FaserActsTrackingGeometrySvc.h"
 
 // ATHENA
 #include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometrySvc.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometrySvc.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
index aae04e8fae2a775d9dc9a6bb5536ffb5f820c39f..98a0ff23c16f5078e96f0609b5a84f3b9776fc79 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+#include "FaserActsTrackingGeometryTool.h"
 
 // ATHENA
 #include "GaudiKernel/EventContext.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometryTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometryTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
index 796ad74e4878cd72e6eae62cfea7333b94bcdc11..5e893ade237f52e68f8c2bc318579d52febae270 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsVolumeMappingTool.h"
+#include "FaserActsVolumeMappingTool.h"
 
 // ATHENA
 #include "GaudiKernel/IInterface.h"
@@ -10,9 +10,8 @@
 // PACKAGE
 #include "FaserActsGeometry/FaserActsGeometryContext.h"
 #include "ActsInterop/Logger.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
 //#include "ActsGeometry/ActsGeometryContext.h"
-#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
+// #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 
 // ACTS
 #include "Acts/Propagator/Navigator.hpp"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsVolumeMappingTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsVolumeMappingTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx
index 3e05c12a23433253b0050966f530103aa017c656..2ac697d29628b716dce319f751e002f4227c5dbb 100755
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-#include "FaserActsGeometry/FaserActsWriteTrackingGeometry.h"
+#include "FaserActsWriteTrackingGeometry.h"
 
 // ATHENA
 #include "AthenaKernel/RNGWrapper.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsWriteTrackingGeometry.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.h
similarity index 80%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsWriteTrackingGeometry.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.h
index 2de2fef9c67193d8b0d52e1352124bbe41e55939..4b877274e5d50e183d3ce5123b2a70ee509ef6e9 100755
--- a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsWriteTrackingGeometry.h
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.h
@@ -13,8 +13,8 @@
 #include "GaudiKernel/ISvcLocator.h"
 
 // PACKAGE
-#include "FaserActsGeometry/FaserActsObjWriterTool.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+#include "FaserActsObjWriterTool.h"
+#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 
 // STL
 #include <fstream>
@@ -36,7 +36,7 @@ public:
 
 private:
 
-  ToolHandle<FaserActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
+  ToolHandle<IFaserActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
 
   ToolHandle<FaserActsObjWriterTool> m_objWriterTool{this, "ObjWriterTool", "FaserActsObjWriterTool"};
 
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx
index 5edcda8c1acef4f087e1e15c307a32e9560145e3..2068df0eb781e3622a03c54928004892d0bb0c99 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserNominalAlignmentCondAlg.h"
+#include "FaserNominalAlignmentCondAlg.h"
 
 // ATHENA
 #include "StoreGate/WriteCondHandle.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserNominalAlignmentCondAlg.h b/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserNominalAlignmentCondAlg.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx b/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx
index 7beb0342f184a3c72a4fa4c154fdc00cc5bd9522..1adfac54b1f13b0dea3c41608e85a11e96fc2920 100755
--- a/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx
@@ -2,24 +2,24 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsGeometry/FaserActsExtrapolationAlg.h"
-#include "FaserActsGeometry/FaserActsWriteTrackingGeometry.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
-#include "FaserActsGeometry/FaserActsExtrapolationTool.h"
-#include "FaserActsGeometry/FaserActsObjWriterTool.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
-#include "FaserActsGeometry/FaserActsPropStepRootWriterSvc.h"
-#include "FaserActsGeometry/FaserActsAlignmentCondAlg.h"
-#include "FaserActsGeometry/FaserNominalAlignmentCondAlg.h"
+#include "../FaserActsExtrapolationAlg.h"
+#include "../FaserActsWriteTrackingGeometry.h"
+#include "../FaserActsTrackingGeometrySvc.h"
+#include "../FaserActsExtrapolationTool.h"
+#include "../FaserActsObjWriterTool.h"
+#include "../FaserActsTrackingGeometryTool.h"
+#include "../FaserActsPropStepRootWriterSvc.h"
+#include "../FaserActsAlignmentCondAlg.h"
+#include "../FaserNominalAlignmentCondAlg.h"
 //#include "FaserActsGeometry/FaserActsKalmanFilterAlg.h"
 //#include "FaserActsGeometry/FaserActsExCellWriterSvc.h"
 //#include "FaserActsGeometry/FaserActsMaterialTrackWriterSvc.h"
 //#include "FaserActsGeometry/GeomShiftCondAlg.h"
 //#include "FaserActsGeometry/FaserActsWriteTrackingGeometryTransforms.h"
-#include "FaserActsGeometry/FaserActsVolumeMappingTool.h"
+#include "../FaserActsVolumeMappingTool.h"
 //#include "FaserActsGeometry/FaserActsMaterialJsonWriterTool.h"
-#include "FaserActsGeometry/FaserActsMaterialMapping.h"
-#include "FaserActsGeometry/FaserActsSurfaceMappingTool.h"
+#include "../FaserActsMaterialMapping.h"
+#include "../FaserActsSurfaceMappingTool.h"
 
 DECLARE_COMPONENT( FaserActsTrackingGeometrySvc )
 DECLARE_COMPONENT( FaserActsTrackingGeometryTool )
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsExCellWriterSvc.h b/Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsExCellWriterSvc.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsExCellWriterSvc.h
rename to Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsExCellWriterSvc.h
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h b/Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h
rename to Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
index 22f075abb55848488419bc7129574a6a6a6741fe..6e9c7dc2f58cdd6a172e9f357915e7d18ac67ece 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
@@ -25,48 +25,48 @@ atlas_add_library( FaserActsKalmanFilterLib
 )
 
 atlas_add_component(FaserActsKalmanFilter
-    FaserActsKalmanFilter/ActsTrackSeedTool.h
-    FaserActsKalmanFilter/CircleFit.h
-    FaserActsKalmanFilter/CircleFitTrackSeedTool.h
-    FaserActsKalmanFilter/CKF2.h
-    FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
-    FaserActsKalmanFilter/EffPlotTool.h
-    FaserActsKalmanFilter/FASERSourceLink.h
+    ActsTrackSeedTool.h
+    CircleFit.h
+    CircleFitTrackSeedTool.h
+    CKF2.h
+    CombinatorialKalmanFilterAlg.h
+    EffPlotTool.h
+    FASERSourceLink.h
     FaserActsKalmanFilter/FaserActsGeometryContainers.h
-    FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
-    FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h
-    FaserActsKalmanFilter/GhostBusters.h
-    FaserActsKalmanFilter/MyTrackSeedTool.h
+    FaserActsKalmanFilterAlg.h
+    FaserActsRecMultiTrajectory.h
+    GhostBusters.h
+    MyTrackSeedTool.h
     FaserActsKalmanFilter/IdentifierLink.h
     FaserActsKalmanFilter/IndexSourceLink.h
     FaserActsKalmanFilter/ITrackFinderTool.h
     FaserActsKalmanFilter/ITrackSeedTool.h
-    FaserActsKalmanFilter/KalmanFitterTool.h
-    FaserActsKalmanFilter/LinearFit.h
-#    FaserActsKalmanFilter/ClusterTrackSeedTool.h
-#    FaserActsKalmanFilter/TruthTrackFinderTool.h
+    KalmanFitterTool.h
+    LinearFit.h
+#    ClusterTrackSeedTool.h
+#    TruthTrackFinderTool.h
     FaserActsKalmanFilter/Measurement.h
-#    FaserActsKalmanFilter/MultiTrackFinderTool.h
-    FaserActsKalmanFilter/PerformanceWriterTool.h
-    FaserActsKalmanFilter/PlotHelpers.h
-    FaserActsKalmanFilter/ResPlotTool.h
-    FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h
-    FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h
-    FaserActsKalmanFilter/SeedingAlg.h
-#    FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h
-#    FaserActsKalmanFilter/SegmentFitTrackFinderTool.h
-    FaserActsKalmanFilter/SimWriterTool.h
-    FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h
-    FaserActsKalmanFilter/SPSimpleInitialParameterTool.h
-    FaserActsKalmanFilter/SummaryPlotTool.h
-    FaserActsKalmanFilter/TrackClassification.h
-    FaserActsKalmanFilter/TrackSeedWriterTool.h
-    FaserActsKalmanFilter/TrackSelection.h
-    FaserActsKalmanFilter/TrajectoryWriterTool.h
-#    FaserActsKalmanFilter/ProtoTrackWriterTool.h
-    FaserActsKalmanFilter/TruthBasedInitialParameterTool.h
-#    FaserActsKalmanFilter/TruthSeededTrackFinderTool.h
-    FaserActsKalmanFilter/ThreeStationTrackSeedTool.h
+#    MultiTrackFinderTool.h
+    PerformanceWriterTool.h
+    PlotHelpers.h
+    ResPlotTool.h
+    RootTrajectoryStatesWriterTool.h
+    RootTrajectorySummaryWriterTool.h
+    SeedingAlg.h
+#    SegmentFitClusterTrackFinderTool.h
+#    SegmentFitTrackFinderTool.h
+    SimWriterTool.h
+    SPSeedBasedInitialParameterTool.h
+    SPSimpleInitialParameterTool.h
+    SummaryPlotTool.h
+    TrackClassification.h
+    TrackSeedWriterTool.h
+    TrackSelection.h
+    TrajectoryWriterTool.h
+#    ProtoTrackWriterTool.h
+    TruthBasedInitialParameterTool.h
+#    TruthSeededTrackFinderTool.h
+    ThreeStationTrackSeedTool.h
     src/ActsTrackSeedTool.cxx
     src/CircleFit.cxx
     src/CircleFitTrackSeedTool.cxx
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD
deleted file mode 100644
index c066165b27f5fabec539af3ca012c6ab0585c276..0000000000000000000000000000000000000000
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef COMBINATORIALKALMANFILTERALG_H
-#define COMBINATORIALKALMANFILTERALG_H
-
-#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "TrackerSpacePoint/FaserSCT_SpacePointContainer.h"
-#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
-#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
-#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
-#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
-#include "Acts/TrackFinding/MeasurementSelector.hpp"
-#include "FaserActsKalmanFilter/Measurement.h"
-#include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
-#include "TrkTrack/TrackCollection.h"
-
-class FaserSCT_ID;
-
-namespace Trk
-{
-class TrackStateOnSurface;
-}
-
-namespace TrackerDD {
-  class SCT_DetectorManager;
-} 
-
-class CombinatorialKalmanFilterAlg : public AthReentrantAlgorithm { 
- public:
-  CombinatorialKalmanFilterAlg(const std::string& name, ISvcLocator* pSvcLocator);
-  virtual ~CombinatorialKalmanFilterAlg() = default;
-
-  StatusCode initialize() override;
-  StatusCode execute(const EventContext& ctx) const override;
-  StatusCode finalize() override;
-
-  using TrackFinderOptions =
-      Acts::CombinatorialKalmanFilterOptions<IndexSourceLinkAccessor, MeasurementCalibrator, Acts::MeasurementSelector>;
-      using FitterResult = Acts::Result<Acts::CombinatorialKalmanFilterResult<IndexSourceLink>>;
-      using TrackFinderResult = std::vector<FitterResult>;
-//  using TrackFinderResult = std::vector<
-//      Acts::Result<Acts::CombinatorialKalmanFilterResult<IndexSourceLink>>>;
-  using TrackFinderFunction = std::function<TrackFinderResult(
-      const IndexSourceLinkContainer&, const std::vector<Acts::CurvilinearTrackParameters>&,
-      const TrackFinderOptions&)>;
-
-  static TrackFinderFunction makeTrackFinderFunction(
-      std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry);
-
-  Acts::MagneticFieldContext getMagneticFieldContext(const EventContext& ctx) const;
-
-
- private:
-  const FaserSCT_ID* m_idHelper{nullptr};
-  const TrackerDD::SCT_DetectorManager* m_detManager{nullptr};
-
-  std::unique_ptr<Trk::Track> makeTrack(Acts::GeometryContext& tgContext, FitterResult& fitResult, std::vector<Tracker::FaserSCT_SpacePoint>  seed_spcollection) const;
-  const Trk::TrackParameters* ConvertActsTrackParameterToATLAS(const Acts::BoundTrackParameters &actsParameter, const Acts::GeometryContext& gctx) const;
-
-  SG::WriteHandleKey<TrackCollection> m_trackCollection { this, "FaserActsCKFTrackCollection", "FaserActsCKFTrackCollection", "Output trackcollectionname" };
-
-  ToolHandle<IFaserActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
-  ToolHandle<SPSeedBaseInitialParameterTool> m_initialParameterTool{this, "InitialParameterTool", "SPSeedBaseInitialParameterTool"};
-  //ToolHandle<SPSimpleInitialParameterTool> m_initialParameterTool{this, "InitialParameterTool", "SPSimpleInitialParameterTool"};
-  //ToolHandle<TruthBasedInitialParameterTool> m_initialParameterTool{this, "InitialParameterTool", "TruthBasedInitialParameterTool"};
-  ToolHandle<TrajectoryWriterTool> m_trajectoryWriterTool{this, "OutputTool", "TrajectoryWriterTool"};
-  SG::ReadCondHandleKey<FaserFieldCacheCondObj> m_fieldCondObjInputKey {this, "FaserFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
-  SG::ReadHandleKey<FaserSCT_SpacePointContainer> m_SpacePointContainerKey{this, "SpacePointsSCTName", "SCT_SpacePointContainer", "SCT space point container"};
-};
-
-#endif // COMBINATORIALKALMANFILTERALG_H
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h
index 6fbc80c422cb3d83122a7c9ec9524da527221d15..af5eb919cdf3e3b0d36353e4e07aa2d024c11c4d 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h
@@ -1,7 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_ITRACKFINDERTOOL_H
 #define FASERACTSKALMANFILTER_ITRACKFINDERTOOL_H
 
-#include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
+// #include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
 #include "GaudiKernel/IInterface.h"
 #include "GaudiKernel/IAlgTool.h"
 #include "FaserActsKalmanFilter/IndexSourceLink.h"
@@ -9,6 +9,12 @@
 #include "FaserActsKalmanFilter/Measurement.h"
 #include "Acts/EventData/TrackParameters.hpp"
 
+namespace Tracker
+{
+  class FaserSCT_Cluster;
+  class FaserSCT_SpacePoint;
+}
+
 class ITrackFinderTool : virtual public IAlgTool {
 public:
   DeclareInterfaceID(ITrackFinderTool, 1, 0);
@@ -20,7 +26,7 @@ public:
   virtual const std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> sourceLinks() const = 0;
   virtual const std::shared_ptr<std::vector<IdentifierLink>> idLinks() const = 0;
   virtual const std::shared_ptr<std::vector<std::vector<Measurement>>> measurements() const = 0;
-  virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints() const = 0;
+  virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints() const = 0;
   virtual const std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters() const = 0;
 };
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h
index 0b664f78ec6e60f1d75f504a343221970d0b938d..238fbb13d82ab4c6a784ed57acedb648334c716a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h
@@ -7,8 +7,14 @@
 #include "FaserActsKalmanFilter/IdentifierLink.h"
 #include "FaserActsKalmanFilter/Measurement.h"
 #include "Acts/EventData/TrackParameters.hpp"
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
+// #include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
+
+namespace Tracker
+{
+  class FaserSCT_Cluster;
+  class FaserSCT_SpacePoint;
+}
 
 class ITrackSeedTool : virtual public IAlgTool {
 public:
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h
index 79973020943627dc32655fecb3a24437bb0c1284..2e6a2a7885be8c3aa8c3ee884ffdc9968360e298 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h
@@ -14,8 +14,13 @@
 
 #include <boost/container/flat_map.hpp>
 
-#include "FaserActsKalmanFilter/FaserActsGeometryContainers.h"
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
+#include "FaserActsGeometryContainers.h"
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
+namespace Tracker
+{
+    class FaserSCT_Cluster;
+}
+
 
 /// Index type to reference elements in a container.
 ///
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx
index 013e242db7572fc4a92875cd8a6188ed45bc5171..b311727d083ce5855ee6d291354e995d6d39f7a1 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ActsTrackSeedTool.h"
+#include "ActsTrackSeedTool.h"
 #include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ActsTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ActsTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
index 371c752a934b087c8e07fe4f8bc31dd331f0a76f..d0d6f2138289fa0c5e387ae2897e0abcbd7dca8a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CKF2.h"
+#include "CKF2.h"
 
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/ReadCondHandleKey.h"
@@ -15,10 +15,10 @@
 #include "Acts/EventData/TrackParameters.hpp"
 #include "FaserActsKalmanFilter/IndexSourceLink.h"
 #include "FaserActsKalmanFilter/Measurement.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "FaserActsKalmanFilter/TrackSelection.h"
+#include "TrackSelection.h"
 #include <algorithm>
 
 #include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.h
similarity index 95%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CKF2.h
index da7baf0c88406e764b454796e58239e3de7d93b0..c6b42b020766fa0e17b5693a2a0bc266057c6243 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.h
@@ -12,13 +12,13 @@
 #include "Acts/TrackFinding/MeasurementSelector.hpp"
 #include "FaserActsKalmanFilter/Measurement.h"
 #include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
+#include "TrajectoryWriterTool.h"
 #include "TrkTrack/TrackCollection.h"
 #include "FaserActsKalmanFilter/ITrackSeedTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/KalmanFitterTool.h"
+#include "RootTrajectoryStatesWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
+#include "PerformanceWriterTool.h"
+#include "KalmanFitterTool.h"
 #include <boost/dynamic_bitset.hpp>
 using ConstTrackStateProxy = Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
 using ClusterSet = boost::dynamic_bitset<>;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx
index 9f1fab11cf10edac1a497c7af498e737b5bd84c6..51048496254f5187a7d105d1e807483de0de1f1c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CircleFit.h"
+#include "CircleFit.h"
 
 namespace CircleFit {
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFit.h b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFit.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx
index 098b836095b18b62696575c7db89281bc856b017..e7c4f064c0b16408d8a068757be235f12adffaca 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CircleFitTrackSeedTool.h"
+#include "CircleFitTrackSeedTool.h"
 #include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "TrackerReadoutGeometry/SCT_DetectorManager.h"
@@ -6,9 +6,9 @@
 #include "TrackerPrepRawData/FaserSCT_Cluster.h"
 #include "Identifier/Identifier.h"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
-#include "FaserActsKalmanFilter/CircleFit.h"
-#include "FaserActsKalmanFilter/LinearFit.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "CircleFit.h"
+#include "LinearFit.h"
+#include "TrackClassification.h"
 #include <array>
 #include <algorithm>
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFitTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFitTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx
index 8d78c9f0eaa1088675806b0a9aee1472ce3396ff..0e8265ecee9cae5388526b165b7a0dfc115058a0 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ClusterTrackSeedTool.h"
+#include "ClusterTrackSeedTool.h"
 #include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ClusterTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ClusterTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
index 71afcc4431fabb6064af9601d31dd783de497a4f..ee2a864b51d0cd632322128256666679c4beb490 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h"
+#include "CombinatorialKalmanFilterAlg.h"
 
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/ReadCondHandleKey.h"
@@ -15,10 +15,10 @@
 #include "Acts/EventData/TrackParameters.hpp"
 #include "FaserActsKalmanFilter/IndexSourceLink.h"
 #include "FaserActsKalmanFilter/Measurement.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "FaserActsKalmanFilter/TrackSelection.h"
+#include "TrackSelection.h"
 #include <algorithm>
 
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.h
similarity index 93%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.h
index 28058887c9b6f05d384962206c8cca1a64a9d66c..e4549a40ebc9991bba72f4c95e686d41183cb04c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.h
@@ -6,19 +6,19 @@
 #include "TrackerSpacePoint/FaserSCT_SpacePointContainer.h"
 #include "TrackerPrepRawData/FaserSCT_ClusterContainer.h"
 #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
-//#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
+//#include "SPSimpleInitialParameterTool.h"
+//#include "SPSeedBasedInitialParameterTool.h"
 #include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
 #include "Acts/TrackFinding/MeasurementSelector.hpp"
 #include "FaserActsKalmanFilter/Measurement.h"
 #include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
+#include "TrajectoryWriterTool.h"
 #include "TrkTrack/TrackCollection.h"
 #include "FaserActsKalmanFilter/ITrackSeedTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "RootTrajectoryStatesWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
+#include "PerformanceWriterTool.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include <boost/dynamic_bitset.hpp>
 using ConstTrackStateProxy = Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
 using ClusterSet = boost::dynamic_bitset<>;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx
index 514fe5407c1585e1a0884a60f2dc5d039ebe92ae..e757c9c8dc248b6c1bb87596771cc0e0914e56a2 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/EffPlotTool.h"
+#include "EffPlotTool.h"
 #include "Acts/Utilities/Helpers.hpp"
 
 void EffPlotTool::book(EffPlotTool::EffPlotCache &effPlotCache) const {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/EffPlotTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/EffPlotTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.h
index e5af125d6021d5ab19b71f73eebc63a99604aea5..63b92ad1ac0c2276d4ce2cb7e2c2d1e201bd7d16 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/EffPlotTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.h
@@ -1,7 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_EFFPLOTTOOL_H
 #define FASERACTSKALMANFILTER_EFFPLOTTOOL_H
 
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "HepMC/GenParticle.h"
 #include "TEfficiency.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FASERSourceLink.h b/Tracking/Acts/FaserActsKalmanFilter/src/FASERSourceLink.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FASERSourceLink.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/FASERSourceLink.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx
index 673524123467db8461bb25da2157bfa00eb6755a..f88b4e15f59fc7e7d3a4b434c8328942982a67ba 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h"
+#include "FaserActsKalmanFilterAlg.h"
 
 // ATHENA
 #include "GaudiKernel/EventContext.h"
@@ -43,7 +43,7 @@
 #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 #include "ActsInterop/Logger.h"
 #include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
 #include "FaserActsGeometry/FaserActsDetectorElement.h"
 #include "FaserActsKalmanFilter/IdentifierLink.h"
 
@@ -124,7 +124,7 @@ StatusCode FaserActsKalmanFilterAlg::execute() {
   std::shared_ptr<std::vector<IdentifierLink>> idLinks = m_trackFinderTool->idLinks();
   std::shared_ptr<std::vector<std::vector<Measurement>>> measurements =
       m_trackFinderTool->measurements();
-  std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints =
+  std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints =
       m_trackFinderTool->spacePoints();
   std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters =
       m_trackFinderTool->clusters();
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.h
similarity index 94%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.h
index 34dd7c63e7ef5842ac1416dc30d895bef3ecf997..a2b4c7295d0d476f34d38bd4e90778e64c6d40da 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.h
@@ -24,7 +24,7 @@
 #include "GeneratorObjects/McEventCollection.h"
 #include "TrackerSimData/TrackerSimDataCollection.h"
 #include "TrkTrack/TrackCollection.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
+#include "TrajectoryWriterTool.h"
 
 // ACTS
 #include "Acts/MagneticField/ConstantBField.hpp"
@@ -42,15 +42,14 @@
 
 // PACKAGE
 #include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
 #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 #include "FaserActsGeometryInterfaces/IFaserActsExtrapolationTool.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "FaserActsKalmanFilter/IndexSourceLink.h"
 #include "FaserActsKalmanFilter/Measurement.h"
 #include "FaserActsKalmanFilter/ITrackFinderTool.h"
-//#include "FaserActsKalmanFilter/ProtoTrackWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
+//#include "ProtoTrackWriterTool.h"
+#include "RootTrajectoryStatesWriterTool.h"
 
 // STL
 #include <memory>
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsRecMultiTrajectory.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/FaserActsRecMultiTrajectory.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx
index 6cfb07d143b8b49652ad54ee768a1af2b0671fae..6eab8b1b84f2a745e8d02395f8063306428dbd58 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/GhostBusters.h"
+#include "GhostBusters.h"
 #include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "TrackerPrepRawData/FaserSCT_Cluster.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/GhostBusters.h b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/GhostBusters.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.h
index f8ac55d6cbb62c20ac2de7ce9c8b5741a2bfe8cb..67b493b46cb018fa3ec0a96d083a863b0e33389b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/GhostBusters.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.h
@@ -5,7 +5,7 @@
 #include "AthenaBaseComps/AthHistogramming.h"
 #include "TrkTrack/TrackCollection.h"
 #include "TrackerSimData/TrackerSimDataCollection.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
 
 
 class TTree;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
index f1f8b1c61e6189e10882cd6cdd337e8c256463ca..6bb846781ad859824897eed70486cea903897a66 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/KalmanFitterTool.h"
+#include "KalmanFitterTool.h"
 
 #include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.h
similarity index 95%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.h
index 8bf92e91580d7d1839fe2ebfaf78bdaba73295a3..9ed5b212266e29b0d6155bed1580a2c0397e036c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.h
@@ -8,10 +8,10 @@
 #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
 #include "FaserActsKalmanFilter/IndexSourceLink.h"
 #include "FaserActsKalmanFilter/Measurement.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
+#include "RootTrajectoryStatesWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
 #include "TrkTrack/Track.h"
 
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/LinearFit.h b/Tracking/Acts/FaserActsKalmanFilter/src/LinearFit.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/LinearFit.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/LinearFit.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx
index f10448452d2a9161dab5207963a514135475efce..8b5b0e584441bb17a66584e38359acd004a85514 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/MultiTrackFinderTool.h"
+#include "MultiTrackFinderTool.h"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MultiTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MultiTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.h
index 56e5db2666157c330e91258776b3a6b34af44278..988c50bdf880ababa5cc22bb77552a625f5c6a15 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MultiTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.h
@@ -36,7 +36,7 @@ public:
   virtual const std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> sourceLinks() const override;
   virtual const std::shared_ptr<std::vector<IdentifierLink>> idLinks() const override;
   virtual const std::shared_ptr<std::vector<std::vector<Measurement>>> measurements() const override;
-  virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints() const override;
+  virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints() const override;
   virtual const std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters() const override;
 
   struct Tracklet {
@@ -174,7 +174,7 @@ private:
   std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> m_sourceLinks {};
   std::shared_ptr<std::vector<IdentifierLink>> m_idLinks {};
   std::shared_ptr<std::vector<std::vector<Measurement>>> m_measurements {};
-  std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> m_spacePoints {};
+  std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> m_spacePoints {};
   std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> m_clusters {};
 
   const FaserSCT_ID* m_idHelper {nullptr};
@@ -219,7 +219,7 @@ MultiTrackFinderTool::measurements() const {
   return m_measurements;
 }
 
-inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>>
+inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>>
 MultiTrackFinderTool::spacePoints() const {
   return m_spacePoints;
 }
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx
index 998269a83cf6228092dd3b31987696f929820e4e..eed78995ba97878ec24d984e3f6d8e2462c12be6 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx
@@ -1,3 +1,3 @@
-#include "FaserActsKalmanFilter/MyAmbiguitySolver.h"
+#include "MyAmbiguitySolver.h"
 
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyAmbiguitySolver.h b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyAmbiguitySolver.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.h
index 47257befa2fcbd70da95d1ee88bd41d0fdabeb2a..bcb5a909882e4558a2d8d2d8c135cefdef199886 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyAmbiguitySolver.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.h
@@ -2,7 +2,7 @@
 #define FASERACTSKALMANFILTER_AMBIGUITYSOLVER_H
 
 #include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 
 using CombinatorialKalmanFilterResult = Acts::CombinatorialKalmanFilterResult<IndexSourceLink>;
 using TrackFitterResult = Acts::Result<CombinatorialKalmanFilterResult>;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx
index c2648161b595230fc626544d4e9dd11fdf4118e5..28e4c094c27c552c9ebaf1c7fc36d82e6d3fda4c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/MyTrackSeedTool.h"
+#include "MyTrackSeedTool.h"
 
 #include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
index c545c551adeb640a985ab4999d0864ecd817fb7c..6565ef13ff1cdcd53fc545e0d9f40f866bd378de 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
@@ -1,5 +1,5 @@
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "PerformanceWriterTool.h"
+#include "TrackClassification.h"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "TFile.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PerformanceWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.h
similarity index 93%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PerformanceWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.h
index 198e4515988226e71e76c07b1a812ca00e64c641..88d3372c97644b401c040a163e8d0d9261ddcd3b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PerformanceWriterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.h
@@ -3,9 +3,9 @@
 
 #include "TrackerPrepRawData/FaserSCT_Cluster.h"
 #include "AthenaBaseComps/AthAlgTool.h"
-#include "FaserActsKalmanFilter/ResPlotTool.h"
-#include "FaserActsKalmanFilter/EffPlotTool.h"
-#include "FaserActsKalmanFilter/SummaryPlotTool.h"
+#include "ResPlotTool.h"
+#include "EffPlotTool.h"
+#include "SummaryPlotTool.h"
 #include "FaserActsGeometryInterfaces/IFaserActsExtrapolationTool.h"
 #include "TrackerSimData/TrackerSimDataCollection.h"
 #include "GeneratorObjects/McEventCollection.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx
index 0d50d843ea075ab3d3799dccdc6e2ba46cd74127..a5696dbaf01c1ff95c1071a292e656f891858aad 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
 #include <cassert>
 
 namespace PlotHelpers {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PlotHelpers.h b/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PlotHelpers.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx
index 5ec0dfc1a1d430208b10c14a7c368ac89ac08ff3..a8cad0d5704e9a20892f24881de4c46e623813e8 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ProtoTrackWriterTool.h"
+#include "ProtoTrackWriterTool.h"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Identifier/Identifier.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ProtoTrackWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ProtoTrackWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx
index 47922a13e99abca49446668f9f8c180a86ebecdf..78c29b9ea08b22da5f01c2b65416011bc0f25c97 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ResPlotTool.h"
+#include "ResPlotTool.h"
 #include "Acts/Utilities/Helpers.hpp"
 #include "HepMC/GenVertex.h"
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ResPlotTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ResPlotTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.h
index 0b65984bed7e7de4c7975fdf9cc67248c253dab7..9b27be2b0df2250e4c103fc3e133f34a14df40a4 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ResPlotTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.h
@@ -1,7 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_RESPLOTTOOL_H
 #define FASERACTSKALMANFILTER_RESPLOTTOOL_H
 
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "HepMC/GenParticle.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
index 5378fc080cb49628248d4a7eda2e9206d6c016ba..c46c1a0b9a08d6afb821c08cbadb0fda69d9b160 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
@@ -1,15 +1,16 @@
+#include "RootTrajectoryStatesWriterTool.h"
+
 #include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/detail/TransformationBoundToFree.hpp"
 #include "Acts/Utilities/Helpers.hpp"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "TrackerReadoutGeometry/SCT_DetectorManager.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 #include "TrackerReadoutGeometry/SiDetectorElement.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
 #include <TFile.h>
 #include <TTree.h>
 
@@ -281,8 +282,8 @@ StatusCode RootTrajectoryStatesWriterTool::write(const Acts::GeometryContext& gc
 
       // Get the majority truth particle to this track
       int barcode = NaNint;
-      int truthQ = NaNint;
-      float truthMomentum = NaNfloat;
+      // int truthQ = NaNint;
+      // float truthMomentum = NaNfloat;
       float truthLOC0 = NaNfloat;
       float truthLOC1 = NaNfloat;
       float truthPHI = NaNfloat;
@@ -291,8 +292,8 @@ StatusCode RootTrajectoryStatesWriterTool::write(const Acts::GeometryContext& gc
       float truthTIME = NaNfloat;
 
       if (isMC) {
-        truthQ = 1;
-        truthMomentum = 1;
+        // truthQ = 1;
+        // truthMomentum = 1;
         identifyContributingParticles(*simData, traj, trackTip, particleHitCounts);
         if (not particleHitCounts.empty()) {
           // Get the barcode of the majority truth particle
@@ -300,13 +301,13 @@ StatusCode RootTrajectoryStatesWriterTool::write(const Acts::GeometryContext& gc
           // Find the truth particle via the barcode
           auto ip = particles.find(barcode);
           if (ip != particles.end()) {
-            const auto& particle = ip->second;
+            // const auto& particle = ip->second;
             ATH_MSG_DEBUG("Find the truth particle with barcode = " << barcode);
             // Get the truth particle charge
             // FIXME find better way to access charge of simulated particle, this does not work for
             // pions which have a positive pdg code (211) and positive charge
-            truthQ = particle->pdg_id() > 0 ? -1 : 1;
-            truthMomentum = particle->momentum().rho() * m_MeV2GeV;
+            // truthQ = particle->pdg_id() > 0 ? -1 : 1;
+            // truthMomentum = particle->momentum().rho() * m_MeV2GeV;
           } else {
             ATH_MSG_WARNING("Truth particle with barcode = " << barcode << " not found!");
           }
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.h
similarity index 99%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.h
index 6f0885d33ec1200edbd28761352a36840fd11e47..266de4bd060756668c4c0c806bda4a6336835fce 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.h
@@ -1,6 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_ROOTTRAJECTORYSTATESWRITERTOOL_H
 #define FASERACTSKALMANFILTER_ROOTTRAJECTORYSTATESWRITERTOOL_H
 
+#include "GeoPrimitives/GeoPrimitives.h"
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
index 76d76029674dcccbe48c41f5cf31b82b7292ba1b..ef476a0bba43d30df89ae7b5df8f1d6ed1b1235c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
@@ -1,14 +1,15 @@
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
+
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/detail/TransformationBoundToFree.hpp"
 #include "Acts/Utilities/Helpers.hpp"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 #include "TrackerReadoutGeometry/SiDetectorElement.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
 #include "HepMC/GenParticle.h"
 #include "HepMC/GenVertex.h"
 #include <TFile.h>
@@ -254,7 +255,8 @@ StatusCode RootTrajectorySummaryWriterTool::write(
             }
             // Get the truth particle info at vertex
             // const HepMC::GenVertex* vertex = particle->production_vertex();
-            t_p = truthParameters->momentum().mag();
+            Acts::Vector3 v;
+            t_p = truthParameters->momentum().norm();
             t_charge = truthParameters->charge();
             t_time = truthParameters->time();
             t_vx = truthParameters->position(geoContext).x();
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx
index f29ce6e80e65a9ca759f931174318fd1c1a68b68..bc8c89d86d947b7d4d40096b129877d3967b1261 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
+#include "SPSeedBasedInitialParameterTool.h"
 
 #include "StoreGate/ReadHandle.h"
 #include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx
index f3d227dcb6e81085b28a12d6e68a5161d171dba3..99549262760c403e8c7f34d1bc3dbdd76b430197 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
+#include "SPSimpleInitialParameterTool.h"
 
 #include "StoreGate/ReadHandle.h"
 #include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSimpleInitialParameterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSimpleInitialParameterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx
index 5325703b0ba3599a1fdcdafb350850ddc621c555..bc9bfab6d64aee5d3f07818efa496cd57bfa4d9f 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SeedingAlg.h"
+#include "SeedingAlg.h"
 
 SeedingAlg::SeedingAlg(const std::string& name, ISvcLocator* pSvcLocator) :
     AthAlgorithm(name, pSvcLocator) {}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SeedingAlg.h b/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SeedingAlg.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx
index b12215257197a931266e251620f2c63ecef7b10a..c0a0512179aea73eb45f852c4317fa1140a67b83 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h"
+#include "SegmentFitClusterTrackFinderTool.h"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.h
index 6bf7ba6984300ae218a39015786d99d034922e64..d42ab5a241e51700351399b2dd196030bcde1d0b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.h
@@ -36,7 +36,7 @@ public:
   virtual const std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> sourceLinks() const override;
   virtual const std::shared_ptr<std::vector<IdentifierLink>> idLinks() const override;
   virtual const std::shared_ptr<std::vector<std::vector<Measurement>>> measurements() const override;
-  virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints() const override;
+  virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints() const override;
   virtual const std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters() const override;
 
 private:
@@ -45,7 +45,7 @@ private:
   std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> m_sourceLinks {};
   std::shared_ptr<std::vector<IdentifierLink>> m_idLinks {};
   std::shared_ptr<std::vector<std::vector<Measurement>>> m_measurements {};
-  std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> m_spacePoints {};
+  std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> m_spacePoints {};
   std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> m_clusters {};
 
   const FaserSCT_ID* m_idHelper {nullptr};
@@ -93,7 +93,7 @@ SegmentFitClusterTrackFinderTool::measurements() const {
   return m_measurements;
 }
 
-inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>>
+inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>>
 SegmentFitClusterTrackFinderTool::spacePoints() const {
   return m_spacePoints;
 }
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx
index 0aa77c3e8b3f18a75b55aafb730e216e388c10f5..d1db42f936959115970b3133e772a2a0d47cae00 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SegmentFitTrackFinderTool.h"
+#include "SegmentFitTrackFinderTool.h"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.h
similarity index 96%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.h
index 3f555be285fc792c42db3b8903f9e208e4fa7902..fa34f94c67def0746214cd84b4467d7391707e3b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.h
@@ -35,7 +35,7 @@ public:
   virtual const std::shared_ptr<std::vector<IndexSourceLink>> sourceLinks() const override;
   virtual const std::shared_ptr<IdentifierLink> idLinks() const override;
   virtual const std::shared_ptr<std::vector<Measurement>> measurements() const override;
-  virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> spacePoints() const override;
+  virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> spacePoints() const override;
 
 private:
   std::shared_ptr<const Acts::CurvilinearTrackParameters> m_initialTrackParameters;
@@ -43,7 +43,7 @@ private:
   std::shared_ptr<std::vector<IndexSourceLink>> m_sourceLinks {};
   std::shared_ptr<IdentifierLink> m_idLinks {};
   std::shared_ptr<std::vector<Measurement>> m_measurements {};
-  std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> m_spacePoints {};
+  std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> m_spacePoints {};
 
   const FaserSCT_ID* m_idHelper {nullptr};
   const TrackerDD::SCT_DetectorManager* m_detManager {nullptr};
@@ -91,7 +91,7 @@ inline const std::shared_ptr<std::vector<Measurement>>
   return m_measurements;
 }
 
-inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>>
+inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>>
     SegmentFitTrackFinderTool::spacePoints() const {
   return m_spacePoints;
 }
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx
index 0e9a39a11391c8d2a67a487151b60ee6a075b9ef..2b21fcbae96b23d99c67656a187f68ed6a4198d7 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SimWriterTool.h"
+#include "SimWriterTool.h"
 
 #include "TFile.h"
 #include "TTree.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SimWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SimWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx
index f216042a6bbf915f169c41fe9ea0cc9b206f2c73..2ddb76108814e1cc746e39b4b5f2bbbd0e385ccd 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SummaryPlotTool.h"
+#include "SummaryPlotTool.h"
 #include <iostream>
 
 void SummaryPlotTool::book(SummaryPlotTool::SummaryPlotCache &trackSummaryPlotCache) const {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SummaryPlotTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SummaryPlotTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.h
index ea54ffc0f424409ce16887c8824ce271f9a342c2..0bb6c326ed215219677f1b1be77b2c515ef0e6bb 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SummaryPlotTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.h
@@ -1,7 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_SUMMARYPLOTTOOL_H
 #define FASERACTSKALMANFILTER_SUMMARYPLOTTOOL_H
 
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "TProfile.h"
 #include <map>
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx
index 020c19b9cf4dfcfc1b8a5641d5e6c3765733161d..be4918327055b7267255e1a54f890513c697ab14 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ThreeStationTrackSeedTool.h"
+#include "ThreeStationTrackSeedTool.h"
 #include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
 #include "TrackerIdentifier/FaserSCT_ID.h"
 #include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ThreeStationTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ThreeStationTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx
index 6b780fc368e874f4520af430e63d1cc7c4e02575..ed9682702a71145f9a4772cb7e49bda33ee8e8e0 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx
@@ -1,5 +1,5 @@
 #include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
 
 namespace {
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackClassification.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.h
similarity index 92%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackClassification.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.h
index 2ca594c7dfd08c322c08ae193239fa8cafbc5ae9..da59b9badded276e508d5c57ccca6636ebf607e9 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackClassification.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.h
@@ -1,7 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_TRACKCLASSIFICATION_H
 #define FASERACTSKALMANFILTER_TRACKCLASSIFICATION_H
 
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "TrackerSimData/TrackerSimDataCollection.h"
 
 struct ParticleHitCount {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx
index 44a86cbf06d0b10ae6aeca00bdd8bfd4e261d680..1a434fa8131e3964dc5f47fafee330c5e8b8187a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h"
+#include "CombinatorialKalmanFilterAlg.h"
 #include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
 
 #include "Acts/Propagator/EigenStepper.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx
index 0ece62669f80e7863a75b191a9fc7a51d759ca6c..460300bac782f14a09fb22df387e5ba3ab89b135 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h"
+#include "FaserActsKalmanFilterAlg.h"
 #include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
 
 #include "Acts/Propagator/EigenStepper.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx
index 820e53cb18a6190992f3003c3df7fcd5fc751de9..4ec607686a6d88e8f8be08bdd06d77665ee78cdd 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TrackSeedWriterTool.h"
+#include "TrackSeedWriterTool.h"
 #include "TFile.h"
 #include "TTree.h"
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSeedWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSeedWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx
index fdc77b13a95da4e89a7ff0c869f24e781d4ed7cc..b06019cf06fa2caae6816657233b213d9f9dd07f 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx
@@ -1,5 +1,6 @@
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/TrackSelection.h"
+#include "TrackSelection.h"
+
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
 
 namespace {
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSelection.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.h
similarity index 90%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSelection.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.h
index 858bb15c82b1e1d58ce8d92698e17aacac0b9baf..aeebd0ff1c0de3ce997e59578726609bdbbb02b7 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSelection.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.h
@@ -1,7 +1,7 @@
 #ifndef FASERACTSKALMANFILTER_TRACKSELECTION_H
 #define FASERACTSKALMANFILTER_TRACKSELECTION_H
 
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "TrackerSimData/TrackerSimDataCollection.h"
 #include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx
index 55dfda762765da67bea84b219d5279ce0bf1a197..fc98f2959933dab1e70b2de892ef020c425dcf74 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx
@@ -1,6 +1,6 @@
 #include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "TrajectoryWriterTool.h"
+#include "FaserActsRecMultiTrajectory.h"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "TFile.h"
 #include "TTree.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrajectoryWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrajectoryWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx
index f5b850d8a05877b9d7d48db65faadbff7cfac519..8be51c43441b128cee437068af940bf8a13b1abf 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
+#include "TruthBasedInitialParameterTool.h"
 
 #include "StoreGate/ReadHandle.h"
 #include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthBasedInitialParameterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.h
similarity index 95%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthBasedInitialParameterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.h
index 6b94890f311f2661ba90fd69498330adb1573ee4..f22a904ce029edbe0131109dd973d864caa82fbb 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthBasedInitialParameterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.h
@@ -3,7 +3,7 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "TrackerSimData/TrackerSimDataCollection.h"
-#include "FaserActsKalmanFilter/SimWriterTool.h"
+#include "SimWriterTool.h"
 
 
 namespace Acts {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx
index 4a574ee970e5dc9ccc67dcdd94143b2df20d1114..f0d9796f1a16ce52aee2bf52dbc11ec28c96a7a5 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TruthSeededTrackFinderTool.h"
+#include "TruthSeededTrackFinderTool.h"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthSeededTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthSeededTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.h
index 79425aa17c64a68e4c517170587a6fc84ac973c3..d07fcde1431a7651c10de46a38bba96553a5d25b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthSeededTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.h
@@ -50,7 +50,7 @@ public:
     return m_measurements;
   }
 
-  virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> spacePoints() const override;
+  virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> spacePoints() const override;
 
 private:
   std::shared_ptr<const Acts::CurvilinearTrackParameters> m_initialTrackParameters;
@@ -58,7 +58,7 @@ private:
   std::shared_ptr<std::vector<IndexSourceLink>> m_sourceLinks {};
   std::shared_ptr<IdentifierLink> m_idLinks {};
   std::shared_ptr<std::vector<Measurement>> m_measurements {};
-  std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> m_spacePoints {};
+  std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> m_spacePoints {};
 
   const FaserSCT_ID* m_idHelper{nullptr};
   const TrackerDD::SCT_DetectorManager* m_detManager{nullptr};
@@ -99,7 +99,7 @@ private:
   Gaudi::Property<double> m_covTime {this, "covTime", 1};
 };
 
-inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>>
+inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>>
 TruthSeededTrackFinderTool::spacePoints() const {
   return m_spacePoints;
 }
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx
index 16882021e4babed59f3a52030a565411290eb9ac..bfd5e9b740bbeb53529fc2c6e1048656187e1d5a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TruthTrackFinderTool.h"
+#include "TruthTrackFinderTool.h"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.h
index 3bfe35b68013a3ef323a43c245e046b7248be094..37ac68be771dc60cafd45ccfd6af38723f59470b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.h
@@ -55,7 +55,7 @@ private:
   std::shared_ptr<std::vector<IndexSourceLink>> m_sourceLinks {};
   std::shared_ptr<IdentifierLink> m_idLinks {};
   std::shared_ptr<std::vector<Measurement>> m_measurements {};
-  std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> m_spacePoints {};
+  std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> m_spacePoints {};
 
   const FaserSCT_ID* m_idHelper{nullptr};
   const TrackerDD::SCT_DetectorManager* m_detManager{nullptr};
@@ -95,7 +95,7 @@ private:
   Gaudi::Property<int> m_first_side {this, "first_side", 1, "first side for which the initial track parameters are calculated"};
 };
 
-inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>>
+inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>>
     TruthTrackFinderTool::spacePoints() const {
   return m_spacePoints;
 }
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx
index 4c23cb7febdd977df01a7a4a4de997267dbfd4c6..dae1d0d17b2e1d86a3b16f813dcd1a54d46735bd 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx
@@ -2,32 +2,32 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h"
-#include "FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h"
-//#include "FaserActsKalmanFilter/MultiTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/TruthTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
-//#include "FaserActsKalmanFilter/SimWriterTool.h"
-//#include "FaserActsKalmanFilter/TruthSeededTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/ProtoTrackWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
-//#include "FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/SegmentFitTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/ClusterTrackSeedTool.h"
-#include "FaserActsKalmanFilter/ThreeStationTrackSeedTool.h"
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/TrackSeedWriterTool.h"
-#include "FaserActsKalmanFilter/ActsTrackSeedTool.h"
-#include "FaserActsKalmanFilter/CKF2.h"
-#include "FaserActsKalmanFilter/KalmanFitterTool.h"
-#include "FaserActsKalmanFilter/MyTrackSeedTool.h"
-#include "FaserActsKalmanFilter/SeedingAlg.h"
-#include "FaserActsKalmanFilter/CircleFitTrackSeedTool.h"
-#include "FaserActsKalmanFilter/GhostBusters.h"
+#include "../FaserActsKalmanFilterAlg.h"
+#include "../CombinatorialKalmanFilterAlg.h"
+//#include "../MultiTrackFinderTool.h"
+//#include "../TruthBasedInitialParameterTool.h"
+//#include "../TruthTrackFinderTool.h"
+//#include "../SPSeedBasedInitialParameterTool.h"
+//#include "../SPSimpleInitialParameterTool.h"
+//#include "../TrajectoryWriterTool.h"
+//#include "../SimWriterTool.h"
+//#include "../TruthSeededTrackFinderTool.h"
+//#include "../ProtoTrackWriterTool.h"
+#include "../RootTrajectoryStatesWriterTool.h"
+#include "../RootTrajectorySummaryWriterTool.h"
+//#include "../SegmentFitClusterTrackFinderTool.h"
+//#include "../SegmentFitTrackFinderTool.h"
+//#include "../ClusterTrackSeedTool.h"
+#include "../ThreeStationTrackSeedTool.h"
+#include "../PerformanceWriterTool.h"
+#include "../TrackSeedWriterTool.h"
+#include "../ActsTrackSeedTool.h"
+#include "../CKF2.h"
+#include "../KalmanFitterTool.h"
+#include "../MyTrackSeedTool.h"
+#include "../SeedingAlg.h"
+#include "../CircleFitTrackSeedTool.h"
+#include "../GhostBusters.h"
 
 DECLARE_COMPONENT(FaserActsKalmanFilterAlg)
 DECLARE_COMPONENT(CombinatorialKalmanFilterAlg)