diff --git a/Digitization/CMakeLists.txt b/Digitization/CMakeLists.txt
index ae43bd3ec6bcf002b88c7cfb7606deec734411ca..53f9bdc53e2b9d5aa34244a73ad438d8b6cada43 100644
--- a/Digitization/CMakeLists.txt
+++ b/Digitization/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(G2CDArbor)
 add_subdirectory(SimHitMerge)
 add_subdirectory(DigiSimple)
 add_subdirectory(DigiCalo)
+add_subdirectory(Digi_Calo)
diff --git a/Reconstruction/Digi_Calo/CMakeLists.txt b/Digitization/Digi_Calo/CMakeLists.txt
similarity index 100%
rename from Reconstruction/Digi_Calo/CMakeLists.txt
rename to Digitization/Digi_Calo/CMakeLists.txt
diff --git a/Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp b/Digitization/Digi_Calo/src/CaloDigiAlg.cpp
similarity index 100%
rename from Reconstruction/Digi_Calo/src/CaloDigiAlg.cpp
rename to Digitization/Digi_Calo/src/CaloDigiAlg.cpp
diff --git a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h b/Digitization/Digi_Calo/src/CaloDigiAlg.h
similarity index 100%
rename from Reconstruction/Digi_Calo/src/CaloDigiAlg.h
rename to Digitization/Digi_Calo/src/CaloDigiAlg.h
diff --git a/Reconstruction/CMakeLists.txt b/Reconstruction/CMakeLists.txt
index 793d8828b8f2d6ee08f04c20dcef10b7e041c78f..db8d7c2c2d235b8ce81772520b7465a5f4d96989 100644
--- a/Reconstruction/CMakeLists.txt
+++ b/Reconstruction/CMakeLists.txt
@@ -1,8 +1,9 @@
-add_subdirectory(DCHDedx)
-add_subdirectory(Digi_Calo)
-add_subdirectory(PFA)
-add_subdirectory(SiliconTracking)
-add_subdirectory(Tracking)
-add_subdirectory(RecGenfitAlg)
+add_subdirectory(RecDCHDedx)
+add_subdirectory(RecPFAArbor)
+add_subdirectory(RecPFACyber)
+add_subdirectory(RecPFAPandora)
+add_subdirectory(RecSiTracking)
+add_subdirectory(RecTrkGlobal)
+add_subdirectory(RecDCHGenfit)
 add_subdirectory(RecAssociationMaker)
 add_subdirectory(ParticleID)
diff --git a/Reconstruction/PFA/CMakeLists.txt b/Reconstruction/PFA/CMakeLists.txt
deleted file mode 100644
index a4b9a1af2e8287c716e9f37551e935692e404334..0000000000000000000000000000000000000000
--- a/Reconstruction/PFA/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_subdirectory(Arbor)
-add_subdirectory(Pandora)
-add_subdirectory(CyberPFA)
diff --git a/Reconstruction/DCHDedx/CMakeLists.txt b/Reconstruction/RecDCHDedx/CMakeLists.txt
similarity index 100%
rename from Reconstruction/DCHDedx/CMakeLists.txt
rename to Reconstruction/RecDCHDedx/CMakeLists.txt
diff --git a/Reconstruction/DCHDedx/src/RecDCHDedxAlg.cpp b/Reconstruction/RecDCHDedx/src/RecDCHDedxAlg.cpp
similarity index 100%
rename from Reconstruction/DCHDedx/src/RecDCHDedxAlg.cpp
rename to Reconstruction/RecDCHDedx/src/RecDCHDedxAlg.cpp
diff --git a/Reconstruction/DCHDedx/src/RecDCHDedxAlg.h b/Reconstruction/RecDCHDedx/src/RecDCHDedxAlg.h
similarity index 100%
rename from Reconstruction/DCHDedx/src/RecDCHDedxAlg.h
rename to Reconstruction/RecDCHDedx/src/RecDCHDedxAlg.h
diff --git a/Reconstruction/RecGenfitAlg/CMakeLists.txt b/Reconstruction/RecDCHGenfit/CMakeLists.txt
similarity index 100%
rename from Reconstruction/RecGenfitAlg/CMakeLists.txt
rename to Reconstruction/RecDCHGenfit/CMakeLists.txt
diff --git a/Reconstruction/RecGenfitAlg/README.md b/Reconstruction/RecDCHGenfit/README.md
similarity index 100%
rename from Reconstruction/RecGenfitAlg/README.md
rename to Reconstruction/RecDCHGenfit/README.md
diff --git a/Reconstruction/RecGenfitAlg/src/DCTrackFinding.cpp b/Reconstruction/RecDCHGenfit/src/DCTrackFinding.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/DCTrackFinding.cpp
rename to Reconstruction/RecDCHGenfit/src/DCTrackFinding.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/DCTrackFinding.h b/Reconstruction/RecDCHGenfit/src/DCTrackFinding.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/DCTrackFinding.h
rename to Reconstruction/RecDCHGenfit/src/DCTrackFinding.h
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitField.cpp b/Reconstruction/RecDCHGenfit/src/GenfitField.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitField.cpp
rename to Reconstruction/RecDCHGenfit/src/GenfitField.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitField.h b/Reconstruction/RecDCHGenfit/src/GenfitField.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitField.h
rename to Reconstruction/RecDCHGenfit/src/GenfitField.h
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitFitter.cpp b/Reconstruction/RecDCHGenfit/src/GenfitFitter.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitFitter.cpp
rename to Reconstruction/RecDCHGenfit/src/GenfitFitter.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitFitter.h b/Reconstruction/RecDCHGenfit/src/GenfitFitter.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitFitter.h
rename to Reconstruction/RecDCHGenfit/src/GenfitFitter.h
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitHit.cpp b/Reconstruction/RecDCHGenfit/src/GenfitHit.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitHit.cpp
rename to Reconstruction/RecDCHGenfit/src/GenfitHit.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitHit.h b/Reconstruction/RecDCHGenfit/src/GenfitHit.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitHit.h
rename to Reconstruction/RecDCHGenfit/src/GenfitHit.h
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitMaterialInterface.cpp b/Reconstruction/RecDCHGenfit/src/GenfitMaterialInterface.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitMaterialInterface.cpp
rename to Reconstruction/RecDCHGenfit/src/GenfitMaterialInterface.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitMaterialInterface.h b/Reconstruction/RecDCHGenfit/src/GenfitMaterialInterface.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitMaterialInterface.h
rename to Reconstruction/RecDCHGenfit/src/GenfitMaterialInterface.h
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp b/Reconstruction/RecDCHGenfit/src/GenfitTrack.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
rename to Reconstruction/RecDCHGenfit/src/GenfitTrack.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitTrack.h b/Reconstruction/RecDCHGenfit/src/GenfitTrack.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitTrack.h
rename to Reconstruction/RecDCHGenfit/src/GenfitTrack.h
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitUnit.h b/Reconstruction/RecDCHGenfit/src/GenfitUnit.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/GenfitUnit.h
rename to Reconstruction/RecDCHGenfit/src/GenfitUnit.h
diff --git a/Reconstruction/RecGenfitAlg/src/LSFitting.cpp b/Reconstruction/RecDCHGenfit/src/LSFitting.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/LSFitting.cpp
rename to Reconstruction/RecDCHGenfit/src/LSFitting.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/LSFitting.h b/Reconstruction/RecDCHGenfit/src/LSFitting.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/LSFitting.h
rename to Reconstruction/RecDCHGenfit/src/LSFitting.h
diff --git a/Reconstruction/RecGenfitAlg/src/PlanarMeasurementSDT.cpp b/Reconstruction/RecDCHGenfit/src/PlanarMeasurementSDT.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/PlanarMeasurementSDT.cpp
rename to Reconstruction/RecDCHGenfit/src/PlanarMeasurementSDT.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/PlanarMeasurementSDT.h b/Reconstruction/RecDCHGenfit/src/PlanarMeasurementSDT.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/PlanarMeasurementSDT.h
rename to Reconstruction/RecDCHGenfit/src/PlanarMeasurementSDT.h
diff --git a/Reconstruction/RecGenfitAlg/src/RecGenfitAlgSDT.cpp b/Reconstruction/RecDCHGenfit/src/RecGenfitAlgSDT.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/RecGenfitAlgSDT.cpp
rename to Reconstruction/RecDCHGenfit/src/RecGenfitAlgSDT.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/RecGenfitAlgSDT.h b/Reconstruction/RecDCHGenfit/src/RecGenfitAlgSDT.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/RecGenfitAlgSDT.h
rename to Reconstruction/RecDCHGenfit/src/RecGenfitAlgSDT.h
diff --git a/Reconstruction/RecGenfitAlg/src/WireMeasurementDC.cpp b/Reconstruction/RecDCHGenfit/src/WireMeasurementDC.cpp
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/WireMeasurementDC.cpp
rename to Reconstruction/RecDCHGenfit/src/WireMeasurementDC.cpp
diff --git a/Reconstruction/RecGenfitAlg/src/WireMeasurementDC.h b/Reconstruction/RecDCHGenfit/src/WireMeasurementDC.h
similarity index 100%
rename from Reconstruction/RecGenfitAlg/src/WireMeasurementDC.h
rename to Reconstruction/RecDCHGenfit/src/WireMeasurementDC.h
diff --git a/Reconstruction/PFA/Arbor/CMakeLists.txt b/Reconstruction/RecPFAArbor/CMakeLists.txt
similarity index 100%
rename from Reconstruction/PFA/Arbor/CMakeLists.txt
rename to Reconstruction/RecPFAArbor/CMakeLists.txt
diff --git a/Reconstruction/PFA/Arbor/src/Arbor.cc b/Reconstruction/RecPFAArbor/src/Arbor.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/Arbor.cc
rename to Reconstruction/RecPFAArbor/src/Arbor.cc
diff --git a/Reconstruction/PFA/Arbor/src/Arbor.h b/Reconstruction/RecPFAArbor/src/Arbor.h
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/Arbor.h
rename to Reconstruction/RecPFAArbor/src/Arbor.h
diff --git a/Reconstruction/PFA/Arbor/src/ArborHit.cc b/Reconstruction/RecPFAArbor/src/ArborHit.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ArborHit.cc
rename to Reconstruction/RecPFAArbor/src/ArborHit.cc
diff --git a/Reconstruction/PFA/Arbor/src/ArborHit.h b/Reconstruction/RecPFAArbor/src/ArborHit.h
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ArborHit.h
rename to Reconstruction/RecPFAArbor/src/ArborHit.h
diff --git a/Reconstruction/PFA/Arbor/src/ArborTool.cc b/Reconstruction/RecPFAArbor/src/ArborTool.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ArborTool.cc
rename to Reconstruction/RecPFAArbor/src/ArborTool.cc
diff --git a/Reconstruction/PFA/Arbor/src/ArborTool.h b/Reconstruction/RecPFAArbor/src/ArborTool.h
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ArborTool.h
rename to Reconstruction/RecPFAArbor/src/ArborTool.h
diff --git a/Reconstruction/PFA/Arbor/src/ArborToolLCIO.cc b/Reconstruction/RecPFAArbor/src/ArborToolLCIO.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ArborToolLCIO.cc
rename to Reconstruction/RecPFAArbor/src/ArborToolLCIO.cc
diff --git a/Reconstruction/PFA/Arbor/src/ArborToolLCIO.hh b/Reconstruction/RecPFAArbor/src/ArborToolLCIO.hh
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ArborToolLCIO.hh
rename to Reconstruction/RecPFAArbor/src/ArborToolLCIO.hh
diff --git a/Reconstruction/PFA/Arbor/src/BushConnect.cc b/Reconstruction/RecPFAArbor/src/BushConnect.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/BushConnect.cc
rename to Reconstruction/RecPFAArbor/src/BushConnect.cc
diff --git a/Reconstruction/PFA/Arbor/src/BushConnect.hh b/Reconstruction/RecPFAArbor/src/BushConnect.hh
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/BushConnect.hh
rename to Reconstruction/RecPFAArbor/src/BushConnect.hh
diff --git a/Reconstruction/PFA/Arbor/src/ClusterAna.cc b/Reconstruction/RecPFAArbor/src/ClusterAna.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ClusterAna.cc
rename to Reconstruction/RecPFAArbor/src/ClusterAna.cc
diff --git a/Reconstruction/PFA/Arbor/src/ClusterAna.hh b/Reconstruction/RecPFAArbor/src/ClusterAna.hh
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/ClusterAna.hh
rename to Reconstruction/RecPFAArbor/src/ClusterAna.hh
diff --git a/Reconstruction/PFA/Arbor/src/DetectorPos.cc b/Reconstruction/RecPFAArbor/src/DetectorPos.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/DetectorPos.cc
rename to Reconstruction/RecPFAArbor/src/DetectorPos.cc
diff --git a/Reconstruction/PFA/Arbor/src/DetectorPos.hh b/Reconstruction/RecPFAArbor/src/DetectorPos.hh
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/DetectorPos.hh
rename to Reconstruction/RecPFAArbor/src/DetectorPos.hh
diff --git a/Reconstruction/PFA/Arbor/src/HelixClassD.cc b/Reconstruction/RecPFAArbor/src/HelixClassD.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/HelixClassD.cc
rename to Reconstruction/RecPFAArbor/src/HelixClassD.cc
diff --git a/Reconstruction/PFA/Arbor/src/HelixClassD.hh b/Reconstruction/RecPFAArbor/src/HelixClassD.hh
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/HelixClassD.hh
rename to Reconstruction/RecPFAArbor/src/HelixClassD.hh
diff --git a/Reconstruction/PFA/Arbor/src/KDTreeLinkerAlgoT.h b/Reconstruction/RecPFAArbor/src/KDTreeLinkerAlgoT.h
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/KDTreeLinkerAlgoT.h
rename to Reconstruction/RecPFAArbor/src/KDTreeLinkerAlgoT.h
diff --git a/Reconstruction/PFA/Arbor/src/KDTreeLinkerToolsT.h b/Reconstruction/RecPFAArbor/src/KDTreeLinkerToolsT.h
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/KDTreeLinkerToolsT.h
rename to Reconstruction/RecPFAArbor/src/KDTreeLinkerToolsT.h
diff --git a/Reconstruction/PFA/Arbor/src/MarlinArbor.cc b/Reconstruction/RecPFAArbor/src/MarlinArbor.cc
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/MarlinArbor.cc
rename to Reconstruction/RecPFAArbor/src/MarlinArbor.cc
diff --git a/Reconstruction/PFA/Arbor/src/MarlinArbor.hh b/Reconstruction/RecPFAArbor/src/MarlinArbor.hh
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/MarlinArbor.hh
rename to Reconstruction/RecPFAArbor/src/MarlinArbor.hh
diff --git a/Reconstruction/PFA/Arbor/src/cellIDDecoder.h b/Reconstruction/RecPFAArbor/src/cellIDDecoder.h
similarity index 100%
rename from Reconstruction/PFA/Arbor/src/cellIDDecoder.h
rename to Reconstruction/RecPFAArbor/src/cellIDDecoder.h
diff --git a/Reconstruction/PFA/CyberPFA/CMakeLists.txt b/Reconstruction/RecPFACyber/CMakeLists.txt
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/CMakeLists.txt
rename to Reconstruction/RecPFACyber/CMakeLists.txt
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/AxisMergingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/AxisMergingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/AxisMergingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/AxisMergingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/ClusterMergingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/ClusterMergingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/ClusterMergingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/ClusterMergingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/ConeClustering2DAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/ConeClustering2DAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/ConeClustering2DAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/ConeClustering2DAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/ConeClusteringAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/ConeClusteringAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/ConeClusteringAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/ConeClusteringAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/EnergySplittingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/EnergySplittingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/EnergySplittingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/EnergySplittingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/EnergyTimeMatchingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/EnergyTimeMatchingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/EnergyTimeMatchingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/EnergyTimeMatchingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/ExampleAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/ExampleAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/ExampleAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/ExampleAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/GlobalClusteringAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/GlobalClusteringAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/GlobalClusteringAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/GlobalClusteringAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/HcalClusteringAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/HcalClusteringAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/HcalClusteringAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/HcalClusteringAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/HoughClusteringAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/HoughClusteringAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/HoughClusteringAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/HoughClusteringAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/LocalMaxFindingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/LocalMaxFindingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/LocalMaxFindingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/LocalMaxFindingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/PFOCreatingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/PFOCreatingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/PFOCreatingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/PFOCreatingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/PFOReclusteringAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/PFOReclusteringAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/PFOReclusteringAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/PFOReclusteringAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TrackClusterConnectingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TrackClusterConnectingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TrackClusterConnectingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TrackClusterConnectingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TrackExtrapolatingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TrackExtrapolatingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TrackExtrapolatingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TrackExtrapolatingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TrackMatchingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TrackMatchingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TrackMatchingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TrackMatchingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TruthClusterMergingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TruthClusterMergingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TruthClusterMergingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TruthClusterMergingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TruthClusteringAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TruthClusteringAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TruthClusteringAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TruthClusteringAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TruthEnergySplittingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TruthEnergySplittingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TruthEnergySplittingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TruthEnergySplittingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TruthMatchingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TruthMatchingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TruthMatchingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TruthMatchingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TruthPatternRecAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TruthPatternRecAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TruthPatternRecAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TruthPatternRecAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Algorithm/TruthTrackMatchingAlg.h b/Reconstruction/RecPFACyber/include/Algorithm/TruthTrackMatchingAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Algorithm/TruthTrackMatchingAlg.h
rename to Reconstruction/RecPFACyber/include/Algorithm/TruthTrackMatchingAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/CyberDataCol.h b/Reconstruction/RecPFACyber/include/CyberDataCol.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/CyberDataCol.h
rename to Reconstruction/RecPFACyber/include/CyberDataCol.h
diff --git a/Reconstruction/PFA/CyberPFA/include/CyberPFAlg.h b/Reconstruction/RecPFACyber/include/CyberPFAlg.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/CyberPFAlg.h
rename to Reconstruction/RecPFACyber/include/CyberPFAlg.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/Calo1DCluster.h b/Reconstruction/RecPFACyber/include/Objects/Calo1DCluster.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/Calo1DCluster.h
rename to Reconstruction/RecPFACyber/include/Objects/Calo1DCluster.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/Calo2DCluster.h b/Reconstruction/RecPFACyber/include/Objects/Calo2DCluster.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/Calo2DCluster.h
rename to Reconstruction/RecPFACyber/include/Objects/Calo2DCluster.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/Calo3DCluster.h b/Reconstruction/RecPFACyber/include/Objects/Calo3DCluster.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/Calo3DCluster.h
rename to Reconstruction/RecPFACyber/include/Objects/Calo3DCluster.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/CaloHalfCluster.h b/Reconstruction/RecPFACyber/include/Objects/CaloHalfCluster.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/CaloHalfCluster.h
rename to Reconstruction/RecPFACyber/include/Objects/CaloHalfCluster.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/CaloHit.h b/Reconstruction/RecPFACyber/include/Objects/CaloHit.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/CaloHit.h
rename to Reconstruction/RecPFACyber/include/Objects/CaloHit.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/CaloUnit.h b/Reconstruction/RecPFACyber/include/Objects/CaloUnit.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/CaloUnit.h
rename to Reconstruction/RecPFACyber/include/Objects/CaloUnit.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/HoughObject.h b/Reconstruction/RecPFACyber/include/Objects/HoughObject.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/HoughObject.h
rename to Reconstruction/RecPFACyber/include/Objects/HoughObject.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/HoughSpace.h b/Reconstruction/RecPFACyber/include/Objects/HoughSpace.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/HoughSpace.h
rename to Reconstruction/RecPFACyber/include/Objects/HoughSpace.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/PFObject.h b/Reconstruction/RecPFACyber/include/Objects/PFObject.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/PFObject.h
rename to Reconstruction/RecPFACyber/include/Objects/PFObject.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/Track.h b/Reconstruction/RecPFACyber/include/Objects/Track.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/Track.h
rename to Reconstruction/RecPFACyber/include/Objects/Track.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Objects/TrackState.h b/Reconstruction/RecPFACyber/include/Objects/TrackState.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Objects/TrackState.h
rename to Reconstruction/RecPFACyber/include/Objects/TrackState.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/Algorithm.h b/Reconstruction/RecPFACyber/include/Tools/Algorithm.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/Algorithm.h
rename to Reconstruction/RecPFACyber/include/Tools/Algorithm.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/AlgorithmManager.h b/Reconstruction/RecPFACyber/include/Tools/AlgorithmManager.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/AlgorithmManager.h
rename to Reconstruction/RecPFACyber/include/Tools/AlgorithmManager.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/CaloHitsCreator.h b/Reconstruction/RecPFACyber/include/Tools/CaloHitsCreator.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/CaloHitsCreator.h
rename to Reconstruction/RecPFACyber/include/Tools/CaloHitsCreator.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/MCParticleCreator.h b/Reconstruction/RecPFACyber/include/Tools/MCParticleCreator.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/MCParticleCreator.h
rename to Reconstruction/RecPFACyber/include/Tools/MCParticleCreator.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/OutputCreator.h b/Reconstruction/RecPFACyber/include/Tools/OutputCreator.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/OutputCreator.h
rename to Reconstruction/RecPFACyber/include/Tools/OutputCreator.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/TrackCreator.h b/Reconstruction/RecPFACyber/include/Tools/TrackCreator.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/TrackCreator.h
rename to Reconstruction/RecPFACyber/include/Tools/TrackCreator.h
diff --git a/Reconstruction/PFA/CyberPFA/include/Tools/TrackFitInEcal.h b/Reconstruction/RecPFACyber/include/Tools/TrackFitInEcal.h
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/include/Tools/TrackFitInEcal.h
rename to Reconstruction/RecPFACyber/include/Tools/TrackFitInEcal.h
diff --git a/Reconstruction/PFA/CyberPFA/script/digi.py b/Reconstruction/RecPFACyber/script/digi.py
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/script/digi.py
rename to Reconstruction/RecPFACyber/script/digi.py
diff --git a/Reconstruction/PFA/CyberPFA/script/rec.py b/Reconstruction/RecPFACyber/script/rec.py
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/script/rec.py
rename to Reconstruction/RecPFACyber/script/rec.py
diff --git a/Reconstruction/PFA/CyberPFA/script/sim.py b/Reconstruction/RecPFACyber/script/sim.py
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/script/sim.py
rename to Reconstruction/RecPFACyber/script/sim.py
diff --git a/Reconstruction/PFA/CyberPFA/script/tracking.py b/Reconstruction/RecPFACyber/script/tracking.py
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/script/tracking.py
rename to Reconstruction/RecPFACyber/script/tracking.py
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/ArborClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/ArborClusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/ArborClusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/ArborClusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/ArborTreeMergingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/ArborTreeMergingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/ArborTreeMergingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/ArborTreeMergingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/AxisMergingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/AxisMergingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/AxisMergingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/AxisMergingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/ClusterMergingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/ClusterMergingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/ClusterMergingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/ClusterMergingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/ConeClustering2DAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/ConeClustering2DAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/ConeClustering2DAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/ConeClustering2DAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/ConeClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/ConeClusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/ConeClusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/ConeClusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/EnergySplittingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/EnergySplittingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/EnergySplittingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/EnergySplittingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/EnergyTimeMatchingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/EnergyTimeMatchingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/EnergyTimeMatchingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/EnergyTimeMatchingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/ExampleAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/ExampleAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/ExampleAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/ExampleAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/GlobalClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/GlobalClusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/GlobalClusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/GlobalClusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/HcalClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/HcalClusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/HcalClusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/HcalClusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/HoughClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/HoughClusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/HoughClusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/HoughClusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/LocalMaxFindingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/LocalMaxFindingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/LocalMaxFindingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/LocalMaxFindingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/PFOCreatingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/PFOCreatingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/PFOCreatingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/PFOCreatingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/PFOReclusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/PFOReclusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/PFOReclusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/PFOReclusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TrackClusterConnectingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TrackClusterConnectingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TrackClusterConnectingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TrackClusterConnectingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TrackExtrapolatingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TrackExtrapolatingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TrackExtrapolatingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TrackExtrapolatingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TrackMatchingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TrackMatchingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TrackMatchingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TrackMatchingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TruthClusterMergingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TruthClusterMergingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TruthClusterMergingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TruthClusterMergingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TruthClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TruthClusteringAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TruthClusteringAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TruthClusteringAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TruthEnergySplittingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TruthEnergySplittingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TruthEnergySplittingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TruthEnergySplittingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TruthMatchingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TruthMatchingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TruthMatchingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TruthMatchingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TruthPatternRecAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TruthPatternRecAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TruthPatternRecAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TruthPatternRecAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Algorithm/TruthTrackMatchingAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/TruthTrackMatchingAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Algorithm/TruthTrackMatchingAlg.cpp
rename to Reconstruction/RecPFACyber/src/Algorithm/TruthTrackMatchingAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/CyberDataCol.cpp b/Reconstruction/RecPFACyber/src/CyberDataCol.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/CyberDataCol.cpp
rename to Reconstruction/RecPFACyber/src/CyberDataCol.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/CyberPFAlg.cpp b/Reconstruction/RecPFACyber/src/CyberPFAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/CyberPFAlg.cpp
rename to Reconstruction/RecPFACyber/src/CyberPFAlg.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/Calo1DCluster.cc b/Reconstruction/RecPFACyber/src/Objects/Calo1DCluster.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/Calo1DCluster.cc
rename to Reconstruction/RecPFACyber/src/Objects/Calo1DCluster.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/Calo2DCluster.cc b/Reconstruction/RecPFACyber/src/Objects/Calo2DCluster.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/Calo2DCluster.cc
rename to Reconstruction/RecPFACyber/src/Objects/Calo2DCluster.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/Calo3DCluster.cc b/Reconstruction/RecPFACyber/src/Objects/Calo3DCluster.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/Calo3DCluster.cc
rename to Reconstruction/RecPFACyber/src/Objects/Calo3DCluster.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/CaloHalfCluster.cc b/Reconstruction/RecPFACyber/src/Objects/CaloHalfCluster.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/CaloHalfCluster.cc
rename to Reconstruction/RecPFACyber/src/Objects/CaloHalfCluster.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/CaloHit.cc b/Reconstruction/RecPFACyber/src/Objects/CaloHit.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/CaloHit.cc
rename to Reconstruction/RecPFACyber/src/Objects/CaloHit.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/CaloUnit.cc b/Reconstruction/RecPFACyber/src/Objects/CaloUnit.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/CaloUnit.cc
rename to Reconstruction/RecPFACyber/src/Objects/CaloUnit.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/HoughObject.cc b/Reconstruction/RecPFACyber/src/Objects/HoughObject.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/HoughObject.cc
rename to Reconstruction/RecPFACyber/src/Objects/HoughObject.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/HoughSpace.cc b/Reconstruction/RecPFACyber/src/Objects/HoughSpace.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/HoughSpace.cc
rename to Reconstruction/RecPFACyber/src/Objects/HoughSpace.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/PFObject.cc b/Reconstruction/RecPFACyber/src/Objects/PFObject.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/PFObject.cc
rename to Reconstruction/RecPFACyber/src/Objects/PFObject.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Objects/Track.cc b/Reconstruction/RecPFACyber/src/Objects/Track.cc
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Objects/Track.cc
rename to Reconstruction/RecPFACyber/src/Objects/Track.cc
diff --git a/Reconstruction/PFA/CyberPFA/src/Tools/CaloHitsCreator.cpp b/Reconstruction/RecPFACyber/src/Tools/CaloHitsCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Tools/CaloHitsCreator.cpp
rename to Reconstruction/RecPFACyber/src/Tools/CaloHitsCreator.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Tools/MCParticleCreator.cpp b/Reconstruction/RecPFACyber/src/Tools/MCParticleCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Tools/MCParticleCreator.cpp
rename to Reconstruction/RecPFACyber/src/Tools/MCParticleCreator.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Tools/OutputCreator.cpp b/Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Tools/OutputCreator.cpp
rename to Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Tools/TrackCreator.cpp b/Reconstruction/RecPFACyber/src/Tools/TrackCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Tools/TrackCreator.cpp
rename to Reconstruction/RecPFACyber/src/Tools/TrackCreator.cpp
diff --git a/Reconstruction/PFA/CyberPFA/src/Tools/TrackFitInEcal.cpp b/Reconstruction/RecPFACyber/src/Tools/TrackFitInEcal.cpp
similarity index 100%
rename from Reconstruction/PFA/CyberPFA/src/Tools/TrackFitInEcal.cpp
rename to Reconstruction/RecPFACyber/src/Tools/TrackFitInEcal.cpp
diff --git a/Reconstruction/PFA/Pandora/CMakeLists.txt b/Reconstruction/RecPFAPandora/CMakeLists.txt
similarity index 100%
rename from Reconstruction/PFA/Pandora/CMakeLists.txt
rename to Reconstruction/RecPFAPandora/CMakeLists.txt
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/RecPFAPandora/GaudiPandora/CMakeLists.txt
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
rename to Reconstruction/RecPFAPandora/GaudiPandora/CMakeLists.txt
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/CaloHitCreator.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/CaloHitCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/CaloHitCreator.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/CaloHitCreator.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/GeometryCreator.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/GeometryCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/GeometryCreator.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/GeometryCreator.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/MCParticleCreator.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/MCParticleCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/MCParticleCreator.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/MCParticleCreator.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/PandoraPFAlg.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/PandoraPFAlg.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/PfoCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/PfoCreator.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/TrackCreator.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/TrackCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/TrackCreator.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/TrackCreator.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/Utility.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/Utility.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/Utility.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/Utility.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/cellIDDecoder.h b/Reconstruction/RecPFAPandora/GaudiPandora/include/cellIDDecoder.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/include/cellIDDecoder.h
rename to Reconstruction/RecPFAPandora/GaudiPandora/include/cellIDDecoder.h
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/CaloHitCreator.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/CaloHitCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/CaloHitCreator.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/CaloHitCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/GeometryCreator.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/GeometryCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/GeometryCreator.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/GeometryCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/MCParticleCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/MCParticleCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/PandoraPFAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/PandoraPFAlg.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/PfoCreator.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/PfoCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/PfoCreator.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/PfoCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/TrackCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/TrackCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/Utility.cpp b/Reconstruction/RecPFAPandora/GaudiPandora/src/Utility.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/GaudiPandora/src/Utility.cpp
rename to Reconstruction/RecPFAPandora/GaudiPandora/src/Utility.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt b/Reconstruction/RecPFAPandora/MatrixPandora/CMakeLists.txt
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
rename to Reconstruction/RecPFAPandora/MatrixPandora/CMakeLists.txt
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/CaloHitCreator.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/CaloHitCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/CaloHitCreator.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/CaloHitCreator.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/GeometryCreator.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/GeometryCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/GeometryCreator.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/GeometryCreator.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/MCParticleCreator.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/MCParticleCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/MCParticleCreator.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/MCParticleCreator.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/PandoraMatrixAlg.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/PandoraMatrixAlg.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/PfoCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/PfoCreator.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/TrackCreator.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/TrackCreator.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/TrackCreator.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/TrackCreator.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/Utility.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/Utility.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/Utility.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/Utility.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/cellIDDecoder.h b/Reconstruction/RecPFAPandora/MatrixPandora/include/cellIDDecoder.h
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/include/cellIDDecoder.h
rename to Reconstruction/RecPFAPandora/MatrixPandora/include/cellIDDecoder.h
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/CaloHitCreator.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/CaloHitCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/CaloHitCreator.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/CaloHitCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/GeometryCreator.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/GeometryCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/GeometryCreator.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/GeometryCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/MCParticleCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/MCParticleCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/PandoraMatrixAlg.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/PandoraMatrixAlg.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/PfoCreator.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/PfoCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/PfoCreator.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/PfoCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/TrackCreator.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/TrackCreator.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/Utility.cpp b/Reconstruction/RecPFAPandora/MatrixPandora/src/Utility.cpp
similarity index 100%
rename from Reconstruction/PFA/Pandora/MatrixPandora/src/Utility.cpp
rename to Reconstruction/RecPFAPandora/MatrixPandora/src/Utility.cpp
diff --git a/Reconstruction/PFA/Pandora/PandoraLikelihoodData9EBin.xml b/Reconstruction/RecPFAPandora/PandoraLikelihoodData9EBin.xml
similarity index 100%
rename from Reconstruction/PFA/Pandora/PandoraLikelihoodData9EBin.xml
rename to Reconstruction/RecPFAPandora/PandoraLikelihoodData9EBin.xml
diff --git a/Reconstruction/PFA/Pandora/PandoraSettingsDefault.xml b/Reconstruction/RecPFAPandora/PandoraSettingsDefault.xml
similarity index 100%
rename from Reconstruction/PFA/Pandora/PandoraSettingsDefault.xml
rename to Reconstruction/RecPFAPandora/PandoraSettingsDefault.xml
diff --git a/Reconstruction/SiliconTracking/CMakeLists.txt b/Reconstruction/RecSiTracking/CMakeLists.txt
similarity index 100%
rename from Reconstruction/SiliconTracking/CMakeLists.txt
rename to Reconstruction/RecSiTracking/CMakeLists.txt
diff --git a/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.cpp b/Reconstruction/RecSiTracking/src/ForwardTrackingAlg.cpp
similarity index 100%
rename from Reconstruction/SiliconTracking/src/ForwardTrackingAlg.cpp
rename to Reconstruction/RecSiTracking/src/ForwardTrackingAlg.cpp
diff --git a/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h b/Reconstruction/RecSiTracking/src/ForwardTrackingAlg.h
similarity index 100%
rename from Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
rename to Reconstruction/RecSiTracking/src/ForwardTrackingAlg.h
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp b/Reconstruction/RecSiTracking/src/SiliconTrackingAlg.cpp
similarity index 100%
rename from Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
rename to Reconstruction/RecSiTracking/src/SiliconTrackingAlg.cpp
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h b/Reconstruction/RecSiTracking/src/SiliconTrackingAlg.h
similarity index 100%
rename from Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
rename to Reconstruction/RecSiTracking/src/SiliconTrackingAlg.h
diff --git a/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.cpp b/Reconstruction/RecSiTracking/src/SpacePointBuilderAlg.cpp
similarity index 100%
rename from Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.cpp
rename to Reconstruction/RecSiTracking/src/SpacePointBuilderAlg.cpp
diff --git a/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h b/Reconstruction/RecSiTracking/src/SpacePointBuilderAlg.h
similarity index 100%
rename from Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
rename to Reconstruction/RecSiTracking/src/SpacePointBuilderAlg.h
diff --git a/Reconstruction/SiliconTracking/src/TrackSubsetAlg.cpp b/Reconstruction/RecSiTracking/src/TrackSubsetAlg.cpp
similarity index 100%
rename from Reconstruction/SiliconTracking/src/TrackSubsetAlg.cpp
rename to Reconstruction/RecSiTracking/src/TrackSubsetAlg.cpp
diff --git a/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h b/Reconstruction/RecSiTracking/src/TrackSubsetAlg.h
similarity index 100%
rename from Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
rename to Reconstruction/RecSiTracking/src/TrackSubsetAlg.h
diff --git a/Reconstruction/Tracking/CMakeLists.txt b/Reconstruction/RecTrkGlobal/CMakeLists.txt
similarity index 100%
rename from Reconstruction/Tracking/CMakeLists.txt
rename to Reconstruction/RecTrkGlobal/CMakeLists.txt
diff --git a/Reconstruction/Tracking/include/Tracking/ITrackFitterTool.h b/Reconstruction/RecTrkGlobal/include/Tracking/ITrackFitterTool.h
similarity index 100%
rename from Reconstruction/Tracking/include/Tracking/ITrackFitterTool.h
rename to Reconstruction/RecTrkGlobal/include/Tracking/ITrackFitterTool.h
diff --git a/Reconstruction/Tracking/include/Tracking/TrackingHelper.h b/Reconstruction/RecTrkGlobal/include/Tracking/TrackingHelper.h
similarity index 100%
rename from Reconstruction/Tracking/include/Tracking/TrackingHelper.h
rename to Reconstruction/RecTrkGlobal/include/Tracking/TrackingHelper.h
diff --git a/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.cpp b/Reconstruction/RecTrkGlobal/src/Clupatra/ClupatraAlg.cpp
similarity index 100%
rename from Reconstruction/Tracking/src/Clupatra/ClupatraAlg.cpp
rename to Reconstruction/RecTrkGlobal/src/Clupatra/ClupatraAlg.cpp
diff --git a/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h b/Reconstruction/RecTrkGlobal/src/Clupatra/ClupatraAlg.h
similarity index 100%
rename from Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
rename to Reconstruction/RecTrkGlobal/src/Clupatra/ClupatraAlg.h
diff --git a/Reconstruction/Tracking/src/Clupatra/NNClusterer.h b/Reconstruction/RecTrkGlobal/src/Clupatra/NNClusterer.h
similarity index 100%
rename from Reconstruction/Tracking/src/Clupatra/NNClusterer.h
rename to Reconstruction/RecTrkGlobal/src/Clupatra/NNClusterer.h
diff --git a/Reconstruction/Tracking/src/Clupatra/RuntimeMap.h b/Reconstruction/RecTrkGlobal/src/Clupatra/RuntimeMap.h
similarity index 100%
rename from Reconstruction/Tracking/src/Clupatra/RuntimeMap.h
rename to Reconstruction/RecTrkGlobal/src/Clupatra/RuntimeMap.h
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp b/Reconstruction/RecTrkGlobal/src/Clupatra/clupatra_new.cpp
similarity index 100%
rename from Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
rename to Reconstruction/RecTrkGlobal/src/Clupatra/clupatra_new.cpp
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.h b/Reconstruction/RecTrkGlobal/src/Clupatra/clupatra_new.h
similarity index 100%
rename from Reconstruction/Tracking/src/Clupatra/clupatra_new.h
rename to Reconstruction/RecTrkGlobal/src/Clupatra/clupatra_new.h
diff --git a/Reconstruction/Tracking/src/FitterTool/KalTestTool.cpp b/Reconstruction/RecTrkGlobal/src/FitterTool/KalTestTool.cpp
similarity index 100%
rename from Reconstruction/Tracking/src/FitterTool/KalTestTool.cpp
rename to Reconstruction/RecTrkGlobal/src/FitterTool/KalTestTool.cpp
diff --git a/Reconstruction/Tracking/src/FitterTool/KalTestTool.h b/Reconstruction/RecTrkGlobal/src/FitterTool/KalTestTool.h
similarity index 100%
rename from Reconstruction/Tracking/src/FitterTool/KalTestTool.h
rename to Reconstruction/RecTrkGlobal/src/FitterTool/KalTestTool.h
diff --git a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp b/Reconstruction/RecTrkGlobal/src/FullLDCTracking/FullLDCTrackingAlg.cpp
similarity index 100%
rename from Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp
rename to Reconstruction/RecTrkGlobal/src/FullLDCTracking/FullLDCTrackingAlg.cpp
diff --git a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h b/Reconstruction/RecTrkGlobal/src/FullLDCTracking/FullLDCTrackingAlg.h
similarity index 100%
rename from Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
rename to Reconstruction/RecTrkGlobal/src/FullLDCTracking/FullLDCTrackingAlg.h
diff --git a/Reconstruction/Tracking/src/TruthTracker/TruthTrackerAlg.cpp b/Reconstruction/RecTrkGlobal/src/TruthTracker/TruthTrackerAlg.cpp
similarity index 100%
rename from Reconstruction/Tracking/src/TruthTracker/TruthTrackerAlg.cpp
rename to Reconstruction/RecTrkGlobal/src/TruthTracker/TruthTrackerAlg.cpp
diff --git a/Reconstruction/Tracking/src/TruthTracker/TruthTrackerAlg.h b/Reconstruction/RecTrkGlobal/src/TruthTracker/TruthTrackerAlg.h
similarity index 100%
rename from Reconstruction/Tracking/src/TruthTracker/TruthTrackerAlg.h
rename to Reconstruction/RecTrkGlobal/src/TruthTracker/TruthTrackerAlg.h