Index: binaries/data/mods/public/simulation/components/GarrisonHolder.js
===================================================================
--- binaries/data/mods/public/simulation/components/GarrisonHolder.js
+++ binaries/data/mods/public/simulation/components/GarrisonHolder.js
@@ -240,11 +240,6 @@
 
 	this.entities.splice(entityIndex, 1);
 
-	// Reset the obstruction flags to template defaults.
-	let cmpObstruction = Engine.QueryInterface(entity, IID_Obstruction);
-	if (cmpObstruction)
-		cmpObstruction.SetActive(true);
-
 	let cmpEntUnitAI = Engine.QueryInterface(entity, IID_UnitAI);
 	if (cmpEntUnitAI)
 		cmpEntUnitAI.Ungarrison();
Index: binaries/data/mods/public/simulation/components/TurretHolder.js
===================================================================
--- binaries/data/mods/public/simulation/components/TurretHolder.js
+++ binaries/data/mods/public/simulation/components/TurretHolder.js
@@ -56,7 +56,7 @@
 	/**
 	 * Occupy a turret point with the given entity.
 	 * @param {number} entity - The entity to use.
-	 * @param {Object} turretPoint - Optionally the specific turret point to occupy.
+	 * @param {Object} requestedTurretPoint - Optionally the specific turret point to occupy.
 	 *
 	 * @return {boolean} - Whether the occupation was successful.
 	 */
@@ -107,6 +107,11 @@
 		if (cmpUnitAI)
 			cmpUnitAI.SetTurretStance();
 
+		// Remove the unit's obstruction to avoid interfering with pathing.
+		let cmpObstruction = Engine.QueryInterface(entity, IID_Obstruction);
+		if (cmpObstruction)
+			cmpObstruction.SetActive(false);
+
 		Engine.PostMessage(this.entity, MT_TurretsChanged, {
 			"added": [entity],
 			"removed": []
@@ -149,6 +154,11 @@
 
 		turretPoint.entity = null;
 
+		// Reset the obstruction flags to template defaults.
+		let cmpObstruction = Engine.QueryInterface(entity, IID_Obstruction);
+		if (cmpObstruction)
+			cmpObstruction.SetActive(true);
+
 		Engine.PostMessage(this.entity, MT_TurretsChanged, {
 			"added": [],
 			"removed": [entity]
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -3404,9 +3404,7 @@
 
 UnitAI.prototype.IsTurret = function()
 {
-	if (!this.IsGarrisoned())
-		return false;
-	var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+	let cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
 	return cmpPosition && cmpPosition.GetTurretParent() != INVALID_ENTITY;
 };
 
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="6"/>
     <Height>9.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.5</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.5</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/hellenes/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="6"/>
     <Height>12.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.5</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.5</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/hellenes/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="7"/>
     <Height>10.3</Height>
   </Footprint>
+  <Identity>
+    <Civ>brit</Civ>
+    <SpecificName>Rate</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="6"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11.3</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Rate</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="6"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11.3</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/britons/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="7"/>
     <Height>10.3</Height>
   </Footprint>
+  <Identity>
+    <Civ>brit</Civ>
+    <SpecificName>Rate</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="6"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11.3</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Rate</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="6"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11.3</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/britons/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="8"/>
     <Height>13</Height>
   </Footprint>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Homah</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="7"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>14</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Homah</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="7"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>14</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/carthaginians/wall_long.xml</Actor>
     <FoundationActor>structures/carthaginians/fndn_wall_long.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="8"/>
     <Height>13</Height>
   </Footprint>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Homah</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="7"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>14</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Homah</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="7"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>14</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/carthaginians/wall_medium.xml</Actor>
     <FoundationActor>structures/carthaginians/fndn_wall_medium.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="7"/>
     <Height>10.3</Height>
   </Footprint>
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Rate</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="6"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11.3</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>gaul</Civ>
-    <SpecificName>Rate</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="6"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11.3</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/gauls/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="7"/>
     <Height>10.3</Height>
   </Footprint>
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Rate</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="6"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11.3</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>gaul</Civ>
-    <SpecificName>Rate</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="6"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11.3</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/gauls/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="8"/>
     <Height>10</Height>
   </Footprint>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Zabal Horma</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="7"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Zabal Horma</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="7"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/iberians/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="8"/>
     <Height>10</Height>
   </Footprint>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Zabal Horma</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="7"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Zabal Horma</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="7"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/iberians/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="6"/>
     <Height>12.6</Height>
   </Footprint>
+  <Identity>
+    <Civ>kush</Civ>
+    <SpecificName>sbty</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.6</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>kush</Civ>
-    <SpecificName>sbty</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.6</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/kushites/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="6"/>
     <Height>12.6</Height>
   </Footprint>
+  <Identity>
+    <Civ>kush</Civ>
+    <SpecificName>sbty</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.6</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>kush</Civ>
-    <SpecificName>sbty</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.6</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/kushites/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="6"/>
     <Height>12.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.5</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.5</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/hellenes/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="6"/>
     <Height>12.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.5</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.5</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/hellenes/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
@@ -24,6 +24,12 @@
     <List>Infantry+Archer</List>
     <Max>20</Max>
   </GarrisonHolder>
+  <Health>
+    <Max>1200</Max>
+  </Health>
+  <StatusBars>
+    <HeightOffset>19.0</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -76,12 +82,6 @@
       </Archer16>
     </TurretPoints>
   </TurretHolder>
-  <Health>
-    <Max>1200</Max>
-  </Health>
-  <StatusBars>
-    <HeightOffset>19.0</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/mauryas/tower_double.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
@@ -10,6 +10,20 @@
     <Square width="37" depth="5"/>
     <Height>10.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>maur</Civ>
+    <SpecificName>Shilabanda</SpecificName>
+  </Identity>
+  <Loot>
+    <wood>7</wood>
+    <stone>0</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="36" depth="4"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>18</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -39,20 +53,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>maur</Civ>
-    <SpecificName>Shilabanda</SpecificName>
-  </Identity>
-  <Loot>
-    <wood>7</wood>
-    <stone>0</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="36" depth="4"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>18</HeightOffset>
-  </StatusBars>
   <Upgrade>
     <Gate>
       <Cost>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
@@ -10,6 +10,20 @@
     <Square width="25" depth="5"/>
     <Height>10.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>maur</Civ>
+    <SpecificName>Shilabanda</SpecificName>
+  </Identity>
+  <Loot>
+    <wood>5</wood>
+    <stone>0</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="24" depth="4"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>18</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -29,20 +43,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>maur</Civ>
-    <SpecificName>Shilabanda</SpecificName>
-  </Identity>
-  <Loot>
-    <wood>5</wood>
-    <stone>0</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="24" depth="4"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>18</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/mauryas/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="7"/>
     <Height>11.6</Height>
   </Footprint>
+  <Identity>
+    <Civ>pers</Civ>
+    <SpecificName>Para</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="6"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>12.6</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>pers</Civ>
-    <SpecificName>Para</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="6"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>12.6</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/persians/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="7"/>
     <Height>11.6</Height>
   </Footprint>
+  <Identity>
+    <Civ>pers</Civ>
+    <SpecificName>Para</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="6"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>12.6</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>pers</Civ>
-    <SpecificName>Para</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="6"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>12.6</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/persians/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="39" depth="6"/>
     <Height>10.8</Height>
   </Footprint>
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="38" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11.8</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="38" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11.8</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/ptolemies/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="26" depth="6"/>
     <Height>10.8</Height>
   </Footprint>
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="25" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>11.8</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="25" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>11.8</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/ptolemies/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
@@ -23,6 +23,29 @@
     <Square width="37" depth="5"/>
     <Height>6.7</Height>
   </Footprint>
+  <Health>
+    <Max op="mul">0.75</Max>
+  </Health>
+  <Identity>
+    <Civ>rome</Civ>
+    <SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
+    <GenericName>Siege Wall</GenericName>
+    <SpecificName>Mūrus Circummūnītiōnis</SpecificName>
+    <Classes datatype="tokens">SiegeWall</Classes>
+    <Icon>structures/siege_wall.png</Icon>
+    <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
+  </Identity>
+  <Loot>
+    <wood>12</wood>
+    <stone>0</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="36" depth="4"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>7.7</HeightOffset>
+  </StatusBars>
+  <TerritoryInfluence disable=""/>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -52,29 +75,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Health>
-    <Max op="mul">0.75</Max>
-  </Health>
-  <Identity>
-    <Civ>rome</Civ>
-    <SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
-    <GenericName>Siege Wall</GenericName>
-    <SpecificName>Mūrus Circummūnītiōnis</SpecificName>
-    <Classes datatype="tokens">SiegeWall</Classes>
-    <Icon>structures/siege_wall.png</Icon>
-    <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
-  </Identity>
-  <Loot>
-    <wood>12</wood>
-    <stone>0</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="36" depth="4"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>7.7</HeightOffset>
-  </StatusBars>
-  <TerritoryInfluence disable=""/>
   <Upgrade>
     <Gate>
       <Entity>structures/rome_siege_wall_gate</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
@@ -23,25 +23,6 @@
     <Square width="25" depth="5"/>
     <Height>6.7</Height>
   </Footprint>
-  <TurretHolder>
-    <TurretPoints>
-      <Archer1>
-        <X>0</X>
-        <Y>5.7</Y>
-        <Z>0</Z>
-      </Archer1>
-      <Archer2>
-        <X>4</X>
-        <Y>5.7</Y>
-        <Z>0</Z>
-      </Archer2>
-      <Archer3>
-        <X>-4</X>
-        <Y>5.7</Y>
-        <Z>0</Z>
-      </Archer3>
-    </TurretPoints>
-  </TurretHolder>
   <Health>
     <Max op="mul">0.75</Max>
   </Health>
@@ -65,6 +46,25 @@
     <HeightOffset>7.7</HeightOffset>
   </StatusBars>
   <TerritoryInfluence disable=""/>
+  <TurretHolder>
+    <TurretPoints>
+      <Archer1>
+        <X>0</X>
+        <Y>5.7</Y>
+        <Z>0</Z>
+      </Archer1>
+      <Archer2>
+        <X>4</X>
+        <Y>5.7</Y>
+        <Z>0</Z>
+      </Archer2>
+      <Archer3>
+        <X>-4</X>
+        <Y>5.7</Y>
+        <Z>0</Z>
+      </Archer3>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/romans/siege_wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="9"/>
     <Height>9.9</Height>
   </Footprint>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Moenia</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="8"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>10.9</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Moenia</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="8"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>10.9</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/romans/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="9"/>
     <Height>9.9</Height>
   </Footprint>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Moenia</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="8"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>10.9</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Moenia</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="8"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>10.9</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/romans/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="35" depth="6"/>
     <Height>11.4</Height>
   </Footprint>
+  <Identity>
+    <Civ>sele</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="34" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>12.4</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="34" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>12.4</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/seleucids/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="22" depth="6"/>
     <Height>11.4</Height>
   </Footprint>
+  <Identity>
+    <Civ>sele</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="21" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>12.4</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="21" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>12.4</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/seleucids/wall_medium.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
@@ -4,6 +4,16 @@
     <Square width="37" depth="6"/>
     <Height>12.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>spart</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="36" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.5</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -33,16 +43,6 @@
       </Archer5>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="36" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.5</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/hellenes/wall_long.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
@@ -4,6 +4,16 @@
     <Square width="25" depth="6"/>
     <Height>12.5</Height>
   </Footprint>
+  <Identity>
+    <Civ>spart</Civ>
+    <SpecificName>Teichos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24" depth="5"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>13.5</HeightOffset>
+  </StatusBars>
   <TurretHolder>
     <TurretPoints>
       <Archer1>
@@ -23,16 +33,6 @@
       </Archer3>
     </TurretPoints>
   </TurretHolder>
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Teichos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24" depth="5"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>13.5</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/hellenes/wall_medium.xml</Actor>
   </VisualActor>