From a339b41571a58aa1ac37577505672ddee60eb5ba Mon Sep 17 00:00:00 2001
From: Daniel Jeans <daniel.jeans@kek.jp>
Date: Wed, 20 Sep 2023 10:40:21 +0900
Subject: [PATCH] rearrange some files to avoid duplication; fix typos

---
 .../InnerTrackerBarrelModuleDown.xml          |   2 +-
 .../InnerTrackerBarrelModuleUp.xml            |   2 +-
 .../SServices01.xml}                          |   5 +-
 .../ILD_common_v02/TrackerDiskModuleIn.xml    |  14 +-
 .../ILD_common_v02/TrackerDiskModuleOut.xml   |  14 +-
 ILD/compact/ILD_common_v02/elements.xml       |   8 +-
 ILD/compact/ILD_common_v02/materials.xml      |  34 ++++
 ILD/compact/ILD_l5_v10/FCCmats.xml            |  30 ----
 ILD/compact/ILD_l5_v10/ILD_l5_v10.xml         |   3 +-
 .../InnerTrackerBarrelModuleDown.xml          |  25 ---
 .../ILD_l5_v10/InnerTrackerILD_o2_v01_00.xml  | 160 +++++++++---------
 ILD/compact/ILD_l5_v10/SServices00.xml        |  15 --
 .../ILD_l5_v10/TrackerDiskModuleIn.xml        |  27 ---
 .../ILD_l5_v10/TrackerDiskModuleOut.xml       |  27 ---
 ILD/compact/ILD_l5_v11/FCCmats.xml            |  41 -----
 ILD/compact/ILD_l5_v11/ILD_l5_v11.xml         |   3 +-
 .../ILD_l5_v11/InnerTrackerBarrelModuleUp.xml |  25 ---
 .../ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml  | 158 ++++++++---------
 .../ILD_l5_v11/TrackerDiskModuleIn.xml        |  27 ---
 .../ILD_l5_v11/TrackerDiskModuleOut.xml       |  27 ---
 ILD/compact/README.md                         |   2 +-
 21 files changed, 222 insertions(+), 427 deletions(-)
 rename ILD/compact/{ILD_l5_v11 => ILD_common_v02}/InnerTrackerBarrelModuleDown.xml (99%)
 rename ILD/compact/{ILD_l5_v10 => ILD_common_v02}/InnerTrackerBarrelModuleUp.xml (99%)
 rename ILD/compact/{ILD_l5_v11/SServices00.xml => ILD_common_v02/SServices01.xml} (73%)
 delete mode 100644 ILD/compact/ILD_l5_v10/FCCmats.xml
 delete mode 100644 ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleDown.xml
 delete mode 100644 ILD/compact/ILD_l5_v10/SServices00.xml
 delete mode 100644 ILD/compact/ILD_l5_v10/TrackerDiskModuleIn.xml
 delete mode 100644 ILD/compact/ILD_l5_v10/TrackerDiskModuleOut.xml
 delete mode 100644 ILD/compact/ILD_l5_v11/FCCmats.xml
 delete mode 100644 ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleUp.xml
 delete mode 100644 ILD/compact/ILD_l5_v11/TrackerDiskModuleIn.xml
 delete mode 100644 ILD/compact/ILD_l5_v11/TrackerDiskModuleOut.xml

diff --git a/ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleDown.xml b/ILD/compact/ILD_common_v02/InnerTrackerBarrelModuleDown.xml
similarity index 99%
rename from ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleDown.xml
rename to ILD/compact/ILD_common_v02/InnerTrackerBarrelModuleDown.xml
index 12d5d7485..79ccc8b59 100644
--- a/ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleDown.xml
+++ b/ILD/compact/ILD_common_v02/InnerTrackerBarrelModuleDown.xml
@@ -22,4 +22,4 @@
     <module_component thickness="0.068*mm"  material="Kapton"           info="Cold Plate: Cooling pipe"     sensitive="false"/>
     <module_component thickness="0.030*mm"  material="CarbonFiber"      info="Cold Plate: Graphite foil"    sensitive="false"/>
     <module_component thickness="0.020*mm"  material="CarbonFiber_25D"  info="Cold Plate: Carbon fleece"    sensitive="false"/>
-</lccdd>
\ No newline at end of file
+</lccdd>
diff --git a/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleUp.xml b/ILD/compact/ILD_common_v02/InnerTrackerBarrelModuleUp.xml
similarity index 99%
rename from ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleUp.xml
rename to ILD/compact/ILD_common_v02/InnerTrackerBarrelModuleUp.xml
index a81418293..3d8722ec0 100644
--- a/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleUp.xml
+++ b/ILD/compact/ILD_common_v02/InnerTrackerBarrelModuleUp.xml
@@ -22,4 +22,4 @@
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
     <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"         sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
-</lccdd>
\ No newline at end of file
+</lccdd>
diff --git a/ILD/compact/ILD_l5_v11/SServices00.xml b/ILD/compact/ILD_common_v02/SServices01.xml
similarity index 73%
rename from ILD/compact/ILD_l5_v11/SServices00.xml
rename to ILD/compact/ILD_common_v02/SServices01.xml
index 6d9943d95..932a106b0 100644
--- a/ILD/compact/ILD_l5_v11/SServices00.xml
+++ b/ILD/compact/ILD_common_v02/SServices01.xml
@@ -1,5 +1,6 @@
 <!-- 
-     SService00 parameters for ILD_*_v2
+     SService01 parameters for ILD_*_v10, v11
+     (some elements of services are turned off)
 -->
 <lccdd>
 <detectors>
@@ -7,7 +8,7 @@
 <detector name="SServices00" type="SServices00" id="ILDDetID_NOTUSED" vis="RedVis" insideTrackingVolume="false" sensitive="no" build_tpc_cooling="false" build_ecal_services="true" build_hcal_services="true" build_sit_cables="false" build_vxd_cables="false">
   <type_flags type=" DetType_SUPPORT " />
 
-  <TPC_Cooling number_of_rings="0"/> <!-- Daniel's understanding (via Dimitra) -->
+  <TPC_Cooling number_of_rings="0"/>
 
 </detector>
 </detectors>
diff --git a/ILD/compact/ILD_common_v02/TrackerDiskModuleIn.xml b/ILD/compact/ILD_common_v02/TrackerDiskModuleIn.xml
index e45a11325..12a1efe2e 100644
--- a/ILD/compact/ILD_common_v02/TrackerDiskModuleIn.xml
+++ b/ILD/compact/ILD_common_v02/TrackerDiskModuleIn.xml
@@ -1,27 +1,27 @@
 <lccdd>
     <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Al"               info="Power bus: Conductor"                 sensitive="false"/>
+    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Al"               info="Module: FPC metal layer"              sensitive="false"/>
+    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
     <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
     <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
     <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-</lccdd>
+</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_common_v02/TrackerDiskModuleOut.xml b/ILD/compact/ILD_common_v02/TrackerDiskModuleOut.xml
index 387486f22..8c0303810 100644
--- a/ILD/compact/ILD_common_v02/TrackerDiskModuleOut.xml
+++ b/ILD/compact/ILD_common_v02/TrackerDiskModuleOut.xml
@@ -2,26 +2,26 @@
     <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
     <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
     <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
     <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Al"               info="Module: FPC metal layer"              sensitive="false"/>
+    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Al"               info="Power bus: Conductor"                 sensitive="false"/>
+    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-</lccdd>
+</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_common_v02/elements.xml b/ILD/compact/ILD_common_v02/elements.xml
index e714c3a5c..2a1e12de3 100644
--- a/ILD/compact/ILD_common_v02/elements.xml
+++ b/ILD/compact/ILD_common_v02/elements.xml
@@ -26,6 +26,12 @@
   <D type="density" unit="g/cm3" value="2.699" />
   <composite n="1" ref="Al" />
  </material>
+ <material formula="Al" name="Aluminium" state="solid" >
+  <RL type="X0" unit="cm" value="8.89632" />
+  <NIL type="lambda" unit="cm" value="38.8766" />
+  <D type="density" unit="g/cm3" value="2.699" />
+  <composite n="1" ref="Al" />
+ </material>
  <element Z="95" formula="Am" name="Am" >
   <atom type="A" unit="g/mol" value="243.061" />
  </element>
@@ -881,4 +887,4 @@
   <D type="density" unit="g/cm3" value="6.506" />
   <composite n="1" ref="Zr" />
  </material>
-</materials>
\ No newline at end of file
+</materials>
diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
index ed16f7b23..792f49a0f 100644
--- a/ILD/compact/ILD_common_v02/materials.xml
+++ b/ILD/compact/ILD_common_v02/materials.xml
@@ -571,5 +571,39 @@
     </material>
 
 
+    <material name="SolenoidMixture">
+      <D value="4.38" unit="g/cm3"/>
+      <fraction n="0.666" ref="Al"/>
+      <fraction n="0.166" ref="Cu"/>
+      <fraction n="0.084" ref="Ti"/>
+      <fraction n="0.084" ref="Nb"/>
+    </material>
+
+    <material name="Epoxy">
+      <D type="density" value="1.3" unit="g/cm3"/>
+      <composite n="44" ref="H"/>
+      <composite n="15" ref="C"/>
+      <composite n="7" ref="O"/>
+    </material>
+
+    <material name="CarbonFiber_25D">
+      <D type="density" value="0.375" unit="g/cm3"/>
+      <fraction n="0.60" ref="C"/>
+      <fraction n="0.40" ref="Epoxy"/>
+    </material>
+
+    <material name="AlBeMet162">
+      <D value="2.1" unit="g/cm3"/>
+      <fraction n="0.38" ref="Al"/>
+      <fraction n="0.62" ref="Be"/>
+    </material>
+
+    <material name="LiquidNDecane">
+      <D value="0.73" unit="g/cm3"/>
+      <composite n="10" ref="C" />
+      <composite n="22" ref="H" />
+    </material>
+
+
 
   </materials>
diff --git a/ILD/compact/ILD_l5_v10/FCCmats.xml b/ILD/compact/ILD_l5_v10/FCCmats.xml
deleted file mode 100644
index a952d9917..000000000
--- a/ILD/compact/ILD_l5_v10/FCCmats.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<materials>
-
-  <material name="SolenoidMixture">
-    <D value="4.38" unit="g/cm3"/>
-    <fraction n="0.666" ref="Al"/>
-    <fraction n="0.166" ref="Cu"/>
-    <fraction n="0.084" ref="Ti"/>
-    <fraction n="0.084" ref="Nb"/>
-  </material>
-
-  <material formula="Al" name="Aluminium" state="solid" >
-    <D type="density" unit="g/cm3" value="2.699" />
-    <composite n="1" ref="Al" />
-  </material>
-
-    <material name="Epoxy">
-      <D type="density" value="1.3" unit="g/cm3"/>
-      <composite n="44" ref="H"/>
-      <composite n="15" ref="C"/>
-      <composite n="7" ref="O"/>
-    </material>
-
-    <material name="CarbonFiber_25D">
-      <D type="density" value="0.375" unit="g/cm3"/>
-      <fraction n="0.60" ref="C"/>
-      <fraction n="0.40" ref="Epoxy"/>
-    </material>
-
-
-</materials>
diff --git a/ILD/compact/ILD_l5_v10/ILD_l5_v10.xml b/ILD/compact/ILD_l5_v10/ILD_l5_v10.xml
index 0fd534433..990d6f6a5 100644
--- a/ILD/compact/ILD_l5_v10/ILD_l5_v10.xml
+++ b/ILD/compact/ILD_l5_v10/ILD_l5_v10.xml
@@ -12,7 +12,6 @@
   <includes>
     <gdmlFile  ref="../ILD_common_v02/elements.xml"/>
     <gdmlFile  ref="../ILD_common_v02/materials.xml"/>
-    <gdmlFile  ref="FCCmats.xml"/>
   </includes>
 
   <define>
@@ -87,7 +86,7 @@
   <include ref="../ILD_common_v02/Yoke05_Barrel.xml"/>
   <include ref="../ILD_common_v02/Yoke06_Endcaps.xml"/>
   <include ref="../ILD_common_v02/coil03.xml"/>
-  <include ref="SServices00.xml"/>
+  <include ref="../ILD_common_v02/SServices01.xml"/>
 
   <plugins>
     <plugin name="DD4hepVolumeManager"/>
diff --git a/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleDown.xml b/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleDown.xml
deleted file mode 100644
index 12d5d7485..000000000
--- a/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleDown.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<lccdd>
-    <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"         sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"               sensitive="false"/>
-
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer" sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"      sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer" sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"             sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"               sensitive="true" />
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Module: Glue"                 sensitive="false"/>
-    <module_component thickness="0.120*mm"  material="CarbonFiber"      info="Module: Plate"                sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"               sensitive="false"/>
-
-    <module_component thickness="0.020*mm"  material="CarbonFiber_25D"  info="Cold Plate: Carbon fleece"    sensitive="false"/>
-    <module_component thickness="0.120*mm"  material="CarbonFiber"      info="Cold Plate: Carbon plate"     sensitive="false"/>
-    <module_component thickness="0.235*mm"  material="Water"            info="Cold Plate: Cooling fluid"    sensitive="false"/>
-    <module_component thickness="0.068*mm"  material="Kapton"           info="Cold Plate: Cooling pipe"     sensitive="false"/>
-    <module_component thickness="0.030*mm"  material="CarbonFiber"      info="Cold Plate: Graphite foil"    sensitive="false"/>
-    <module_component thickness="0.020*mm"  material="CarbonFiber_25D"  info="Cold Plate: Carbon fleece"    sensitive="false"/>
-</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_l5_v10/InnerTrackerILD_o2_v01_00.xml b/ILD/compact/ILD_l5_v10/InnerTrackerILD_o2_v01_00.xml
index 5fa003f71..d8e1828a3 100644
--- a/ILD/compact/ILD_l5_v10/InnerTrackerILD_o2_v01_00.xml
+++ b/ILD/compact/ILD_l5_v10/InnerTrackerILD_o2_v01_00.xml
@@ -206,7 +206,7 @@ adapted by DJeans to fit into ILD model at ILC
 
             <module name="InnerTrackerBarrelModule_01" vis="InnerTrackerModuleVis">
                 <module_envelope width="30.1*mm" length="30.1*mm"/>
-                <include ref="InnerTrackerBarrelModuleDown.xml"/>
+                <include ref="../ILD_common_v02/InnerTrackerBarrelModuleDown.xml"/>
             </module>
 
             <layer module="InnerTrackerBarrelModule_01" id="0" type="1" >
@@ -239,320 +239,320 @@ adapted by DJeans to fit into ILD model at ILC
 
             <module name="InnerTrackerEndcapModule_2x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="30.2*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_2x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="30.2*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x1_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="45.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x1_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x6_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x7_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x7_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x7_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x9_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="135.9*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x4_Out" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="60.4*mm"/>
-              <include ref="TrackerDiskModuleOut.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x8_Out" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="120.8*mm"/>
-              <include ref="TrackerDiskModuleOut.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x9_Out" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="135.9*mm"/>
-              <include ref="TrackerDiskModuleOut.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x6_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
 
             <module name="InnerTrackerEndcapModule_2x2_In" vis="InnerTrackerModuleVis">
                 <trd x="30.2*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x2_In" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x3_In" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x4_In" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x1_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x2_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x3_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x4_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x2_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x3_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x4_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x5_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x6_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x7_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x8_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x1_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x4_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x7_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x8_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x5_In" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x8_In" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x4_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x5_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x7_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x8_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x3_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x5_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x8_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x9_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="135.9*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x4_In" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="60.4*mm"/>
-              <include ref="TrackerDiskModuleIn.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x8_In" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="120.8*mm"/>
-              <include ref="TrackerDiskModuleIn.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x9_In" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="135.9*mm"/>
-              <include ref="TrackerDiskModuleIn.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x2_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x3_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x5_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x6_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x3_In" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x5_In" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x8_In" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
 
            <layer id="0">
diff --git a/ILD/compact/ILD_l5_v10/SServices00.xml b/ILD/compact/ILD_l5_v10/SServices00.xml
deleted file mode 100644
index 6edbe8fb8..000000000
--- a/ILD/compact/ILD_l5_v10/SServices00.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 
-     SService00 parameters for ILD_*_v2
--->
-<lccdd>
-<detectors>
-
-<detector name="SServices00" type="SServices00" id="ILDDetID_NOTUSED" vis="RedVis" insideTrackingVolume="false" sensitive="no" build_tpc_cooling="false" build_ecal_services="true" build_hcal_services="true" build_sit_cables="false" build_vxd_cables="false">
-  <type_flags type=" DetType_SUPPORT " />
-
-  <TPC_Cooling number_of_rings="0"/> <!-- Daniel's understanding (via Dimitra) -->
-
-
-</detector>
-</detectors>
-</lccdd>
diff --git a/ILD/compact/ILD_l5_v10/TrackerDiskModuleIn.xml b/ILD/compact/ILD_l5_v10/TrackerDiskModuleIn.xml
deleted file mode 100644
index 12a1efe2e..000000000
--- a/ILD/compact/ILD_l5_v10/TrackerDiskModuleIn.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<lccdd>
-    <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
-    <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
-    <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
-    <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_l5_v10/TrackerDiskModuleOut.xml b/ILD/compact/ILD_l5_v10/TrackerDiskModuleOut.xml
deleted file mode 100644
index 8c0303810..000000000
--- a/ILD/compact/ILD_l5_v10/TrackerDiskModuleOut.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<lccdd>
-    <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
-    <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
-    <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
-    <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_l5_v11/FCCmats.xml b/ILD/compact/ILD_l5_v11/FCCmats.xml
deleted file mode 100644
index be8f6e29e..000000000
--- a/ILD/compact/ILD_l5_v11/FCCmats.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<materials>
-
-  <material name="SolenoidMixture">
-    <D value="4.38" unit="g/cm3"/>
-    <fraction n="0.666" ref="Al"/>
-    <fraction n="0.166" ref="Cu"/>
-    <fraction n="0.084" ref="Ti"/>
-    <fraction n="0.084" ref="Nb"/>
-  </material>
-
-  <material formula="Al" name="Aluminium" state="solid" >
-    <D type="density" unit="g/cm3" value="2.699" />
-    <composite n="1" ref="Al" />
-  </material>
-
-    <material name="Epoxy">
-      <D type="density" value="1.3" unit="g/cm3"/>
-      <composite n="44" ref="H"/>
-      <composite n="15" ref="C"/>
-      <composite n="7" ref="O"/>
-    </material>
-
-    <material name="CarbonFiber_25D">
-      <D type="density" value="0.375" unit="g/cm3"/>
-      <fraction n="0.60" ref="C"/>
-      <fraction n="0.40" ref="Epoxy"/>
-    </material>
-
-    <material name="AlBeMet162">
-      <D value="2.1" unit="g/cm3"/>
-      <fraction n="0.38" ref="Al"/>
-      <fraction n="0.62" ref="Be"/>
-    </material>
-
-    <material name="LiquidNDecane">
-      <D value="0.73" unit="g/cm3"/>
-      <composite n="10" ref="C" />
-      <composite n="22" ref="H" />
-    </material>
-
-</materials>
diff --git a/ILD/compact/ILD_l5_v11/ILD_l5_v11.xml b/ILD/compact/ILD_l5_v11/ILD_l5_v11.xml
index fd4d3fbde..f124797e3 100644
--- a/ILD/compact/ILD_l5_v11/ILD_l5_v11.xml
+++ b/ILD/compact/ILD_l5_v11/ILD_l5_v11.xml
@@ -12,7 +12,6 @@
   <includes>
     <gdmlFile  ref="../ILD_common_v02/elements.xml"/>
     <gdmlFile  ref="../ILD_common_v02/materials.xml"/>
-    <gdmlFile  ref="FCCmats.xml"/>
   </includes>
 
   <define>
@@ -75,7 +74,7 @@
   <include ref="../ILD_common_v02/Yoke05_Barrel.xml"/>
   <include ref="../ILD_common_v02/Yoke06_Endcaps.xml"/>
   <include ref="../ILD_common_v02/coil03.xml"/>
-  <include ref="SServices00.xml"/>
+  <include ref="../ILD_common_v02/SServices01.xml"/>
 
   <plugins>
     <plugin name="DD4hepVolumeManager"/>
diff --git a/ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleUp.xml b/ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleUp.xml
deleted file mode 100644
index a81418293..000000000
--- a/ILD/compact/ILD_l5_v11/InnerTrackerBarrelModuleUp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<lccdd>
-    <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
-    <module_component thickness="0.020*mm"  material="CarbonFiber_25D"  info="Cold Plate: Carbon fleece"    sensitive="false"/>
-    <module_component thickness="0.030*mm"  material="CarbonFiber"      info="Cold Plate: Graphite foil"    sensitive="false"/>
-    <module_component thickness="0.068*mm"  material="Kapton"           info="Cold Plate: Cooling pipe"     sensitive="false"/>
-    <module_component thickness="0.235*mm"  material="Water"            info="Cold Plate: Cooling fluid"    sensitive="false"/>
-    <module_component thickness="0.120*mm"  material="CarbonFiber"      info="Cold Plate: Carbon plate"     sensitive="false"/>
-    <module_component thickness="0.020*mm"  material="CarbonFiber_25D"  info="Cold Plate: Carbon fleece"    sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"               sensitive="false"/>
-
-    <module_component thickness="0.120*mm"  material="CarbonFiber"      info="Module: Plate"                sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Module: Glue"                 sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"               sensitive="true" />
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"             sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer" sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"      sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer" sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"               sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"         sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
-</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml b/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml
index 15b0db9c2..1d5142850 100644
--- a/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml
+++ b/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml
@@ -113,7 +113,7 @@ adapted by DJeans to fit into ILD model at FCCee
 
             <module name="InnerTrackerBarrelModule_01" vis="InnerTrackerModuleVis">
                 <module_envelope width="30.1*mm" length="30.1*mm"/>
-                <include ref="InnerTrackerBarrelModuleDown.xml"/>
+                <include ref="../ILD_common_v02/InnerTrackerBarrelModuleDown.xml"/>
             </module>
 
             <layer module="InnerTrackerBarrelModule_01" id="0" type="1" >
@@ -144,316 +144,316 @@ adapted by DJeans to fit into ILD model at FCCee
 
             <module name="InnerTrackerEndcapModule_2x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="30.2*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x1_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="45.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x1_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x6_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x7_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x7_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x4_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x7_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x9_Out" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="135.9*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x4_Out" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="60.4*mm"/>
-              <include ref="TrackerDiskModuleOut.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x8_Out" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="120.8*mm"/>
-              <include ref="TrackerDiskModuleOut.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x9_Out" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="135.9*mm"/>
-              <include ref="TrackerDiskModuleOut.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x2_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x6_Out" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x3_Out" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x5_Out" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x8_Out" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleOut.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleOut.xml"/>
             </module>
 
             <module name="InnerTrackerEndcapModule_2x2_In" vis="InnerTrackerModuleVis">
                 <trd x="30.2*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x2_In" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x3_In" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_3x4_In" vis="InnerTrackerModuleVis">
                 <trd x="45.3*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x1_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x2_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x3_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_4x4_In" vis="InnerTrackerModuleVis">
                 <trd x="60.4*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x2_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x3_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x4_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x5_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x6_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x7_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_5x8_In" vis="InnerTrackerModuleVis">
                 <trd x="75.5*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x1_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="15.1*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x4_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x7_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_6x8_In" vis="InnerTrackerModuleVis">
                 <trd x="90.6*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x5_In" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_7x8_In" vis="InnerTrackerModuleVis">
                 <trd x="105.7*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x4_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="60.4*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x5_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x7_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="105.7*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_8x8_In" vis="InnerTrackerModuleVis">
                 <trd x="120.8*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x3_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x5_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x8_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_9x9_In" vis="InnerTrackerModuleVis">
                 <trd x="135.9*mm" y="135.9*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x4_In" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="60.4*mm"/>
-              <include ref="TrackerDiskModuleIn.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x8_In" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="120.8*mm"/>
-              <include ref="TrackerDiskModuleIn.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_10x9_In" vis="InnerTrackerModuleVis">
               <trd x="151*mm" y="135.9*mm"/>
-              <include ref="TrackerDiskModuleIn.xml"/>
+              <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x2_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="30.2*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x3_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x5_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_11x6_In" vis="InnerTrackerModuleVis">
                 <trd x="166.1*mm" y="90.6*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x3_In" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="45.3*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x5_In" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="75.5*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
             <module name="InnerTrackerEndcapModule_12x8_In" vis="InnerTrackerModuleVis">
                 <trd x="181.2*mm" y="120.8*mm"/>
-                <include ref="TrackerDiskModuleIn.xml"/>
+                <include ref="../ILD_common_v02/TrackerDiskModuleIn.xml"/>
             </module>
 
            <layer id="0">
diff --git a/ILD/compact/ILD_l5_v11/TrackerDiskModuleIn.xml b/ILD/compact/ILD_l5_v11/TrackerDiskModuleIn.xml
deleted file mode 100644
index 12a1efe2e..000000000
--- a/ILD/compact/ILD_l5_v11/TrackerDiskModuleIn.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<lccdd>
-    <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
-    <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
-    <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
-    <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/ILD_l5_v11/TrackerDiskModuleOut.xml b/ILD/compact/ILD_l5_v11/TrackerDiskModuleOut.xml
deleted file mode 100644
index 8c0303810..000000000
--- a/ILD/compact/ILD_l5_v11/TrackerDiskModuleOut.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<lccdd>
-    <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
-    <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
-    <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
-    <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
-    <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
-    <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
-
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-</lccdd>
\ No newline at end of file
diff --git a/ILD/compact/README.md b/ILD/compact/README.md
index 91e20b4be..c1c1dac47 100644
--- a/ILD/compact/README.md
+++ b/ILD/compact/README.md
@@ -40,7 +40,7 @@ The following ILD detector models are available in lcgeo ( current production mo
 
 ## Details
 
-### ILD_l5_v10
+### ILD_l5_v11
 same detector geometry as ILD_l5_v02 model, but with FCCee MDI and CLD-inspired silicon inner tracker & VTX in place of original ILD's VTX, SIT, FTD. 
 BeamCal, LHCAL removed.