diff --git a/*COMMON/devices/beam-magnets-and-deflector/placeholder.txt b/-control-room/COMMON/devices/beam-magnets-and-deflector/placeholder.txt
similarity index 100%
rename from *COMMON/devices/beam-magnets-and-deflector/placeholder.txt
rename to -control-room/COMMON/devices/beam-magnets-and-deflector/placeholder.txt
diff --git a/*COMMON/devices/control-system/placeholder.txt b/-control-room/COMMON/devices/control-system/placeholder.txt
similarity index 100%
rename from *COMMON/devices/control-system/placeholder.txt
rename to -control-room/COMMON/devices/control-system/placeholder.txt
diff --git a/*COMMON/devices/conventional-power/placeholder.txt b/-control-room/COMMON/devices/conventional-power/placeholder.txt
similarity index 100%
rename from *COMMON/devices/conventional-power/placeholder.txt
rename to -control-room/COMMON/devices/conventional-power/placeholder.txt
diff --git a/*COMMON/devices/cryogenics/placeholder.txt b/-control-room/COMMON/devices/cryogenics/placeholder.txt
similarity index 100%
rename from *COMMON/devices/cryogenics/placeholder.txt
rename to -control-room/COMMON/devices/cryogenics/placeholder.txt
diff --git a/*COMMON/devices/electromagnetic-resonator/placeholder.txt b/-control-room/COMMON/devices/electromagnetic-resonator/placeholder.txt
similarity index 100%
rename from *COMMON/devices/electromagnetic-resonator/placeholder.txt
rename to -control-room/COMMON/devices/electromagnetic-resonator/placeholder.txt
diff --git a/*COMMON/devices/general-mechanics/placeholder.txt b/-control-room/COMMON/devices/general-mechanics/placeholder.txt
similarity index 100%
rename from *COMMON/devices/general-mechanics/placeholder.txt
rename to -control-room/COMMON/devices/general-mechanics/placeholder.txt
diff --git a/*COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt b/-control-room/COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
similarity index 100%
rename from *COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
rename to -control-room/COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
diff --git a/*COMMON/devices/intercepting-devices/placeholder.txt b/-control-room/COMMON/devices/intercepting-devices/placeholder.txt
similarity index 100%
rename from *COMMON/devices/intercepting-devices/placeholder.txt
rename to -control-room/COMMON/devices/intercepting-devices/placeholder.txt
diff --git a/*COMMON/devices/ion-source-specialties/placeholder.txt b/-control-room/COMMON/devices/ion-source-specialties/placeholder.txt
similarity index 100%
rename from *COMMON/devices/ion-source-specialties/placeholder.txt
rename to -control-room/COMMON/devices/ion-source-specialties/placeholder.txt
diff --git a/*COMMON/devices/machine-protection-systems/placeholder.txt b/-control-room/COMMON/devices/machine-protection-systems/placeholder.txt
similarity index 100%
rename from *COMMON/devices/machine-protection-systems/placeholder.txt
rename to -control-room/COMMON/devices/machine-protection-systems/placeholder.txt
diff --git a/*COMMON/devices/motion-control/placeholder.txt b/-control-room/COMMON/devices/motion-control/placeholder.txt
similarity index 100%
rename from *COMMON/devices/motion-control/placeholder.txt
rename to -control-room/COMMON/devices/motion-control/placeholder.txt
diff --git a/*COMMON/devices/network-equipment/placeholder.txt b/-control-room/COMMON/devices/network-equipment/placeholder.txt
similarity index 100%
rename from *COMMON/devices/network-equipment/placeholder.txt
rename to -control-room/COMMON/devices/network-equipment/placeholder.txt
diff --git a/*COMMON/devices/neutron-chopper/placeholder.txt b/-control-room/COMMON/devices/neutron-chopper/placeholder.txt
similarity index 100%
rename from *COMMON/devices/neutron-chopper/placeholder.txt
rename to -control-room/COMMON/devices/neutron-chopper/placeholder.txt
diff --git a/*COMMON/devices/odh-detection-systems/placeholder.txt b/-control-room/COMMON/devices/odh-detection-systems/placeholder.txt
similarity index 100%
rename from *COMMON/devices/odh-detection-systems/placeholder.txt
rename to -control-room/COMMON/devices/odh-detection-systems/placeholder.txt
diff --git a/*COMMON/devices/personnel-safety-systems/placeholder.txt b/-control-room/COMMON/devices/personnel-safety-systems/placeholder.txt
similarity index 100%
rename from *COMMON/devices/personnel-safety-systems/placeholder.txt
rename to -control-room/COMMON/devices/personnel-safety-systems/placeholder.txt
diff --git a/*COMMON/devices/power-convertors/placeholder.txt b/-control-room/COMMON/devices/power-convertors/placeholder.txt
similarity index 100%
rename from *COMMON/devices/power-convertors/placeholder.txt
rename to -control-room/COMMON/devices/power-convertors/placeholder.txt
diff --git a/*COMMON/devices/proton-beam-instrumentation/placeholder.txt b/-control-room/COMMON/devices/proton-beam-instrumentation/placeholder.txt
similarity index 100%
rename from *COMMON/devices/proton-beam-instrumentation/placeholder.txt
rename to -control-room/COMMON/devices/proton-beam-instrumentation/placeholder.txt
diff --git a/*COMMON/devices/rf-systems/placeholder.txt b/-control-room/COMMON/devices/rf-systems/placeholder.txt
similarity index 100%
rename from *COMMON/devices/rf-systems/placeholder.txt
rename to -control-room/COMMON/devices/rf-systems/placeholder.txt
diff --git a/*COMMON/devices/sample-environment-equipment/placeholder.txt b/-control-room/COMMON/devices/sample-environment-equipment/placeholder.txt
similarity index 100%
rename from *COMMON/devices/sample-environment-equipment/placeholder.txt
rename to -control-room/COMMON/devices/sample-environment-equipment/placeholder.txt
diff --git a/*COMMON/devices/sample-environment-systems/placeholder.txt b/-control-room/COMMON/devices/sample-environment-systems/placeholder.txt
similarity index 100%
rename from *COMMON/devices/sample-environment-systems/placeholder.txt
rename to -control-room/COMMON/devices/sample-environment-systems/placeholder.txt
diff --git a/*COMMON/devices/timing-system/placeholder.txt b/-control-room/COMMON/devices/timing-system/placeholder.txt
similarity index 100%
rename from *COMMON/devices/timing-system/placeholder.txt
rename to -control-room/COMMON/devices/timing-system/placeholder.txt
diff --git a/*COMMON/devices/vacuum/placeholder.txt b/-control-room/COMMON/devices/vacuum/placeholder.txt
similarity index 100%
rename from *COMMON/devices/vacuum/placeholder.txt
rename to -control-room/COMMON/devices/vacuum/placeholder.txt
diff --git a/*COMMON/devices/water-cooling/placeholder.txt b/-control-room/COMMON/devices/water-cooling/placeholder.txt
similarity index 100%
rename from *COMMON/devices/water-cooling/placeholder.txt
rename to -control-room/COMMON/devices/water-cooling/placeholder.txt
diff --git a/*COMMON/utilities/placeholder.txt b/-control-room/COMMON/utilities/placeholder.txt
similarity index 100%
rename from *COMMON/utilities/placeholder.txt
rename to -control-room/COMMON/utilities/placeholder.txt
diff --git a/control-room/*COMMON/devices/beam-magnets-and-deflector/placeholder.txt b/-control-room/accelerator/accelerator-to-target/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/beam-magnets-and-deflector/placeholder.txt
rename to -control-room/accelerator/accelerator-to-target/placeholder.txt
diff --git a/control-room/*COMMON/devices/control-system/placeholder.txt b/-control-room/accelerator/drift-tube-linac/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/control-system/placeholder.txt
rename to -control-room/accelerator/drift-tube-linac/placeholder.txt
diff --git a/control-room/*COMMON/devices/conventional-power/placeholder.txt b/-control-room/accelerator/dumpline/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/conventional-power/placeholder.txt
rename to -control-room/accelerator/dumpline/placeholder.txt
diff --git a/control-room/*COMMON/devices/cryogenics/placeholder.txt b/-control-room/accelerator/front-end-building/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/cryogenics/placeholder.txt
rename to -control-room/accelerator/front-end-building/placeholder.txt
diff --git a/control-room/*COMMON/devices/electromagnetic-resonator/placeholder.txt b/-control-room/accelerator/high-beta-linac/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/electromagnetic-resonator/placeholder.txt
rename to -control-room/accelerator/high-beta-linac/placeholder.txt
diff --git a/control-room/*COMMON/devices/general-mechanics/placeholder.txt b/-control-room/accelerator/high-energy-beam-transport/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/general-mechanics/placeholder.txt
rename to -control-room/accelerator/high-energy-beam-transport/placeholder.txt
diff --git a/control-room/*COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt b/-control-room/accelerator/ion-source/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
rename to -control-room/accelerator/ion-source/placeholder.txt
diff --git a/control-room/*COMMON/devices/intercepting-devices/placeholder.txt b/-control-room/accelerator/low-energy-beam-transport/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/intercepting-devices/placeholder.txt
rename to -control-room/accelerator/low-energy-beam-transport/placeholder.txt
diff --git a/control-room/*COMMON/devices/ion-source-specialties/placeholder.txt b/-control-room/accelerator/medium-beta-linac/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/ion-source-specialties/placeholder.txt
rename to -control-room/accelerator/medium-beta-linac/placeholder.txt
diff --git a/control-room/*COMMON/devices/machine-protection-systems/placeholder.txt b/-control-room/accelerator/medium-energy-beam-transport/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/machine-protection-systems/placeholder.txt
rename to -control-room/accelerator/medium-energy-beam-transport/placeholder.txt
diff --git a/control-room/*COMMON/devices/motion-control/placeholder.txt b/-control-room/accelerator/radio-frequency-quadrupole/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/motion-control/placeholder.txt
rename to -control-room/accelerator/radio-frequency-quadrupole/placeholder.txt
diff --git a/control-room/*COMMON/devices/network-equipment/placeholder.txt b/-control-room/accelerator/spoke-linac/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/network-equipment/placeholder.txt
rename to -control-room/accelerator/spoke-linac/placeholder.txt
diff --git a/control-room/*COMMON/devices/neutron-chopper/placeholder.txt b/-control-room/accelerator/stubs/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/neutron-chopper/placeholder.txt
rename to -control-room/accelerator/stubs/placeholder.txt
diff --git a/control-room/*COMMON/devices/odh-detection-systems/placeholder.txt b/-control-room/accelerator/test-stand-2/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/odh-detection-systems/placeholder.txt
rename to -control-room/accelerator/test-stand-2/placeholder.txt
diff --git a/control-room/*COMMON/devices/personnel-safety-systems/placeholder.txt b/-control-room/accelerator/test-stand-3/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/personnel-safety-systems/placeholder.txt
rename to -control-room/accelerator/test-stand-3/placeholder.txt
diff --git a/control-room/*COMMON/devices/power-convertors/placeholder.txt b/-control-room/central-services/argon-gas-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/power-convertors/placeholder.txt
rename to -control-room/central-services/argon-gas-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/proton-beam-instrumentation/placeholder.txt b/-control-room/central-services/conventional-ventilation-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/proton-beam-instrumentation/placeholder.txt
rename to -control-room/central-services/conventional-ventilation-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/rf-systems/placeholder.txt b/-control-room/central-services/conventional-waste-water-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/rf-systems/placeholder.txt
rename to -control-room/central-services/conventional-waste-water-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/sample-environment-equipment/placeholder.txt b/-control-room/central-services/cooling-water-high-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/sample-environment-equipment/placeholder.txt
rename to -control-room/central-services/cooling-water-high-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/sample-environment-systems/placeholder.txt b/-control-room/central-services/cooling-water-low-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/sample-environment-systems/placeholder.txt
rename to -control-room/central-services/cooling-water-low-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/timing-system/placeholder.txt b/-control-room/central-services/cooling-water-medium-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/timing-system/placeholder.txt
rename to -control-room/central-services/cooling-water-medium-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/vacuum/placeholder.txt b/-control-room/central-services/cooling-water-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/vacuum/placeholder.txt
rename to -control-room/central-services/cooling-water-system/placeholder.txt
diff --git a/control-room/*COMMON/devices/water-cooling/placeholder.txt b/-control-room/central-services/cryo-systems/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/devices/water-cooling/placeholder.txt
rename to -control-room/central-services/cryo-systems/placeholder.txt
diff --git a/control-room/*COMMON/utilities/placeholder.txt b/-control-room/central-services/di-ionised-water-system/placeholder.txt
similarity index 100%
rename from control-room/*COMMON/utilities/placeholder.txt
rename to -control-room/central-services/di-ionised-water-system/placeholder.txt
diff --git a/control-room/accelerator/accelerator-to-target/placeholder.txt b/-control-room/central-services/district-heating-low-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/accelerator-to-target/placeholder.txt
rename to -control-room/central-services/district-heating-low-system/placeholder.txt
diff --git a/control-room/accelerator/drift-tube-linac/placeholder.txt b/-control-room/central-services/electrical-power-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/drift-tube-linac/placeholder.txt
rename to -control-room/central-services/electrical-power-system/placeholder.txt
diff --git a/control-room/accelerator/dumpline/placeholder.txt b/-control-room/central-services/heating-water-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/dumpline/placeholder.txt
rename to -control-room/central-services/heating-water-system/placeholder.txt
diff --git a/control-room/accelerator/front-end-building/placeholder.txt b/-control-room/central-services/instrument-air-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/front-end-building/placeholder.txt
rename to -control-room/central-services/instrument-air-system/placeholder.txt
diff --git a/control-room/accelerator/high-beta-linac/placeholder.txt b/-control-room/central-services/lab-gases-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/high-beta-linac/placeholder.txt
rename to -control-room/central-services/lab-gases-system/placeholder.txt
diff --git a/control-room/accelerator/high-energy-beam-transport/placeholder.txt b/-control-room/central-services/network-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/high-energy-beam-transport/placeholder.txt
rename to -control-room/central-services/network-system/placeholder.txt
diff --git a/control-room/accelerator/ion-source/placeholder.txt b/-control-room/central-services/nitrogen-gas-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/ion-source/placeholder.txt
rename to -control-room/central-services/nitrogen-gas-system/placeholder.txt
diff --git a/control-room/accelerator/low-energy-beam-transport/placeholder.txt b/-control-room/central-services/non-potable-water-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/low-energy-beam-transport/placeholder.txt
rename to -control-room/central-services/non-potable-water-system/placeholder.txt
diff --git a/control-room/accelerator/medium-beta-linac/placeholder.txt b/-control-room/central-services/potable-water-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/medium-beta-linac/placeholder.txt
rename to -control-room/central-services/potable-water-system/placeholder.txt
diff --git a/control-room/accelerator/medium-energy-beam-transport/placeholder.txt b/-control-room/central-services/process-ventilation-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/medium-energy-beam-transport/placeholder.txt
rename to -control-room/central-services/process-ventilation-system/placeholder.txt
diff --git a/control-room/accelerator/radio-frequency-quadrupole/placeholder.txt b/-control-room/central-services/radiological-ventilation-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/radio-frequency-quadrupole/placeholder.txt
rename to -control-room/central-services/radiological-ventilation-system/placeholder.txt
diff --git a/control-room/accelerator/spoke-linac/placeholder.txt b/-control-room/central-services/radiological-waste-water-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/spoke-linac/placeholder.txt
rename to -control-room/central-services/radiological-waste-water-system/placeholder.txt
diff --git a/control-room/accelerator/stubs/placeholder.txt b/-control-room/central-services/risk-waste-water-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/stubs/placeholder.txt
rename to -control-room/central-services/risk-waste-water-system/placeholder.txt
diff --git a/control-room/accelerator/test-stand-2/placeholder.txt b/-control-room/central-services/site-infrastructure/placeholder.txt
similarity index 100%
rename from control-room/accelerator/test-stand-2/placeholder.txt
rename to -control-room/central-services/site-infrastructure/placeholder.txt
diff --git a/control-room/accelerator/test-stand-3/placeholder.txt b/-control-room/central-services/sprinkler-system/placeholder.txt
similarity index 100%
rename from control-room/accelerator/test-stand-3/placeholder.txt
rename to -control-room/central-services/sprinkler-system/placeholder.txt
diff --git a/control-room/central-services/argon-gas-system/placeholder.txt b/-control-room/central-services/standpipe-system/placeholder.txt
similarity index 100%
rename from control-room/central-services/argon-gas-system/placeholder.txt
rename to -control-room/central-services/standpipe-system/placeholder.txt
diff --git a/control-room/central-services/conventional-ventilation-system/placeholder.txt b/-control-room/central-services/storm-water-system/placeholder.txt
similarity index 100%
rename from control-room/central-services/conventional-ventilation-system/placeholder.txt
rename to -control-room/central-services/storm-water-system/placeholder.txt
diff --git a/control-room/central-services/conventional-waste-water-system/placeholder.txt b/-control-room/central-services/timing-system/placeholder.txt
similarity index 100%
rename from control-room/central-services/conventional-waste-water-system/placeholder.txt
rename to -control-room/central-services/timing-system/placeholder.txt
diff --git a/control-room/central-services/cooling-water-high-system/placeholder.txt b/-control-room/central-services/vacuum-system/placeholder.txt
similarity index 100%
rename from control-room/central-services/cooling-water-high-system/placeholder.txt
rename to -control-room/central-services/vacuum-system/placeholder.txt
diff --git a/control-room/central-services/cooling-water-low-system/placeholder.txt b/-control-room/machine-protection-system/common-machine-protection-functions/placeholder.txt
similarity index 100%
rename from control-room/central-services/cooling-water-low-system/placeholder.txt
rename to -control-room/machine-protection-system/common-machine-protection-functions/placeholder.txt
diff --git a/control-room/central-services/cooling-water-medium-system/placeholder.txt b/-control-room/machine-protection-system/fast-beam-interlock-systems/placeholder.txt
similarity index 100%
rename from control-room/central-services/cooling-water-medium-system/placeholder.txt
rename to -control-room/machine-protection-system/fast-beam-interlock-systems/placeholder.txt
diff --git a/control-room/central-services/cooling-water-system/placeholder.txt b/-control-room/machine-protection-system/local-protection-system/placeholder.txt
similarity index 100%
rename from control-room/central-services/cooling-water-system/placeholder.txt
rename to -control-room/machine-protection-system/local-protection-system/placeholder.txt
diff --git a/control-room/central-services/cryo-systems/placeholder.txt b/-control-room/neutron-instruments/instrument-1/placeholder.txt
similarity index 100%
rename from control-room/central-services/cryo-systems/placeholder.txt
rename to -control-room/neutron-instruments/instrument-1/placeholder.txt
diff --git a/control-room/central-services/di-ionised-water-system/placeholder.txt b/-control-room/neutron-instruments/nmx/placeholder.txt
similarity index 100%
rename from control-room/central-services/di-ionised-water-system/placeholder.txt
rename to -control-room/neutron-instruments/nmx/placeholder.txt
diff --git a/control-room/central-services/district-heating-low-system/placeholder.txt b/-control-room/personnel-safety-systems/coldbox-building/placeholder.txt
similarity index 100%
rename from control-room/central-services/district-heating-low-system/placeholder.txt
rename to -control-room/personnel-safety-systems/coldbox-building/placeholder.txt
diff --git a/control-room/central-services/electrical-power-system/placeholder.txt b/-control-room/personnel-safety-systems/ctl-gallery/placeholder.txt
similarity index 100%
rename from control-room/central-services/electrical-power-system/placeholder.txt
rename to -control-room/personnel-safety-systems/ctl-gallery/placeholder.txt
diff --git a/control-room/central-services/heating-water-system/placeholder.txt b/-control-room/personnel-safety-systems/helium-compressor-building/placeholder.txt
similarity index 100%
rename from control-room/central-services/heating-water-system/placeholder.txt
rename to -control-room/personnel-safety-systems/helium-compressor-building/placeholder.txt
diff --git a/control-room/central-services/instrument-air-system/placeholder.txt b/-control-room/personnel-safety-systems/klystron-gallery/placeholder.txt
similarity index 100%
rename from control-room/central-services/instrument-air-system/placeholder.txt
rename to -control-room/personnel-safety-systems/klystron-gallery/placeholder.txt
diff --git a/control-room/central-services/lab-gases-system/placeholder.txt b/-control-room/personnel-safety-systems/pss-accelerator/placeholder.txt
similarity index 100%
rename from control-room/central-services/lab-gases-system/placeholder.txt
rename to -control-room/personnel-safety-systems/pss-accelerator/placeholder.txt
diff --git a/control-room/central-services/network-system/placeholder.txt b/-control-room/target-station/active-cells/placeholder.txt
similarity index 100%
rename from control-room/central-services/network-system/placeholder.txt
rename to -control-room/target-station/active-cells/placeholder.txt
diff --git a/control-room/central-services/nitrogen-gas-system/placeholder.txt b/-control-room/target-station/active-fluids/placeholder.txt
similarity index 100%
rename from control-room/central-services/nitrogen-gas-system/placeholder.txt
rename to -control-room/target-station/active-fluids/placeholder.txt
diff --git a/control-room/central-services/non-potable-water-system/placeholder.txt b/-control-room/target-station/active-handling/placeholder.txt
similarity index 100%
rename from control-room/central-services/non-potable-water-system/placeholder.txt
rename to -control-room/target-station/active-handling/placeholder.txt
diff --git a/control-room/central-services/potable-water-system/placeholder.txt b/-control-room/target-station/active-workshops/placeholder.txt
similarity index 100%
rename from control-room/central-services/potable-water-system/placeholder.txt
rename to -control-room/target-station/active-workshops/placeholder.txt
diff --git a/control-room/central-services/process-ventilation-system/placeholder.txt b/-control-room/target-station/handling-mock-up/placeholder.txt
similarity index 100%
rename from control-room/central-services/process-ventilation-system/placeholder.txt
rename to -control-room/target-station/handling-mock-up/placeholder.txt
diff --git a/control-room/central-services/radiological-ventilation-system/placeholder.txt b/-control-room/target-station/intermediate-cooling-systems/placeholder.txt
similarity index 100%
rename from control-room/central-services/radiological-ventilation-system/placeholder.txt
rename to -control-room/target-station/intermediate-cooling-systems/placeholder.txt
diff --git a/control-room/central-services/radiological-waste-water-system/placeholder.txt b/-control-room/target-station/mobile-active-vacuum/placeholder.txt
similarity index 100%
rename from control-room/central-services/radiological-waste-water-system/placeholder.txt
rename to -control-room/target-station/mobile-active-vacuum/placeholder.txt
diff --git a/control-room/central-services/risk-waste-water-system/placeholder.txt b/-control-room/target-station/moderator-reflector/placeholder.txt
similarity index 100%
rename from control-room/central-services/risk-waste-water-system/placeholder.txt
rename to -control-room/target-station/moderator-reflector/placeholder.txt
diff --git a/control-room/central-services/site-infrastructure/placeholder.txt b/-control-room/target-station/monolith/placeholder.txt
similarity index 100%
rename from control-room/central-services/site-infrastructure/placeholder.txt
rename to -control-room/target-station/monolith/placeholder.txt
diff --git a/control-room/central-services/sprinkler-system/placeholder.txt b/-control-room/target-station/proton-beam-window/placeholder.txt
similarity index 100%
rename from control-room/central-services/sprinkler-system/placeholder.txt
rename to -control-room/target-station/proton-beam-window/placeholder.txt
diff --git a/control-room/central-services/standpipe-system/placeholder.txt b/-control-room/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt
similarity index 100%
rename from control-room/central-services/standpipe-system/placeholder.txt
rename to -control-room/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt
diff --git a/control-room/central-services/storm-water-system/placeholder.txt b/-control-room/target-station/shielding/placeholder.txt
similarity index 100%
rename from control-room/central-services/storm-water-system/placeholder.txt
rename to -control-room/target-station/shielding/placeholder.txt
diff --git a/control-room/central-services/timing-system/placeholder.txt b/-control-room/target-station/target-safety-system/placeholder.txt
similarity index 100%
rename from control-room/central-services/timing-system/placeholder.txt
rename to -control-room/target-station/target-safety-system/placeholder.txt
diff --git a/control-room/central-services/vacuum-system/placeholder.txt b/-control-room/target-station/target-systems/placeholder.txt
similarity index 100%
rename from control-room/central-services/vacuum-system/placeholder.txt
rename to -control-room/target-station/target-systems/placeholder.txt
diff --git a/control-room/machine-protection-system/common-machine-protection-functions/placeholder.txt b/-control-room/target-station/ts-storage/placeholder.txt
similarity index 100%
rename from control-room/machine-protection-system/common-machine-protection-functions/placeholder.txt
rename to -control-room/target-station/ts-storage/placeholder.txt
diff --git a/control-room/machine-protection-system/fast-beam-interlock-systems/placeholder.txt b/-control-room/target-station/tune-up-dump/placeholder.txt
similarity index 100%
rename from control-room/machine-protection-system/fast-beam-interlock-systems/placeholder.txt
rename to -control-room/target-station/tune-up-dump/placeholder.txt
diff --git a/control-room/machine-protection-system/local-protection-system/placeholder.txt b/-engineering/COMMON/devices/beam-magnets-and-deflector/placeholder.txt
similarity index 100%
rename from control-room/machine-protection-system/local-protection-system/placeholder.txt
rename to -engineering/COMMON/devices/beam-magnets-and-deflector/placeholder.txt
diff --git a/control-room/neutron-instruments/instrument-1/placeholder.txt b/-engineering/COMMON/devices/control-system/placeholder.txt
similarity index 100%
rename from control-room/neutron-instruments/instrument-1/placeholder.txt
rename to -engineering/COMMON/devices/control-system/placeholder.txt
diff --git a/control-room/neutron-instruments/nmx/placeholder.txt b/-engineering/COMMON/devices/conventional-power/placeholder.txt
similarity index 100%
rename from control-room/neutron-instruments/nmx/placeholder.txt
rename to -engineering/COMMON/devices/conventional-power/placeholder.txt
diff --git a/control-room/personnel-safety-systems/coldbox-building/placeholder.txt b/-engineering/COMMON/devices/cryogenics/placeholder.txt
similarity index 100%
rename from control-room/personnel-safety-systems/coldbox-building/placeholder.txt
rename to -engineering/COMMON/devices/cryogenics/placeholder.txt
diff --git a/control-room/personnel-safety-systems/ctl-gallery/placeholder.txt b/-engineering/COMMON/devices/electromagnetic-resonator/placeholder.txt
similarity index 100%
rename from control-room/personnel-safety-systems/ctl-gallery/placeholder.txt
rename to -engineering/COMMON/devices/electromagnetic-resonator/placeholder.txt
diff --git a/control-room/personnel-safety-systems/helium-compressor-building/placeholder.txt b/-engineering/COMMON/devices/general-mechanics/placeholder.txt
similarity index 100%
rename from control-room/personnel-safety-systems/helium-compressor-building/placeholder.txt
rename to -engineering/COMMON/devices/general-mechanics/placeholder.txt
diff --git a/control-room/personnel-safety-systems/klystron-gallery/placeholder.txt b/-engineering/COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
similarity index 100%
rename from control-room/personnel-safety-systems/klystron-gallery/placeholder.txt
rename to -engineering/COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
diff --git a/control-room/personnel-safety-systems/pss-accelerator/placeholder.txt b/-engineering/COMMON/devices/intercepting-devices/placeholder.txt
similarity index 100%
rename from control-room/personnel-safety-systems/pss-accelerator/placeholder.txt
rename to -engineering/COMMON/devices/intercepting-devices/placeholder.txt
diff --git a/control-room/target-station/active-cells/placeholder.txt b/-engineering/COMMON/devices/ion-source-specialties/placeholder.txt
similarity index 100%
rename from control-room/target-station/active-cells/placeholder.txt
rename to -engineering/COMMON/devices/ion-source-specialties/placeholder.txt
diff --git a/control-room/target-station/active-fluids/placeholder.txt b/-engineering/COMMON/devices/machine-protection-systems/placeholder.txt
similarity index 100%
rename from control-room/target-station/active-fluids/placeholder.txt
rename to -engineering/COMMON/devices/machine-protection-systems/placeholder.txt
diff --git a/control-room/target-station/active-handling/placeholder.txt b/-engineering/COMMON/devices/motion-control/placeholder.txt
similarity index 100%
rename from control-room/target-station/active-handling/placeholder.txt
rename to -engineering/COMMON/devices/motion-control/placeholder.txt
diff --git a/control-room/target-station/active-workshops/placeholder.txt b/-engineering/COMMON/devices/network-equipment/placeholder.txt
similarity index 100%
rename from control-room/target-station/active-workshops/placeholder.txt
rename to -engineering/COMMON/devices/network-equipment/placeholder.txt
diff --git a/control-room/target-station/handling-mock-up/placeholder.txt b/-engineering/COMMON/devices/neutron-chopper/placeholder.txt
similarity index 100%
rename from control-room/target-station/handling-mock-up/placeholder.txt
rename to -engineering/COMMON/devices/neutron-chopper/placeholder.txt
diff --git a/control-room/target-station/intermediate-cooling-systems/placeholder.txt b/-engineering/COMMON/devices/odh-detection-systems/placeholder.txt
similarity index 100%
rename from control-room/target-station/intermediate-cooling-systems/placeholder.txt
rename to -engineering/COMMON/devices/odh-detection-systems/placeholder.txt
diff --git a/control-room/target-station/mobile-active-vacuum/placeholder.txt b/-engineering/COMMON/devices/personnel-safety-systems/placeholder.txt
similarity index 100%
rename from control-room/target-station/mobile-active-vacuum/placeholder.txt
rename to -engineering/COMMON/devices/personnel-safety-systems/placeholder.txt
diff --git a/control-room/target-station/moderator-reflector/placeholder.txt b/-engineering/COMMON/devices/power-convertors/placeholder.txt
similarity index 100%
rename from control-room/target-station/moderator-reflector/placeholder.txt
rename to -engineering/COMMON/devices/power-convertors/placeholder.txt
diff --git a/control-room/target-station/monolith/placeholder.txt b/-engineering/COMMON/devices/proton-beam-instrumentation/placeholder.txt
similarity index 100%
rename from control-room/target-station/monolith/placeholder.txt
rename to -engineering/COMMON/devices/proton-beam-instrumentation/placeholder.txt
diff --git a/control-room/target-station/proton-beam-window/placeholder.txt b/-engineering/COMMON/devices/rf-systems/placeholder.txt
similarity index 100%
rename from control-room/target-station/proton-beam-window/placeholder.txt
rename to -engineering/COMMON/devices/rf-systems/placeholder.txt
diff --git a/control-room/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt b/-engineering/COMMON/devices/sample-environment-equipment/placeholder.txt
similarity index 100%
rename from control-room/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt
rename to -engineering/COMMON/devices/sample-environment-equipment/placeholder.txt
diff --git a/control-room/target-station/shielding/placeholder.txt b/-engineering/COMMON/devices/sample-environment-systems/placeholder.txt
similarity index 100%
rename from control-room/target-station/shielding/placeholder.txt
rename to -engineering/COMMON/devices/sample-environment-systems/placeholder.txt
diff --git a/control-room/target-station/target-safety-system/placeholder.txt b/-engineering/COMMON/devices/timing-system/placeholder.txt
similarity index 100%
rename from control-room/target-station/target-safety-system/placeholder.txt
rename to -engineering/COMMON/devices/timing-system/placeholder.txt
diff --git a/control-room/target-station/target-systems/placeholder.txt b/-engineering/COMMON/devices/vacuum/placeholder.txt
similarity index 100%
rename from control-room/target-station/target-systems/placeholder.txt
rename to -engineering/COMMON/devices/vacuum/placeholder.txt
diff --git a/control-room/target-station/ts-storage/placeholder.txt b/-engineering/COMMON/devices/water-cooling/placeholder.txt
similarity index 100%
rename from control-room/target-station/ts-storage/placeholder.txt
rename to -engineering/COMMON/devices/water-cooling/placeholder.txt
diff --git a/control-room/target-station/tune-up-dump/placeholder.txt b/-engineering/COMMON/utilities/placeholder.txt
similarity index 100%
rename from control-room/target-station/tune-up-dump/placeholder.txt
rename to -engineering/COMMON/utilities/placeholder.txt
diff --git a/engineering/*COMMON/devices/beam-magnets-and-deflector/placeholder.txt b/-engineering/accelerator/accelerator-to-target/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/beam-magnets-and-deflector/placeholder.txt
rename to -engineering/accelerator/accelerator-to-target/placeholder.txt
diff --git a/engineering/*COMMON/devices/control-system/placeholder.txt b/-engineering/accelerator/drift-tube-linac/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/control-system/placeholder.txt
rename to -engineering/accelerator/drift-tube-linac/placeholder.txt
diff --git a/engineering/*COMMON/devices/conventional-power/placeholder.txt b/-engineering/accelerator/dumpline/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/conventional-power/placeholder.txt
rename to -engineering/accelerator/dumpline/placeholder.txt
diff --git a/engineering/*COMMON/devices/cryogenics/placeholder.txt b/-engineering/accelerator/front-end-building/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/cryogenics/placeholder.txt
rename to -engineering/accelerator/front-end-building/placeholder.txt
diff --git a/engineering/*COMMON/devices/electromagnetic-resonator/placeholder.txt b/-engineering/accelerator/high-beta-linac/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/electromagnetic-resonator/placeholder.txt
rename to -engineering/accelerator/high-beta-linac/placeholder.txt
diff --git a/engineering/*COMMON/devices/general-mechanics/placeholder.txt b/-engineering/accelerator/high-energy-beam-transport/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/general-mechanics/placeholder.txt
rename to -engineering/accelerator/high-energy-beam-transport/placeholder.txt
diff --git a/engineering/*COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt b/-engineering/accelerator/ion-source/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/heating-cooling-and-air-conditioning/placeholder.txt
rename to -engineering/accelerator/ion-source/placeholder.txt
diff --git a/engineering/*COMMON/devices/intercepting-devices/placeholder.txt b/-engineering/accelerator/low-energy-beam-transport/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/intercepting-devices/placeholder.txt
rename to -engineering/accelerator/low-energy-beam-transport/placeholder.txt
diff --git a/engineering/*COMMON/devices/ion-source-specialties/placeholder.txt b/-engineering/accelerator/medium-beta-linac/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/ion-source-specialties/placeholder.txt
rename to -engineering/accelerator/medium-beta-linac/placeholder.txt
diff --git a/engineering/*COMMON/devices/machine-protection-systems/placeholder.txt b/-engineering/accelerator/medium-energy-beam-transport/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/machine-protection-systems/placeholder.txt
rename to -engineering/accelerator/medium-energy-beam-transport/placeholder.txt
diff --git a/engineering/*COMMON/devices/motion-control/placeholder.txt b/-engineering/accelerator/radio-frequency-quadrupole/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/motion-control/placeholder.txt
rename to -engineering/accelerator/radio-frequency-quadrupole/placeholder.txt
diff --git a/engineering/*COMMON/devices/network-equipment/placeholder.txt b/-engineering/accelerator/spoke-linac/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/network-equipment/placeholder.txt
rename to -engineering/accelerator/spoke-linac/placeholder.txt
diff --git a/engineering/*COMMON/devices/neutron-chopper/placeholder.txt b/-engineering/accelerator/stubs/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/neutron-chopper/placeholder.txt
rename to -engineering/accelerator/stubs/placeholder.txt
diff --git a/engineering/*COMMON/devices/odh-detection-systems/placeholder.txt b/-engineering/accelerator/test-stand-2/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/odh-detection-systems/placeholder.txt
rename to -engineering/accelerator/test-stand-2/placeholder.txt
diff --git a/engineering/*COMMON/devices/personnel-safety-systems/placeholder.txt b/-engineering/accelerator/test-stand-3/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/personnel-safety-systems/placeholder.txt
rename to -engineering/accelerator/test-stand-3/placeholder.txt
diff --git a/engineering/*COMMON/devices/power-convertors/placeholder.txt b/-engineering/central-services/argon-gas-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/power-convertors/placeholder.txt
rename to -engineering/central-services/argon-gas-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/proton-beam-instrumentation/placeholder.txt b/-engineering/central-services/conventional-ventilation-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/proton-beam-instrumentation/placeholder.txt
rename to -engineering/central-services/conventional-ventilation-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/rf-systems/placeholder.txt b/-engineering/central-services/conventional-waste-water-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/rf-systems/placeholder.txt
rename to -engineering/central-services/conventional-waste-water-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/sample-environment-equipment/placeholder.txt b/-engineering/central-services/cooling-water-high-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/sample-environment-equipment/placeholder.txt
rename to -engineering/central-services/cooling-water-high-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/sample-environment-systems/placeholder.txt b/-engineering/central-services/cooling-water-low-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/sample-environment-systems/placeholder.txt
rename to -engineering/central-services/cooling-water-low-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/timing-system/placeholder.txt b/-engineering/central-services/cooling-water-medium-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/timing-system/placeholder.txt
rename to -engineering/central-services/cooling-water-medium-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/vacuum/placeholder.txt b/-engineering/central-services/cooling-water-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/vacuum/placeholder.txt
rename to -engineering/central-services/cooling-water-system/placeholder.txt
diff --git a/engineering/*COMMON/devices/water-cooling/placeholder.txt b/-engineering/central-services/cryo-systems/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/devices/water-cooling/placeholder.txt
rename to -engineering/central-services/cryo-systems/placeholder.txt
diff --git a/engineering/*COMMON/utilities/placeholder.txt b/-engineering/central-services/di-ionised-water-system/placeholder.txt
similarity index 100%
rename from engineering/*COMMON/utilities/placeholder.txt
rename to -engineering/central-services/di-ionised-water-system/placeholder.txt
diff --git a/engineering/accelerator/accelerator-to-target/placeholder.txt b/-engineering/central-services/district-heating-low-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/accelerator-to-target/placeholder.txt
rename to -engineering/central-services/district-heating-low-system/placeholder.txt
diff --git a/engineering/accelerator/drift-tube-linac/placeholder.txt b/-engineering/central-services/electrical-power-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/drift-tube-linac/placeholder.txt
rename to -engineering/central-services/electrical-power-system/placeholder.txt
diff --git a/engineering/accelerator/dumpline/placeholder.txt b/-engineering/central-services/heating-water-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/dumpline/placeholder.txt
rename to -engineering/central-services/heating-water-system/placeholder.txt
diff --git a/engineering/accelerator/front-end-building/placeholder.txt b/-engineering/central-services/instrument-air-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/front-end-building/placeholder.txt
rename to -engineering/central-services/instrument-air-system/placeholder.txt
diff --git a/engineering/accelerator/high-beta-linac/placeholder.txt b/-engineering/central-services/lab-gases-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/high-beta-linac/placeholder.txt
rename to -engineering/central-services/lab-gases-system/placeholder.txt
diff --git a/engineering/accelerator/high-energy-beam-transport/placeholder.txt b/-engineering/central-services/network-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/high-energy-beam-transport/placeholder.txt
rename to -engineering/central-services/network-system/placeholder.txt
diff --git a/engineering/accelerator/ion-source/placeholder.txt b/-engineering/central-services/nitrogen-gas-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/ion-source/placeholder.txt
rename to -engineering/central-services/nitrogen-gas-system/placeholder.txt
diff --git a/engineering/accelerator/low-energy-beam-transport/placeholder.txt b/-engineering/central-services/non-potable-water-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/low-energy-beam-transport/placeholder.txt
rename to -engineering/central-services/non-potable-water-system/placeholder.txt
diff --git a/engineering/accelerator/medium-beta-linac/placeholder.txt b/-engineering/central-services/potable-water-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/medium-beta-linac/placeholder.txt
rename to -engineering/central-services/potable-water-system/placeholder.txt
diff --git a/engineering/accelerator/medium-energy-beam-transport/placeholder.txt b/-engineering/central-services/process-ventilation-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/medium-energy-beam-transport/placeholder.txt
rename to -engineering/central-services/process-ventilation-system/placeholder.txt
diff --git a/engineering/accelerator/radio-frequency-quadrupole/placeholder.txt b/-engineering/central-services/radiological-ventilation-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/radio-frequency-quadrupole/placeholder.txt
rename to -engineering/central-services/radiological-ventilation-system/placeholder.txt
diff --git a/engineering/accelerator/spoke-linac/placeholder.txt b/-engineering/central-services/radiological-waste-water-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/spoke-linac/placeholder.txt
rename to -engineering/central-services/radiological-waste-water-system/placeholder.txt
diff --git a/engineering/accelerator/stubs/placeholder.txt b/-engineering/central-services/risk-waste-water-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/stubs/placeholder.txt
rename to -engineering/central-services/risk-waste-water-system/placeholder.txt
diff --git a/engineering/accelerator/test-stand-2/placeholder.txt b/-engineering/central-services/site-infrastructure/placeholder.txt
similarity index 100%
rename from engineering/accelerator/test-stand-2/placeholder.txt
rename to -engineering/central-services/site-infrastructure/placeholder.txt
diff --git a/engineering/accelerator/test-stand-3/placeholder.txt b/-engineering/central-services/sprinkler-system/placeholder.txt
similarity index 100%
rename from engineering/accelerator/test-stand-3/placeholder.txt
rename to -engineering/central-services/sprinkler-system/placeholder.txt
diff --git a/engineering/central-services/argon-gas-system/placeholder.txt b/-engineering/central-services/standpipe-system/placeholder.txt
similarity index 100%
rename from engineering/central-services/argon-gas-system/placeholder.txt
rename to -engineering/central-services/standpipe-system/placeholder.txt
diff --git a/engineering/central-services/conventional-ventilation-system/placeholder.txt b/-engineering/central-services/storm-water-system/placeholder.txt
similarity index 100%
rename from engineering/central-services/conventional-ventilation-system/placeholder.txt
rename to -engineering/central-services/storm-water-system/placeholder.txt
diff --git a/engineering/central-services/conventional-waste-water-system/placeholder.txt b/-engineering/central-services/timing-system/placeholder.txt
similarity index 100%
rename from engineering/central-services/conventional-waste-water-system/placeholder.txt
rename to -engineering/central-services/timing-system/placeholder.txt
diff --git a/engineering/central-services/cooling-water-high-system/placeholder.txt b/-engineering/central-services/vacuum-system/placeholder.txt
similarity index 100%
rename from engineering/central-services/cooling-water-high-system/placeholder.txt
rename to -engineering/central-services/vacuum-system/placeholder.txt
diff --git a/engineering/central-services/cooling-water-low-system/placeholder.txt b/-engineering/machine-protection-system/common-machine-protection-functions/placeholder.txt
similarity index 100%
rename from engineering/central-services/cooling-water-low-system/placeholder.txt
rename to -engineering/machine-protection-system/common-machine-protection-functions/placeholder.txt
diff --git a/engineering/central-services/cooling-water-medium-system/placeholder.txt b/-engineering/machine-protection-system/fast-beam-interlock-systems/placeholder.txt
similarity index 100%
rename from engineering/central-services/cooling-water-medium-system/placeholder.txt
rename to -engineering/machine-protection-system/fast-beam-interlock-systems/placeholder.txt
diff --git a/engineering/central-services/cooling-water-system/placeholder.txt b/-engineering/machine-protection-system/local-protection-system/placeholder.txt
similarity index 100%
rename from engineering/central-services/cooling-water-system/placeholder.txt
rename to -engineering/machine-protection-system/local-protection-system/placeholder.txt
diff --git a/engineering/central-services/cryo-systems/placeholder.txt b/-engineering/neutron-instruments/instrument-1/placeholder.txt
similarity index 100%
rename from engineering/central-services/cryo-systems/placeholder.txt
rename to -engineering/neutron-instruments/instrument-1/placeholder.txt
diff --git a/engineering/central-services/di-ionised-water-system/placeholder.txt b/-engineering/neutron-instruments/nmx/placeholder.txt
similarity index 100%
rename from engineering/central-services/di-ionised-water-system/placeholder.txt
rename to -engineering/neutron-instruments/nmx/placeholder.txt
diff --git a/engineering/central-services/district-heating-low-system/placeholder.txt b/-engineering/personnel-safety-systems/coldbox-building/placeholder.txt
similarity index 100%
rename from engineering/central-services/district-heating-low-system/placeholder.txt
rename to -engineering/personnel-safety-systems/coldbox-building/placeholder.txt
diff --git a/engineering/central-services/electrical-power-system/placeholder.txt b/-engineering/personnel-safety-systems/ctl-gallery/placeholder.txt
similarity index 100%
rename from engineering/central-services/electrical-power-system/placeholder.txt
rename to -engineering/personnel-safety-systems/ctl-gallery/placeholder.txt
diff --git a/engineering/central-services/heating-water-system/placeholder.txt b/-engineering/personnel-safety-systems/helium-compressor-building/placeholder.txt
similarity index 100%
rename from engineering/central-services/heating-water-system/placeholder.txt
rename to -engineering/personnel-safety-systems/helium-compressor-building/placeholder.txt
diff --git a/engineering/central-services/instrument-air-system/placeholder.txt b/-engineering/personnel-safety-systems/klystron-gallery/placeholder.txt
similarity index 100%
rename from engineering/central-services/instrument-air-system/placeholder.txt
rename to -engineering/personnel-safety-systems/klystron-gallery/placeholder.txt
diff --git a/engineering/central-services/lab-gases-system/placeholder.txt b/-engineering/personnel-safety-systems/pss-accelerator/placeholder.txt
similarity index 100%
rename from engineering/central-services/lab-gases-system/placeholder.txt
rename to -engineering/personnel-safety-systems/pss-accelerator/placeholder.txt
diff --git a/engineering/central-services/network-system/placeholder.txt b/-engineering/target-station/active-cells/placeholder.txt
similarity index 100%
rename from engineering/central-services/network-system/placeholder.txt
rename to -engineering/target-station/active-cells/placeholder.txt
diff --git a/engineering/central-services/nitrogen-gas-system/placeholder.txt b/-engineering/target-station/active-fluids/placeholder.txt
similarity index 100%
rename from engineering/central-services/nitrogen-gas-system/placeholder.txt
rename to -engineering/target-station/active-fluids/placeholder.txt
diff --git a/engineering/central-services/non-potable-water-system/placeholder.txt b/-engineering/target-station/active-handling/placeholder.txt
similarity index 100%
rename from engineering/central-services/non-potable-water-system/placeholder.txt
rename to -engineering/target-station/active-handling/placeholder.txt
diff --git a/engineering/central-services/potable-water-system/placeholder.txt b/-engineering/target-station/active-workshops/placeholder.txt
similarity index 100%
rename from engineering/central-services/potable-water-system/placeholder.txt
rename to -engineering/target-station/active-workshops/placeholder.txt
diff --git a/engineering/central-services/process-ventilation-system/placeholder.txt b/-engineering/target-station/handling-mock-up/placeholder.txt
similarity index 100%
rename from engineering/central-services/process-ventilation-system/placeholder.txt
rename to -engineering/target-station/handling-mock-up/placeholder.txt
diff --git a/engineering/central-services/radiological-ventilation-system/placeholder.txt b/-engineering/target-station/intermediate-cooling-systems/placeholder.txt
similarity index 100%
rename from engineering/central-services/radiological-ventilation-system/placeholder.txt
rename to -engineering/target-station/intermediate-cooling-systems/placeholder.txt
diff --git a/engineering/central-services/radiological-waste-water-system/placeholder.txt b/-engineering/target-station/mobile-active-vacuum/placeholder.txt
similarity index 100%
rename from engineering/central-services/radiological-waste-water-system/placeholder.txt
rename to -engineering/target-station/mobile-active-vacuum/placeholder.txt
diff --git a/engineering/central-services/risk-waste-water-system/placeholder.txt b/-engineering/target-station/moderator-reflector/placeholder.txt
similarity index 100%
rename from engineering/central-services/risk-waste-water-system/placeholder.txt
rename to -engineering/target-station/moderator-reflector/placeholder.txt
diff --git a/engineering/central-services/site-infrastructure/placeholder.txt b/-engineering/target-station/monolith/placeholder.txt
similarity index 100%
rename from engineering/central-services/site-infrastructure/placeholder.txt
rename to -engineering/target-station/monolith/placeholder.txt
diff --git a/engineering/central-services/sprinkler-system/placeholder.txt b/-engineering/target-station/proton-beam-window/placeholder.txt
similarity index 100%
rename from engineering/central-services/sprinkler-system/placeholder.txt
rename to -engineering/target-station/proton-beam-window/placeholder.txt
diff --git a/engineering/central-services/standpipe-system/placeholder.txt b/-engineering/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt
similarity index 100%
rename from engineering/central-services/standpipe-system/placeholder.txt
rename to -engineering/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt
diff --git a/engineering/central-services/storm-water-system/placeholder.txt b/-engineering/target-station/shielding/placeholder.txt
similarity index 100%
rename from engineering/central-services/storm-water-system/placeholder.txt
rename to -engineering/target-station/shielding/placeholder.txt
diff --git a/engineering/central-services/timing-system/placeholder.txt b/-engineering/target-station/target-safety-system/placeholder.txt
similarity index 100%
rename from engineering/central-services/timing-system/placeholder.txt
rename to -engineering/target-station/target-safety-system/placeholder.txt
diff --git a/engineering/central-services/vacuum-system/placeholder.txt b/-engineering/target-station/target-systems/placeholder.txt
similarity index 100%
rename from engineering/central-services/vacuum-system/placeholder.txt
rename to -engineering/target-station/target-systems/placeholder.txt
diff --git a/engineering/machine-protection-system/common-machine-protection-functions/placeholder.txt b/-engineering/target-station/ts-storage/placeholder.txt
similarity index 100%
rename from engineering/machine-protection-system/common-machine-protection-functions/placeholder.txt
rename to -engineering/target-station/ts-storage/placeholder.txt
diff --git a/engineering/machine-protection-system/fast-beam-interlock-systems/placeholder.txt b/-engineering/target-station/tune-up-dump/placeholder.txt
similarity index 100%
rename from engineering/machine-protection-system/fast-beam-interlock-systems/placeholder.txt
rename to -engineering/target-station/tune-up-dump/placeholder.txt
diff --git a/engineering/machine-protection-system/local-protection-system/placeholder.txt b/COMMON/-devices/beam-magnets-and-deflector/placeholder.txt
similarity index 100%
rename from engineering/machine-protection-system/local-protection-system/placeholder.txt
rename to COMMON/-devices/beam-magnets-and-deflector/placeholder.txt
diff --git a/engineering/neutron-instruments/instrument-1/placeholder.txt b/COMMON/-devices/control-system/placeholder.txt
similarity index 100%
rename from engineering/neutron-instruments/instrument-1/placeholder.txt
rename to COMMON/-devices/control-system/placeholder.txt
diff --git a/engineering/neutron-instruments/nmx/placeholder.txt b/COMMON/-devices/conventional-power/placeholder.txt
similarity index 100%
rename from engineering/neutron-instruments/nmx/placeholder.txt
rename to COMMON/-devices/conventional-power/placeholder.txt
diff --git a/engineering/personnel-safety-systems/coldbox-building/placeholder.txt b/COMMON/-devices/cryogenics/placeholder.txt
similarity index 100%
rename from engineering/personnel-safety-systems/coldbox-building/placeholder.txt
rename to COMMON/-devices/cryogenics/placeholder.txt
diff --git a/engineering/personnel-safety-systems/ctl-gallery/placeholder.txt b/COMMON/-devices/electromagnetic-resonator/placeholder.txt
similarity index 100%
rename from engineering/personnel-safety-systems/ctl-gallery/placeholder.txt
rename to COMMON/-devices/electromagnetic-resonator/placeholder.txt
diff --git a/engineering/personnel-safety-systems/helium-compressor-building/placeholder.txt b/COMMON/-devices/general-mechanics/placeholder.txt
similarity index 100%
rename from engineering/personnel-safety-systems/helium-compressor-building/placeholder.txt
rename to COMMON/-devices/general-mechanics/placeholder.txt
diff --git a/engineering/personnel-safety-systems/klystron-gallery/placeholder.txt b/COMMON/-devices/heating-cooling-and-air-conditioning/placeholder.txt
similarity index 100%
rename from engineering/personnel-safety-systems/klystron-gallery/placeholder.txt
rename to COMMON/-devices/heating-cooling-and-air-conditioning/placeholder.txt
diff --git a/engineering/personnel-safety-systems/pss-accelerator/placeholder.txt b/COMMON/-devices/intercepting-devices/placeholder.txt
similarity index 100%
rename from engineering/personnel-safety-systems/pss-accelerator/placeholder.txt
rename to COMMON/-devices/intercepting-devices/placeholder.txt
diff --git a/engineering/target-station/active-cells/placeholder.txt b/COMMON/-devices/ion-source-specialties/placeholder.txt
similarity index 100%
rename from engineering/target-station/active-cells/placeholder.txt
rename to COMMON/-devices/ion-source-specialties/placeholder.txt
diff --git a/engineering/target-station/active-fluids/placeholder.txt b/COMMON/-devices/machine-protection-systems/placeholder.txt
similarity index 100%
rename from engineering/target-station/active-fluids/placeholder.txt
rename to COMMON/-devices/machine-protection-systems/placeholder.txt
diff --git a/engineering/target-station/active-handling/placeholder.txt b/COMMON/-devices/motion-control/placeholder.txt
similarity index 100%
rename from engineering/target-station/active-handling/placeholder.txt
rename to COMMON/-devices/motion-control/placeholder.txt
diff --git a/engineering/target-station/active-workshops/placeholder.txt b/COMMON/-devices/network-equipment/placeholder.txt
similarity index 100%
rename from engineering/target-station/active-workshops/placeholder.txt
rename to COMMON/-devices/network-equipment/placeholder.txt
diff --git a/engineering/target-station/handling-mock-up/placeholder.txt b/COMMON/-devices/neutron-chopper/placeholder.txt
similarity index 100%
rename from engineering/target-station/handling-mock-up/placeholder.txt
rename to COMMON/-devices/neutron-chopper/placeholder.txt
diff --git a/engineering/target-station/intermediate-cooling-systems/placeholder.txt b/COMMON/-devices/odh-detection-systems/placeholder.txt
similarity index 100%
rename from engineering/target-station/intermediate-cooling-systems/placeholder.txt
rename to COMMON/-devices/odh-detection-systems/placeholder.txt
diff --git a/engineering/target-station/mobile-active-vacuum/placeholder.txt b/COMMON/-devices/personnel-safety-systems/placeholder.txt
similarity index 100%
rename from engineering/target-station/mobile-active-vacuum/placeholder.txt
rename to COMMON/-devices/personnel-safety-systems/placeholder.txt
diff --git a/engineering/target-station/moderator-reflector/placeholder.txt b/COMMON/-devices/power-convertors/placeholder.txt
similarity index 100%
rename from engineering/target-station/moderator-reflector/placeholder.txt
rename to COMMON/-devices/power-convertors/placeholder.txt
diff --git a/engineering/target-station/monolith/placeholder.txt b/COMMON/-devices/proton-beam-instrumentation/placeholder.txt
similarity index 100%
rename from engineering/target-station/monolith/placeholder.txt
rename to COMMON/-devices/proton-beam-instrumentation/placeholder.txt
diff --git a/engineering/target-station/proton-beam-window/placeholder.txt b/COMMON/-devices/rf-systems/placeholder.txt
similarity index 100%
rename from engineering/target-station/proton-beam-window/placeholder.txt
rename to COMMON/-devices/rf-systems/placeholder.txt
diff --git a/engineering/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt b/COMMON/-devices/sample-environment-equipment/placeholder.txt
similarity index 100%
rename from engineering/target-station/radioactive-gaseous-effluent-confinement/placeholder.txt
rename to COMMON/-devices/sample-environment-equipment/placeholder.txt
diff --git a/engineering/target-station/shielding/placeholder.txt b/COMMON/-devices/sample-environment-systems/placeholder.txt
similarity index 100%
rename from engineering/target-station/shielding/placeholder.txt
rename to COMMON/-devices/sample-environment-systems/placeholder.txt
diff --git a/engineering/target-station/target-safety-system/placeholder.txt b/COMMON/-devices/timing-system/placeholder.txt
similarity index 100%
rename from engineering/target-station/target-safety-system/placeholder.txt
rename to COMMON/-devices/timing-system/placeholder.txt
diff --git a/engineering/target-station/target-systems/placeholder.txt b/COMMON/-devices/vacuum/placeholder.txt
similarity index 100%
rename from engineering/target-station/target-systems/placeholder.txt
rename to COMMON/-devices/vacuum/placeholder.txt
diff --git a/engineering/target-station/ts-storage/placeholder.txt b/COMMON/-devices/water-cooling/placeholder.txt
similarity index 100%
rename from engineering/target-station/ts-storage/placeholder.txt
rename to COMMON/-devices/water-cooling/placeholder.txt
diff --git a/engineering/target-station/tune-up-dump/placeholder.txt b/COMMON/-utilities/placeholder.txt
similarity index 100%
rename from engineering/target-station/tune-up-dump/placeholder.txt
rename to COMMON/-utilities/placeholder.txt