diff --git a/Detectors/DD4hepDetector/compact/Simple_CLIC.xml b/Detectors/DD4hepDetector/compact/CLIC/Simple_CLIC.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/Simple_CLIC.xml
rename to Detectors/DD4hepDetector/compact/CLIC/Simple_CLIC.xml
diff --git a/Detectors/DD4hepDetector/compact/FCChhTrackerTkLayout.xml b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChhTrackerTkLayout.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/FCChhTrackerTkLayout.xml
rename to Detectors/DD4hepDetector/compact/FCChhBaseline/FCChhTrackerTkLayout.xml
diff --git a/Detectors/DD4hepDetector/compact/FCChh_v3.03_Definitions.xml b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_v3.03_Definitions.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/FCChh_v3.03_Definitions.xml
rename to Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_v3.03_Definitions.xml
diff --git a/Detectors/DD4hepDetector/compact/IBLSimple.xml b/Detectors/DD4hepDetector/compact/IBLSimple/IBLSimple.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/IBLSimple.xml
rename to Detectors/DD4hepDetector/compact/IBLSimple/IBLSimple.xml
diff --git a/Detectors/DD4hepDetector/compact/IBLSimpleDet.xml b/Detectors/DD4hepDetector/compact/IBLSimple/IBLSimpleDet.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/IBLSimpleDet.xml
rename to Detectors/DD4hepDetector/compact/IBLSimple/IBLSimpleDet.xml
diff --git a/Detectors/DD4hepDetector/compact/FCCTracker.xml b/Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/FCCTracker.xml
rename to Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1.xml
diff --git a/Detectors/DD4hepDetector/compact/FCCTrackerLongStrip.xml b/Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1LongStrip.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/FCCTrackerLongStrip.xml
rename to Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1LongStrip.xml
diff --git a/Detectors/DD4hepDetector/compact/FCCTrackerPixel.xml b/Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1Pixel.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/FCCTrackerPixel.xml
rename to Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1Pixel.xml
diff --git a/Detectors/DD4hepDetector/compact/FCCTrackerShortStrip.xml b/Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1ShortStrip.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/FCCTrackerShortStrip.xml
rename to Detectors/DD4hepDetector/compact/TestTracker1/TestTracker1ShortStrip.xml
diff --git a/Detectors/DD4hepDetector/compact/TKLayoutTracker.xml b/Detectors/DD4hepDetector/compact/TestTracker2/TestTracker2.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/TKLayoutTracker.xml
rename to Detectors/DD4hepDetector/compact/TestTracker2/TestTracker2.xml
diff --git a/Detectors/DD4hepDetector/compact/TKLayoutInner.xml b/Detectors/DD4hepDetector/compact/TestTracker2/TestTracker2Inner.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/TKLayoutInner.xml
rename to Detectors/DD4hepDetector/compact/TestTracker2/TestTracker2Inner.xml
diff --git a/Detectors/DD4hepDetector/compact/TKLayoutOuter.xml b/Detectors/DD4hepDetector/compact/TestTracker2/TestTracker2Outer.xml
similarity index 100%
rename from Detectors/DD4hepDetector/compact/TKLayoutOuter.xml
rename to Detectors/DD4hepDetector/compact/TestTracker2/TestTracker2Outer.xml
diff --git a/Detectors/DD4hepDetector/src/BeamTube_geo.cpp b/Detectors/DD4hepDetector/src/BeamPipe_geo.cpp
similarity index 100%
rename from Detectors/DD4hepDetector/src/BeamTube_geo.cpp
rename to Detectors/DD4hepDetector/src/BeamPipe_geo.cpp