Index: template_gaia_geo_mineral_slabs.xml
===================================================================
--- template_gaia_geo_mineral_slabs.xml	(revision 9928)
+++ template_gaia_geo_mineral_slabs.xml	(working copy)
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo_mineral">
+  <Footprint>
+    <Circle radius="10.0"/>
+    <Height>3.5</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="13.0" depth="13.0"/>
+  </Obstruction>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
@@ -11,11 +18,4 @@
     <BarHeight>0.6</BarHeight>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Circle radius="10.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="13.0" depth="13.0"/>
-  </Obstruction>
 </Entity>
Index: template_structure_defense_scout_tower.xml
===================================================================
--- template_structure_defense_scout_tower.xml	(revision 9928)
+++ template_structure_defense_scout_tower.xml	(working copy)
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>Outpost</GenericName>
-    <Tooltip>Reconnoiter the countryside. Garrison to provide defense.</Tooltip>
-    <Classes datatype="tokens">Village Defensive</Classes>
-    <Icon>structures/outpost.png</Icon>
-  </Identity>
-  <BuildRestrictions>
-    <Category>ScoutTower</Category>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>120</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>1200</Max>
-  </Health>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>15.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="7.5" depth="7.5"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>21.0</HeightOffset>
-  </StatusBars>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tower.xml</select>
-      <constructed>interface/complete/building/complete_tower.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <GarrisonHolder>
-    <Max>5</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>25.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>80.0</MaxRange>
-      <MinRange>16.0</MinRange>
-      <ProjectileSpeed>60.0</ProjectileSpeed>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-  </BuildingAI>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic">
+  <Armour>
+    <Hack>15.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>15.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>25.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>80.0</MaxRange>
+      <MinRange>16.0</MinRange>
+      <ProjectileSpeed>60.0</ProjectileSpeed>
+      <PrepareTime>1200</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
+  <BuildingAI>
+    <DefaultArrowCount>1</DefaultArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+  </BuildingAI>
+  <BuildRestrictions>
+    <Category>ScoutTower</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>120</BuildTime>
+    <Resources>
+      <wood>100</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="7.5" depth="7.5"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>1200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Outpost</GenericName>
+    <Tooltip>Reconnoiter the countryside. Garrison to provide defense.</Tooltip>
+    <Classes datatype="tokens">Village Defensive</Classes>
+    <Icon>structures/outpost.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_tower.xml</select>
+      <constructed>interface/complete/building/complete_tower.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>21.0</HeightOffset>
+  </StatusBars>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: template_structure_economic_mill.xml
===================================================================
--- template_structure_economic_mill.xml	(revision 9928)
+++ template_structure_economic_mill.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
-  <Identity>
-    <GenericName>Mill</GenericName>
-    <Tooltip>Dropsite for Wood, Stone, and Metal resources.</Tooltip>
-    <Classes datatype="tokens">Village</Classes>
-    <Icon>structures/mill.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>15.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Mill</Category>
     <Territory>all</Territory>
@@ -16,27 +15,26 @@
       <wood>100</wood>
     </Resources>
   </Cost>
-  <Health>
-    <Max>800</Max>
-  </Health>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>15.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="15.0" depth="15.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>800</Max>
+  </Health>
+  <Identity>
+    <GenericName>Mill</GenericName>
+    <Tooltip>Dropsite for Wood, Stone, and Metal resources.</Tooltip>
+    <Classes datatype="tokens">Village</Classes>
+    <Icon>structures/mill.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="13.0" depth="13.0"/>
   </Obstruction>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
+  <RallyPoint disable=""/>
+  <ResourceDropsite>
+    <Types>wood stone metal</Types>
+  </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_mill.xml</select>
@@ -44,8 +42,10 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <ResourceDropsite>
-    <Types>wood stone metal</Types>
-  </ResourceDropsite>
-  <RallyPoint disable=""/>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_fauna_breed.xml
===================================================================
--- template_unit_fauna_breed.xml	(revision 9928)
+++ template_unit_fauna_breed.xml	(working copy)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
-  <Identity>
-  </Identity>
   <Auras>
     <Infidelity>
       <Radius>20</Radius>
       <Time>0</Time>
     </Infidelity>
   </Auras>
+  <Identity>
+  </Identity>
 </Entity>
Index: template_unit_fauna_herd.xml
===================================================================
--- template_unit_fauna_herd.xml	(revision 9928)
+++ template_unit_fauna_herd.xml	(working copy)
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
+  <Auras>
+    <Infidelity>
+      <Radius>20</Radius>
+      <Time>0</Time>
+    </Infidelity>
+  </Auras>
   <Health>
     <DeathType>remain</DeathType>
   </Health>
@@ -8,10 +14,4 @@
     <Amount>100</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
-  <Auras>
-    <Infidelity>
-      <Radius>20</Radius>
-      <Time>0</Time>
-    </Infidelity>
-  </Auras>
 </Entity>
Index: template_unit_infantry_melee_swordsman.xml
===================================================================
--- template_unit_infantry_melee_swordsman.xml	(revision 9928)
+++ template_unit_infantry_melee_swordsman.xml	(working copy)
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>3.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>20.0</Hack>
+      <Pierce>0.0</Pierce>
+    </Melee>
+    <Charge>
+      <Hack>40.0</Hack>
+    </Charge>
+  </Attack>
+  <Cost>
+    <Resources>
+      <metal>50</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <GenericName>Infantry Swordsman</GenericName>
     <Rollover>Weapon is basically a developed sickle. Probably from the club, to the axe, to the sickle to the sword. It was the Romans who used them to combat the long range of the sarissa. Their spears were so long they had to use two hands to wield them. In a formation they were almost impossible to maneouvre. If flanked, they were easily cut down by a sword as demonstrated by the Romans at the battle of Cynoscephalae. Generally swordsmen were well armoured, had shields, and tended to be nobles. A good sword was an expensive weapon.</Rollover>
     <Tooltip>Bonused vs. Infantry Spearman and Infantry Javelinist.</Tooltip>
   </Identity>
-  <Cost>
-    <Resources>
-      <metal>50</metal>
-    </Resources>
-  </Cost>
   <Loot>
     <metal>5</metal>
   </Loot>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>3.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.9</WalkSpeed>
     <Run>
       <Speed>19.2</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>0.0</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>40.0</Hack>
-    </Charge>
-  </Attack>
   <Vision>
     <Range>48</Range>
   </Vision>
Index: template_unit_hero_infantry_javelinist.xml
===================================================================
--- template_unit_hero_infantry_javelinist.xml	(revision 9928)
+++ template_unit_hero_infantry_javelinist.xml	(working copy)
@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
-  <Identity>
-    <GenericName>Hero Infantry Javelinist</GenericName>
-    <Classes datatype="tokens">Hero Infantry Ranged</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
+  <Armour>
+    <Hack>8.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>40.0</Pierce>
+    </Ranged>
+  </Attack>
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
+  <Health>
+    <Max>350</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero Infantry Javelinist</GenericName>
+    <Classes datatype="tokens">Hero Infantry Ranged</Classes>
+  </Identity>
   <Loot>
     <xp>350</xp>
     <food>5</food>
@@ -20,18 +31,7 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <Health>
-    <Max>350</Max>
-    <RegenRate>0.2</RegenRate>
-  </Health>
-  <Armour>
-    <Hack>8.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>7.0</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Pierce>40.0</Pierce>
-    </Ranged>
-  </Attack>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
 </Entity>
Index: template_unit_champion_infantry_javelinist.xml
===================================================================
--- template_unit_champion_infantry_javelinist.xml	(revision 9928)
+++ template_unit_champion_infantry_javelinist.xml	(working copy)
@@ -1,32 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
-  <Identity>
-    <GenericName>Champion Infantry Skirmisher</GenericName>
-    <Classes datatype="tokens">Ranged</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>12</BuildTime>
-    <Resources>
-      <food>50</food>
-      <wood>80</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>120</Max>
-  </Health>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
-    <Run>
-      <Speed>17.5</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -39,9 +17,31 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <food>50</food>
+      <wood>80</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Infantry Skirmisher</GenericName>
+    <Classes datatype="tokens">Ranged</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>7.5</WalkSpeed>
+    <Run>
+      <Speed>17.5</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_hero_infantry_swordsman.xml
===================================================================
--- template_unit_hero_infantry_swordsman.xml	(revision 9928)
+++ template_unit_hero_infantry_swordsman.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
-  <Identity>
-    <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Hero Infantry Melee</Classes>
-  </Identity>
-  <Health>
-    <Max>400</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
-  <Stamina>
-    <Max>1500</Max>
-  </Stamina>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>12.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.1</WalkSpeed>
-    <Run>
-      <Speed>16.8</Speed>
-      <Range>600.0</Range>
-      <RangeMin>8.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>25.0</Hack>
@@ -39,13 +20,32 @@
       <MaxRange>5.0</MaxRange>
     </Charge>
   </Attack>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
+  <Health>
+    <Max>400</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry Melee</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/sword.xml</attack>
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
+  <Stamina>
+    <Max>1500</Max>
+  </Stamina>
+  <UnitMotion>
+    <WalkSpeed>6.1</WalkSpeed>
+    <Run>
+      <Speed>16.8</Speed>
+      <Range>600.0</Range>
+      <RangeMin>8.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
 </Entity>
Index: template_unit_hero_cavalry_spearman.xml
===================================================================
--- template_unit_hero_cavalry_spearman.xml	(revision 9928)
+++ template_unit_hero_cavalry_spearman.xml	(working copy)
@@ -1,9 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
-  <Identity>
-    <GenericName>Hero Cavalry Spearman</GenericName>
-    <Classes datatype="tokens">Hero Cavalry</Classes>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>14.0</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>20.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>30.0</Hack>
+      <Pierce>60.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
   <Cost>
     <Resources>
       <food>100</food>
@@ -12,6 +27,10 @@
       <metal>50</metal>
     </Resources>
   </Cost>
+  <Identity>
+    <GenericName>Hero Cavalry Spearman</GenericName>
+    <Classes datatype="tokens">Hero Cavalry</Classes>
+  </Identity>
   <Loot>
     <xp>500</xp>
     <food>10</food>
@@ -19,29 +38,10 @@
     <stone>0</stone>
     <metal>5</metal>
   </Loot>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>14.0</Pierce>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>24.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>30.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
-  </Attack>
 </Entity>
Index: template_gaia_flora_tree.xml
===================================================================
--- template_gaia_flora_tree.xml	(revision 9928)
+++ template_gaia_flora_tree.xml	(working copy)
@@ -9,10 +9,10 @@
     <Type>wood</Type>
     <Colour r="0" g="64" b="0"/>
   </Minimap>
-  <Selectable/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>200</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
+  <Selectable/>
 </Entity>
Index: template_unit_support_slave.xml
===================================================================
--- template_unit_support_slave.xml	(revision 9928)
+++ template_unit_support_slave.xml	(working copy)
@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
-  <Identity>
-    <GenericName>Slave</GenericName>
-    <Icon>units/global_slave.png</Icon>
-	<Tooltip>Econ unit with a finite life span.</Tooltip>
-  </Identity>
+  <Armour>
+    <Hack>2.0</Hack>
+    <Pierce>2.0</Pierce>
+    <Crush>2.0</Crush>
+  </Armour>
+  <Builder>
+    <Rate>0.5</Rate>
+    <Entities datatype="tokens">
+      structures/{civ}_house
+      structures/{civ}_mill
+      structures/{civ}_farmstead
+      structures/{civ}_field
+      structures/{civ}_corral
+      structures/{civ}_temple
+      structures/{civ}_market
+      structures/{civ}_civil_centre
+      structures/{civ}_barracks
+      structures/{civ}_dock
+      structures/{civ}_scout_tower
+      structures/{civ}_wall
+      structures/{civ}_wall_tower
+      structures/{civ}_wall_gate
+      structures/{civ}_fortress
+    </Entities>
+  </Builder>
   <Cost>
     <Population>0</Population>
     <BuildTime>20</BuildTime>
@@ -18,6 +38,11 @@
   <Health>
     <Healable>false</Healable>
   </Health>
+  <Identity>
+    <GenericName>Slave</GenericName>
+    <Icon>units/global_slave.png</Icon>
+	<Tooltip>Econ unit with a finite life span.</Tooltip>
+  </Identity>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -40,39 +65,6 @@
 	  <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
-  <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>2.0</Pierce>
-    <Crush>2.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>8.0</RangeMin>
-    </Run>
-  </UnitMotion>
-  <Builder>
-    <Rate>0.5</Rate>
-    <Entities datatype="tokens">
-      structures/{civ}_house
-      structures/{civ}_mill
-      structures/{civ}_farmstead
-      structures/{civ}_field
-      structures/{civ}_corral
-      structures/{civ}_temple
-      structures/{civ}_market
-      structures/{civ}_civil_centre
-      structures/{civ}_barracks
-      structures/{civ}_dock
-      structures/{civ}_scout_tower
-      structures/{civ}_wall
-      structures/{civ}_wall_tower
-      structures/{civ}_wall_gate
-      structures/{civ}_fortress
-    </Entities>
-  </Builder>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -91,4 +83,12 @@
       <trained>actor/singlesteps/steps_gravel.xml</trained>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+    <Run>
+      <Speed>15.0</Speed>
+      <Range>1000.0</Range>
+      <RangeMin>8.0</RangeMin>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_fauna_hunt_aggressive.xml
===================================================================
--- template_unit_fauna_hunt_aggressive.xml	(revision 9928)
+++ template_unit_fauna_hunt_aggressive.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
-  <Identity>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>aggressive</NaturalBehaviour>
-  </UnitAI>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
@@ -14,4 +9,9 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Identity>
+  </Identity>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
 </Entity>
Index: template_unit_mechanical_ship.xml
===================================================================
--- template_unit_mechanical_ship.xml	(revision 9928)
+++ template_unit_mechanical_ship.xml	(working copy)
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical">
-  <Identity>
-    <GenericName>Ship</GenericName>
-  </Identity>
-  <Position>
-    <Floating>true</Floating>
-  </Position>
   <Cost>
     <Population>1</Population>
     <BuildTime>20</BuildTime>
@@ -16,9 +10,28 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Decay>
+    <Inactive/>
+    <DelayTime>0.0</DelayTime>
+    <SinkRate>2.0</SinkRate>
+    <SinkAccel>7.0</SinkAccel>
+  </Decay>
+  <Footprint replace="">
+    <Square width="6.0" depth="30.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
     <Max>100</Max>
   </Health>
+  <Identity>
+    <GenericName>Ship</GenericName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="8.0"/>
+  </Obstruction>
+  <Position>
+    <Floating>true</Floating>
+  </Position>
   <ResourceGatherer>
     <MaxDistance>4.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -29,25 +42,6 @@
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
-  <Decay>
-    <Inactive/>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>2.0</SinkRate>
-    <SinkAccel>7.0</SinkAccel>
-  </Decay>
-  <UnitMotion>
-    <PassabilityClass>ship</PassabilityClass>
-  </UnitMotion>
-  <Footprint replace="">
-    <Square width="6.0" depth="30.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="8.0"/>
-  </Obstruction>
-  <Vision>
-    <Range>120</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <trained>actor/ship/ship_select.xml</trained>
@@ -57,4 +51,10 @@
       <order_gather>actor/ship/ship_move.xml</order_gather>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <PassabilityClass>ship</PassabilityClass>
+  </UnitMotion>
+  <Vision>
+    <Range>120</Range>
+  </Vision>
 </Entity>
Index: template_unit_champion_cavalry_javelinist.xml
===================================================================
--- template_unit_champion_cavalry_javelinist.xml	(revision 9928)
+++ template_unit_champion_cavalry_javelinist.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
-  <Identity>
-    <GenericName>Champion Cavalry Skirmisher</GenericName>
-    <Classes datatype="tokens">Ranged</Classes>
-  </Identity>
-  <Cost>
-    <Resources>
-      <food>100</food>
-      <wood>80</wood>
-    </Resources>
-  </Cost>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>10.1</WalkSpeed>
-    <Run>
-      <Speed>28.8</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -35,10 +17,20 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <Resources>
+      <food>100</food>
+      <wood>80</wood>
+    </Resources>
+  </Cost>
   <Footprint>
     <Circle radius="2.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <Identity>
+    <GenericName>Champion Cavalry Skirmisher</GenericName>
+    <Classes datatype="tokens">Ranged</Classes>
+  </Identity>
   <Obstruction>
     <Unit radius="1.0"/>
   </Obstruction>
@@ -48,4 +40,12 @@
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>10.1</WalkSpeed>
+    <Run>
+      <Speed>28.8</Speed>
+      <Range>1000.0</Range>
+      <RangeMin>10.0</RangeMin>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: gaia/special_treasure_food_jars.xml
===================================================================
--- gaia/special_treasure_food_jars.xml	(revision 9928)
+++ gaia/special_treasure_food_jars.xml	(working copy)
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="4.0"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="6.5" depth="6.5"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>treasure.food</Type>
@@ -13,11 +20,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/amphorae.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="4.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="6.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: gaia/special_treasure_pegasus.xml
===================================================================
--- gaia/special_treasure_pegasus.xml	(revision 9928)
+++ gaia/special_treasure_pegasus.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo_mineral">
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
@@ -13,8 +17,4 @@
   <VisualActor>
     <Actor>special/pegasus.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="2.0"/>
-    <Height>2.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_wolf_snow.xml
===================================================================
--- gaia/fauna_wolf_snow.xml	(revision 9928)
+++ gaia/fauna_wolf_snow.xml	(working copy)
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Snow Wolf</SpecificName>
-    <Icon>gaia/fauna_wolf_snow.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>fauna/wolf_snow.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
@@ -21,4 +9,16 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Footprint>
+    <Circle radius="1.0"/>
+    <Height>2.5</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Snow Wolf</SpecificName>
+    <Icon>gaia/fauna_wolf_snow.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/wolf_snow.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_camel.xml
===================================================================
--- gaia/fauna_camel.xml	(revision 9928)
+++ gaia/fauna_camel.xml	(working copy)
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Circle radius="1.75"/>
+    <Height>3.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Camel</SpecificName>
     <Icon>gaia/fauna_camel.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
@@ -16,13 +23,6 @@
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Footprint>
-    <Circle radius="1.75"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="1.5"/>
-  </Obstruction>
   <VisualActor>
     <Actor>fauna/camel.xml</Actor>
   </VisualActor>
Index: gaia/special_ruins.xml
===================================================================
--- gaia/special_ruins.xml	(revision 9928)
+++ gaia/special_ruins.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
+  <Footprint>
+    <Circle radius="3.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Ruins</GenericName>
@@ -13,8 +17,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>2.5</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_muskox.xml
===================================================================
--- gaia/fauna_muskox.xml	(revision 9928)
+++ gaia/fauna_muskox.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_passive">
+  <Footprint>
+    <Circle radius="1.5"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Muskox</SpecificName>
@@ -12,8 +16,4 @@
   <VisualActor>
     <Actor>fauna/muskox.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.5</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_giraffe.xml
===================================================================
--- gaia/fauna_giraffe.xml	(revision 9928)
+++ gaia/fauna_giraffe.xml	(working copy)
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Circle radius="2.75"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>150</Max>
+    <RegenRate>1</RegenRate>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Giraffe (Adult)</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
-  <Health>
-    <Max>150</Max>
-    <RegenRate>1</RegenRate>
-  </Health>
+  <Obstruction>
+    <Unit radius="2.0"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>350</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <WalkSpeed>4.0</WalkSpeed>
     <Run>
@@ -21,16 +31,6 @@
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <Footprint>
-    <Circle radius="2.75"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="2.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>fauna/giraffe_adult.xml</Actor>
   </VisualActor>
Index: gaia/fauna_rabbit.xml
===================================================================
--- gaia/fauna_rabbit.xml	(revision 9928)
+++ gaia/fauna_rabbit.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Circle radius="0.75"/>
+    <Height>1.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Rabbit</SpecificName>
@@ -9,14 +13,10 @@
     <Amount>50</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
+  <StatusBars>
+    <HeightOffset>3.0</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>fauna/rabbit1.xml</Actor>
   </VisualActor>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <Footprint>
-    <Circle radius="0.75"/>
-    <Height>1.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_elephant_african_bush.xml
===================================================================
--- gaia/fauna_elephant_african_bush.xml	(revision 9928)
+++ gaia/fauna_elephant_african_bush.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>African Bush Elephant</SpecificName>
-    <Icon>gaia/fauna_elephant_african_bush.png</Icon>
-  </Identity>
-  <Health>
-    <Max>300</Max>
-    <RegenRate>1</RegenRate>
-  </Health>
-  <ResourceSupply>
-    <Amount>800</Amount>
-    <Type>food.meat</Type>
-  </ResourceSupply>
-  <VisualActor>
-    <Actor>fauna/elephant_african_bush.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="3.65"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <Attack>
     <Melee>
       <Hack>25.0</Hack>
@@ -39,9 +21,27 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
-  <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Footprint>
+    <Circle radius="3.65"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Health>
+    <Max>300</Max>
+    <RegenRate>1</RegenRate>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>African Bush Elephant</SpecificName>
+    <Icon>gaia/fauna_elephant_african_bush.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <ResourceSupply>
+    <Amount>800</Amount>
+    <Type>food.meat</Type>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>fauna/elephant_african_bush.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_wolf.xml
===================================================================
--- gaia/fauna_wolf.xml	(revision 9928)
+++ gaia/fauna_wolf.xml	(working copy)
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Wolf</SpecificName>
-    <Icon>gaia/fauna_wolf.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>fauna/wolf.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
@@ -21,4 +9,16 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Footprint>
+    <Circle radius="1.0"/>
+    <Height>2.5</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Wolf</SpecificName>
+    <Icon>gaia/fauna_wolf.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/wolf.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_tiger.xml
===================================================================
--- gaia/fauna_tiger.xml	(revision 9928)
+++ gaia/fauna_tiger.xml	(working copy)
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Tiger</SpecificName>
-    <Icon>gaia/fauna_tiger.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>fauna/tiger.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="1.2"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
@@ -21,4 +9,16 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Footprint>
+    <Circle radius="1.2"/>
+    <Height>2.5</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Tiger</SpecificName>
+    <Icon>gaia/fauna_tiger.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/tiger.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_walrus.xml
===================================================================
--- gaia/fauna_walrus.xml	(revision 9928)
+++ gaia/fauna_walrus.xml	(working copy)
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>15.0</Hack>
+      <Pierce>10.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Footprint>
+    <Circle radius="2.3"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Walrus</SpecificName>
@@ -12,22 +30,4 @@
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="2.3"/>
-    <Height>2.5</Height>
-  </Footprint>
-  <Attack>
-    <Melee>
-      <Hack>15.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
 </Entity>
Index: gaia/flora_bush_berry.xml
===================================================================
--- gaia/flora_bush_berry.xml	(revision 9928)
+++ gaia/flora_bush_berry.xml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush_berry">
-  <Identity>
-    <Icon>gaia/flora_bush_berry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>props/flora/bush_berries_large.xml</Actor>
-  </VisualActor>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>1.0</Height>
   </Footprint>
+  <Identity>
+    <Icon>gaia/flora_bush_berry.png</Icon>
+  </Identity>
   <Obstruction>
     <Unit radius="2.0"/>
   </Obstruction>
+  <VisualActor>
+    <Actor>props/flora/bush_berries_large.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_elephant_african_infant.xml
===================================================================
--- gaia/fauna_elephant_african_infant.xml	(revision 9928)
+++ gaia/fauna_elephant_african_infant.xml	(working copy)
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Armour>
+    <Hack>2.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>2.0</Crush>
+  </Armour>
+  <Footprint>
+    <Circle radius="1.5"/>
+    <Height>1.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>African Elephant (Infant)</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>food.meat</Type>
@@ -12,16 +24,4 @@
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>1.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="1.5"/>
-  </Obstruction>
-  <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>2.0</Crush>
-  </Armour>
 </Entity>
Index: gaia/fauna_wildebeest.xml
===================================================================
--- gaia/fauna_wildebeest.xml	(revision 9928)
+++ gaia/fauna_wildebeest.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Circle radius="1.8"/>
+    <Height>1.8</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Wildebeest</SpecificName>
@@ -21,8 +25,4 @@
   <VisualActor>
     <Actor>fauna/wildebeest.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.8"/>
-    <Height>1.8</Height>
-  </Footprint>
 </Entity>
Index: gaia/flora_tree_apple.xml
===================================================================
--- gaia/flora_tree_apple.xml	(revision 9928)
+++ gaia/flora_tree_apple.xml	(working copy)
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
+  <Footprint>
+    <Circle radius="2.5"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Apple Tree</SpecificName>
     <History>Apple trees bear delicious fruit and are bountiful.</History>
     <Icon>gaia/flora_tree_apple.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="0.9"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.fruit</Type>
@@ -12,11 +19,4 @@
   <VisualActor>
     <Actor>flora/trees/apple_bloom.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="0.9"/>
-  </Obstruction>
 </Entity>
Index: gaia/fauna_goat.xml
===================================================================
--- gaia/fauna_goat.xml	(revision 9928)
+++ gaia/fauna_goat.xml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_passive">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Goat</SpecificName>
-    <Icon>gaia/fauna_goat.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <food>60</food>
     </Resources>
   </Cost>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Goat</SpecificName>
+    <Icon>gaia/fauna_goat.png</Icon>
+  </Identity>
   <ResourceSupply>
     <Amount>120</Amount>
     <Type>food.meat</Type>
Index: gaia/fauna_elephant_north_african.xml
===================================================================
--- gaia/fauna_elephant_north_african.xml	(revision 9928)
+++ gaia/fauna_elephant_north_african.xml	(working copy)
@@ -1,14 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>20.0</Hack>
+      <Pierce>20.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Footprint>
+    <Circle radius="2.6"/>
+    <Height>2.7</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+    <RegenRate>1</RegenRate>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>North African Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_north_african.png</Icon>
   </Identity>
-  <Health>
-    <Max>200</Max>
-    <RegenRate>1</RegenRate>
-  </Health>
+  <Obstruction>
+    <Unit radius="2.6"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>500</Amount>
     <Type>food.meat</Type>
@@ -16,25 +37,4 @@
   <VisualActor>
     <Actor>fauna/elephant_african_forest.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="2.6"/>
-    <Height>2.7</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="2.6"/>
-  </Obstruction>
-  <Attack>
-    <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
 </Entity>
Index: gaia/flora_tree_baobab.xml
===================================================================
--- gaia/flora_tree_baobab.xml	(revision 9928)
+++ gaia/flora_tree_baobab.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
+  <Footprint>
+    <Circle radius="2.5"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Baobab</SpecificName>
     <History>The baobab is the giant African tree that dots the landscape of the African savanna.</History>
@@ -12,8 +16,4 @@
   <VisualActor>
     <Actor>flora/trees/baobab.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>10.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/geology_stone_desert_small.xml
===================================================================
--- gaia/geology_stone_desert_small.xml	(revision 9928)
+++ gaia/geology_stone_desert_small.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo_rock">
+  <Footprint>
+    <Circle radius="4.25"/>
+    <Height>4.0</Height>
+  </Footprint>
   <Identity>
     <Icon>gaia/geology_stone_2.png</Icon>
   </Identity>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>geology/stonemine_desert_small.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="4.25"/>
-    <Height>4.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/special_treasure_metal.xml
===================================================================
--- gaia/special_treasure_metal.xml	(revision 9928)
+++ gaia/special_treasure_metal.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="1.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
@@ -13,8 +17,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_sheep.xml
===================================================================
--- gaia/fauna_sheep.xml	(revision 9928)
+++ gaia/fauna_sheep.xml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_passive">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Sheep</SpecificName>
-    <Icon>gaia/fauna_sheep.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Sheep</SpecificName>
+    <Icon>gaia/fauna_sheep.png</Icon>
+  </Identity>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
Index: gaia/special_treasure_food_crate.xml
===================================================================
--- gaia/special_treasure_food_crate.xml	(revision 9928)
+++ gaia/special_treasure_food_crate.xml	(working copy)
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint>
+    <Square width="2.0" depth="2.0"/>
+    <Height>12.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="1.75" depth="1.75"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>200</Amount>
     <Type>treasure.food</Type>
@@ -13,11 +20,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/crate_a.xml</Actor>
   </VisualActor>
-  <Footprint >
-    <Square width="2.0" depth="2.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="1.75" depth="1.75"/>
-  </Obstruction>
 </Entity>
Index: gaia/fauna_bear.xml
===================================================================
--- gaia/fauna_bear.xml	(revision 9928)
+++ gaia/fauna_bear.xml	(working copy)
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>10.0</Crush>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Footprint>
+    <Circle radius="1.3"/>
+    <Height>3.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Bear</SpecificName>
@@ -12,17 +25,4 @@
   <VisualActor>
     <Actor>fauna/bear.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.3"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Attack>
-    <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>10.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
 </Entity>
Index: gaia/special_treasure_golden_fleece.xml
===================================================================
--- gaia/special_treasure_golden_fleece.xml	(revision 9928)
+++ gaia/special_treasure_golden_fleece.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo_mineral">
+  <Footprint replace="">
+    <Circle radius="1.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
@@ -13,8 +17,4 @@
   <VisualActor>
     <Actor>special/golden_fleece.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
-  </Footprint>
 </Entity>
Index: gaia/flora_bush_grapes.xml
===================================================================
--- gaia/flora_bush_grapes.xml	(revision 9928)
+++ gaia/flora_bush_grapes.xml	(working copy)
@@ -7,10 +7,10 @@
     <History>Grapes can be eaten or used to make wine, which is a valuable consumable indeed.</History>
     <Icon>gaia/flora_bush_grapes.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>200</Amount>
+  </ResourceSupply>
   <VisualActor>
     <Actor>props/flora/forage_grapes.xml</Actor>
   </VisualActor>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
 </Entity>
Index: gaia/fauna_lioness.xml
===================================================================
--- gaia/fauna_lioness.xml	(revision 9928)
+++ gaia/fauna_lioness.xml	(working copy)
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Lion</SpecificName>
-    <Icon>gaia/fauna_lion.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>fauna/lioness.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="2.0"/>
-    <Height>1.5</Height>
-  </Footprint>
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
@@ -21,4 +9,16 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>1.5</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Lion</SpecificName>
+    <Icon>gaia/fauna_lion.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/lioness.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/special_treasure_food_bin.xml
===================================================================
--- gaia/special_treasure_food_bin.xml	(revision 9928)
+++ gaia/special_treasure_food_bin.xml	(working copy)
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint>
+    <Square width="2.5" depth="3.5"/>
+    <Height>12.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="2.0" depth="3.0"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>treasure.food</Type>
@@ -13,11 +20,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/produce_bin_a.xml</Actor>
   </VisualActor>
-  <Footprint >
-    <Square width="2.5" depth="3.5"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="2.0" depth="3.0"/>
-  </Obstruction>
 </Entity>
Index: gaia/flora_bush_temperate.xml
===================================================================
--- gaia/flora_bush_temperate.xml	(revision 9928)
+++ gaia/flora_bush_temperate.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
+  <Footprint>
+    <Circle radius="3.0"/>
+    <Height>3.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Deciduous Bush</SpecificName>
     <History>A deciduous bush commonly found in temperate forests and wild fields.</History>
@@ -11,8 +15,4 @@
   <VisualActor>
     <Actor>props/flora/bush_tempe_a.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_boar.xml
===================================================================
--- gaia/fauna_boar.xml	(revision 9928)
+++ gaia/fauna_boar.xml	(working copy)
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
+  <Attack>
+    <Melee>
+      <Hack>8.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Footprint>
+    <Circle radius="1.0"/>
+    <Height>3.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Boar</SpecificName>
@@ -9,23 +22,10 @@
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
+  <StatusBars>
+    <HeightOffset>5.0</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>fauna/boar.xml</Actor>
   </VisualActor>
-  <StatusBars>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <Footprint>
-    <Circle radius="1.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Attack>
-    <Melee>
-      <Hack>8.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
 </Entity>
Index: gaia/special_treasure_stone.xml
===================================================================
--- gaia/special_treasure_stone.xml	(revision 9928)
+++ gaia/special_treasure_stone.xml	(working copy)
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="4.0"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Stone Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="6.5" depth="6.5"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>treasure.stone</Type>
@@ -13,11 +20,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/stone_pile.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="4.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="6.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: gaia/flora_tree_cretan_date_palm_short.xml
===================================================================
--- gaia/flora_tree_cretan_date_palm_short.xml	(revision 9928)
+++ gaia/flora_tree_cretan_date_palm_short.xml	(working copy)
@@ -5,11 +5,11 @@
     <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
     <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
   </Identity>
-  <VisualActor>
-    <Actor>flora/trees/palm_cretan_date_short.xml</Actor>
-  </VisualActor>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
+  <VisualActor>
+    <Actor>flora/trees/palm_cretan_date_short.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_elephant.xml
===================================================================
--- gaia/fauna_elephant.xml	(revision 9928)
+++ gaia/fauna_elephant.xml	(working copy)
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
+  <Footprint>
+    <Circle radius="2.5"/>
+    <Height>3.5</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+    <RegenRate>1</RegenRate>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Elephant</SpecificName>
     <Icon>gaia/fauna_elephant.png</Icon>
   </Identity>
-  <Health>
-    <Max>200</Max>
-    <RegenRate>1</RegenRate>
-  </Health>
   <ResourceSupply>
     <Amount>500</Amount>
     <Type>food.meat</Type>
@@ -16,8 +20,4 @@
   <VisualActor>
     <Actor>fauna/elephant.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>3.5</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_lion.xml
===================================================================
--- gaia/fauna_lion.xml	(revision 9928)
+++ gaia/fauna_lion.xml	(working copy)
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Lion</SpecificName>
-    <Icon>gaia/fauna_lion.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>fauna/lion.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="2.0"/>
-    <Height>1.5</Height>
-  </Footprint>
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
@@ -21,4 +9,16 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>1.5</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Lion</SpecificName>
+    <Icon>gaia/fauna_lion.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/lion.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_giraffe_infant.xml
===================================================================
--- gaia/fauna_giraffe_infant.xml	(revision 9928)
+++ gaia/fauna_giraffe_infant.xml	(working copy)
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Giraffe (Juvenile)</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
+  <StatusBars>
+    <HeightOffset>7.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <WalkSpeed>4.0</WalkSpeed>
     <Run>
@@ -17,16 +27,6 @@
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
-  <StatusBars>
-    <HeightOffset>7.0</HeightOffset>
-  </StatusBars>
-  <Footprint>
-    <Circle radius="2.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="1.5"/>
-  </Obstruction>
   <VisualActor>
     <Actor>fauna/giraffe_baby.xml</Actor>
   </VisualActor>
Index: gaia/geology_stone_savanna_small.xml
===================================================================
--- gaia/geology_stone_savanna_small.xml	(revision 9928)
+++ gaia/geology_stone_savanna_small.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo_rock">
+  <Footprint>
+    <Circle radius="4.25"/>
+    <Height>4.0</Height>
+  </Footprint>
   <Identity>
     <Icon>gaia/geology_stone_2.png</Icon>
   </Identity>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>geology/stonemine_savanna_small.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="4.25"/>
-    <Height>4.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_chicken.xml
===================================================================
--- gaia/fauna_chicken.xml	(revision 9928)
+++ gaia/fauna_chicken.xml	(working copy)
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_passive">
+  <Footprint>
+    <Circle radius="0.75"/>
+    <Height>1.5</Height>
+  </Footprint>
+  <Health>
+    <Max>5</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Chicken</SpecificName>
@@ -9,19 +16,15 @@
     <Amount>40</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
-  <VisualActor>
-    <Actor>fauna/chicken.xml</Actor>
-  </VisualActor>
-  <Health>
-    <Max>5</Max>
-  </Health>
+  <Sound>
+    <SoundGroups>
+      <panic>actor/fauna/animal/chickens.xml</panic>
+      <select>actor/fauna/animal/chickens.xml</select>
+    </SoundGroups>
+  </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Circle radius="0.75"/>
-    <Height>1.5</Height>
-  </Footprint>
   <UnitAI>
     <RoamDistance>4.0</RoamDistance>
     <FleeDistance>12.0</FleeDistance>
@@ -36,10 +39,7 @@
       <Speed>6.0</Speed>
     </Run>
   </UnitMotion>
-  <Sound>
-    <SoundGroups>
-      <panic>actor/fauna/animal/chickens.xml</panic>
-      <select>actor/fauna/animal/chickens.xml</select>
-    </SoundGroups>
-  </Sound>
+  <VisualActor>
+    <Actor>fauna/chicken.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/special_treasure_wood.xml
===================================================================
--- gaia/special_treasure_wood.xml	(revision 9928)
+++ gaia/special_treasure_wood.xml	(working copy)
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint>
+    <Square width="4.0" depth="7.0"/>
+    <Height>12.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Wood Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="3.5" depth="6.5"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>treasure.wood</Type>
@@ -13,11 +20,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/wood_pile.xml</Actor>
   </VisualActor>
-  <Footprint >
-    <Square width="4.0" depth="7.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="3.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: gaia/fauna_whale_humpback.xml
===================================================================
--- gaia/fauna_whale_humpback.xml	(revision 9928)
+++ gaia/fauna_whale_humpback.xml	(working copy)
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
+  <Footprint>
+    <Circle radius="5.0"/>
+    <Height>2.5</Height>
+  </Footprint>
+  <Health>
+    <DeathType>corpse</DeathType>
+    <Max>500</Max>
+    <RegenRate>1</RegenRate>
+    <Healable>false</Healable>
+    <Repairable>false</Repairable>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Whale</GenericName>
@@ -7,27 +18,6 @@
 	<Tooltip>Collect food from this bountiful oceanic resource.</Tooltip>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
-  <VisualActor>
-    <Actor>fauna/whale.xml</Actor>
-  </VisualActor>
-  <Health>
-    <DeathType>corpse</DeathType>
-    <Max>500</Max>
-    <RegenRate>1</RegenRate>
-    <Healable>false</Healable>
-    <Repairable>false</Repairable>
-  </Health>
-  <UnitMotion>
-    <PassabilityClass>ship</PassabilityClass>
-    <WalkSpeed>2.0</WalkSpeed>
-    <Run>
-      <Speed>6.0</Speed>
-    </Run>
-  </UnitMotion>
-  <Footprint>
-    <Circle radius="5.0"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Obstruction>
     <Unit radius="0.1"/>
   </Obstruction>
@@ -35,6 +25,11 @@
 	<Altitude>-4.0</Altitude>
 	<Floating>true</Floating>
   </Position>
+  <ResourceSupply>
+    <KillBeforeGather>true</KillBeforeGather>
+    <Amount>2000</Amount>
+    <Type>food.fish</Type>
+  </ResourceSupply>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>20.0</RoamDistance>
@@ -44,9 +39,14 @@
     <FeedTimeMin>1000</FeedTimeMin>
     <FeedTimeMax>2000</FeedTimeMax>
   </UnitAI>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>2000</Amount>
-    <Type>food.fish</Type>
-  </ResourceSupply>
+  <UnitMotion>
+    <PassabilityClass>ship</PassabilityClass>
+    <WalkSpeed>2.0</WalkSpeed>
+    <Run>
+      <Speed>6.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>fauna/whale.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/fauna_elephant_asian.xml
===================================================================
--- gaia/fauna_elephant_asian.xml	(revision 9928)
+++ gaia/fauna_elephant_asian.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Asian Elephant</SpecificName>
-    <Icon>gaia/fauna_elephant_african_bush.png</Icon>
-  </Identity>
-  <Health>
-    <Max>250</Max>
-    <RegenRate>1</RegenRate>
-  </Health>
-  <ResourceSupply>
-    <Amount>650</Amount>
-    <Type>food.meat</Type>
-  </ResourceSupply>
-  <VisualActor>
-    <Actor>fauna/elephant_asian.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="2.8"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="2.7"/>
-  </Obstruction>
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <Attack>
     <Melee>
       <Hack>22.0</Hack>
@@ -39,9 +21,27 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
-  <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Footprint>
+    <Circle radius="2.8"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Health>
+    <Max>250</Max>
+    <RegenRate>1</RegenRate>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Asian Elephant</SpecificName>
+    <Icon>gaia/fauna_elephant_african_bush.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Unit radius="2.7"/>
+  </Obstruction>
+  <ResourceSupply>
+    <Amount>650</Amount>
+    <Type>food.meat</Type>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>fauna/elephant_asian.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/special_treasure_food_barrel.xml
===================================================================
--- gaia/special_treasure_food_barrel.xml	(revision 9928)
+++ gaia/special_treasure_food_barrel.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="1.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
@@ -13,8 +17,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
-  </Footprint>
 </Entity>
Index: gaia/flora_tree_cretan_date_palm_patch.xml
===================================================================
--- gaia/flora_tree_cretan_date_palm_patch.xml	(revision 9928)
+++ gaia/flora_tree_cretan_date_palm_patch.xml	(working copy)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
+  <Footprint>
+    <Circle radius="2.5"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Cretan Date Palm</SpecificName>
     <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
     <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
   </Identity>
-  <VisualActor>
-    <Actor>flora/trees/palm_cretan_date_patch.xml</Actor>
-  </VisualActor>
+  <Obstruction>
+    <Unit radius="2.25"/>
+  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="2.25"/>
-  </Obstruction>
+  <VisualActor>
+    <Actor>flora/trees/palm_cretan_date_patch.xml</Actor>
+  </VisualActor>
 </Entity>
Index: gaia/flora_tree_fig.xml
===================================================================
--- gaia/flora_tree_fig.xml	(revision 9928)
+++ gaia/flora_tree_fig.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
+  <Footprint>
+    <Circle radius="3.5"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Fig</SpecificName>
     <History>The Common Fig is widely grown for its edible fruit throughout its natural range in the Mediterranean region, North Africa, Persia, and northern India.</History>
@@ -12,8 +16,4 @@
   <VisualActor>
     <Actor>flora/trees/fig.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="3.5"/>
-    <Height>10.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/flora_bush_badlands.xml
===================================================================
--- gaia/flora_bush_badlands.xml	(revision 9928)
+++ gaia/flora_bush_badlands.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
+  <Footprint>
+    <Circle radius="3.0"/>
+    <Height>3.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Hardy Bush</SpecificName>
     <History>A bush commonly found in dry flatlands and rocky crags.</History>
@@ -11,8 +15,4 @@
   <VisualActor>
     <Actor>props/flora/bush_tempe_a.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
-  </Footprint>
 </Entity>
Index: gaia/fauna_zebra.xml
===================================================================
--- gaia/fauna_zebra.xml	(revision 9928)
+++ gaia/fauna_zebra.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Circle radius="1.8"/>
+    <Height>1.8</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Zebra</SpecificName>
@@ -20,8 +24,4 @@
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.8"/>
-    <Height>1.8</Height>
-  </Footprint>
 </Entity>
Index: template_structure_resource.xml
===================================================================
--- template_structure_resource.xml	(revision 9928)
+++ template_structure_resource.xml	(working copy)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <BuildRestrictions>
+    <Category>Resource</Category>
+  </BuildRestrictions>
   <Identity>
     <GenericName>Resource Structure</GenericName>
   </Identity>
-  <BuildRestrictions>
-    <Category>Resource</Category>
-  </BuildRestrictions>
   <Vision>
     <Range>4</Range>
   </Vision>
Index: template_gaia_flora_bush_berry.xml
===================================================================
--- template_gaia_flora_bush_berry.xml	(revision 9928)
+++ template_gaia_flora_bush_berry.xml	(working copy)
@@ -11,10 +11,10 @@
     <Type>food</Type>
     <Colour r="205" g="115" b="16"/>
   </Minimap>
-  <Selectable/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>120</Amount>
     <Type>food.fruit</Type>
   </ResourceSupply>
+  <Selectable/>
 </Entity>
Index: template_unit_fauna_wild_violent.xml
===================================================================
--- template_unit_fauna_wild_violent.xml	(revision 9928)
+++ template_unit_fauna_wild_violent.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
-  <Identity>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </UnitAI>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
@@ -14,4 +9,9 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Identity>
+  </Identity>
+  <UnitAI>
+    <NaturalBehaviour>violent</NaturalBehaviour>
+  </UnitAI>
 </Entity>
Index: template_structure_resource_corral.xml
===================================================================
--- template_structure_resource_corral.xml	(revision 9928)
+++ template_structure_resource_corral.xml	(working copy)
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
-  <Identity>
-    <GenericName>Corral</GenericName>
-    <Tooltip>Raise herd animals for Food.</Tooltip>
-    <Classes datatype="tokens">Village</Classes>
-    <Icon>structures/corral.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
-  <ResourceSupply>
-    <KillBeforeGather>false</KillBeforeGather>
-    <Amount>200</Amount>
-    <Type>food.milk</Type>
-  </ResourceSupply>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x4.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="9.5" depth="19.75"/>
     <Height>5.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Animal</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Corral</GenericName>
+    <Tooltip>Raise herd animals for Food.</Tooltip>
+    <Classes datatype="tokens">Village</Classes>
+    <Icon>structures/corral.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="9.5" depth="19.75"/>
   </Obstruction>
-  <Vision>
-    <Range>28</Range>
-  </Vision>
+  <ResourceSupply>
+    <KillBeforeGather>false</KillBeforeGather>
+    <Amount>200</Amount>
+    <Type>food.milk</Type>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_corral.xml</select>
@@ -45,10 +45,10 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <GarrisonHolder>
-    <Max>10</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Animal</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
+  <Vision>
+    <Range>28</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_2x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_infantry_ranged.xml
===================================================================
--- template_unit_infantry_ranged.xml	(revision 9928)
+++ template_unit_infantry_ranged.xml	(working copy)
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
-  <Identity>
-    <GenericName>Ranged</GenericName>
-    <Classes datatype="tokens">Ranged</Classes>
-  </Identity>
-  <Health>
-    <Max>90</Max>
-    <RegenRate>0.2</RegenRate>
-  </Health>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -20,6 +12,14 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Health>
+    <Max>90</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Ranged</GenericName>
+    <Classes datatype="tokens">Ranged</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
Index: template_unit_hero_infantry_pikeman.xml
===================================================================
--- template_unit_hero_infantry_pikeman.xml	(revision 9928)
+++ template_unit_hero_infantry_pikeman.xml	(working copy)
@@ -1,15 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
-  <Identity>
-    <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Hero Infantry Melee</Classes>
-  </Identity>
+  <Armour>
+    <Hack>12.0</Hack>
+    <Pierce>11.0</Pierce>
+    <Crush>11.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>12.0</Hack>
+      <Pierce>27.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>7.0</MaxRange>
+    </Melee>
+    <Charge>
+      <Hack>18.0</Hack>
+      <Pierce>40.0</Pierce>
+      <MaxRange>7.0</MaxRange>
+    </Charge>
+  </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry Melee</Classes>
+  </Identity>
   <Loot>
     <wood>10</wood>
     <metal>10</metal>
@@ -17,28 +35,10 @@
   <Stamina>
     <Max>1200</Max>
   </Stamina>
-  <Armour>
-    <Hack>12.0</Hack>
-    <Pierce>11.0</Pierce>
-    <Crush>11.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>4.5</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>12.0</Hack>
-      <Pierce>27.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-    <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>40.0</Pierce>
-      <MaxRange>7.0</MaxRange>
-    </Charge>
-  </Attack>
 </Entity>
Index: template_unit_mechanical_siege_ballista.xml
===================================================================
--- template_unit_mechanical_siege_ballista.xml	(revision 9928)
+++ template_unit_mechanical_siege_ballista.xml	(working copy)
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
-  <Identity>
-    <GenericName>Siege Ballista</GenericName>
-    <Tooltip>Bonused vs. Infantry and Cavalry units.</Tooltip>
-  </Identity>
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>2.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>100.0</Pierce>
+      <Crush>25.0</Crush>
+      <MaxRange>60</MaxRange>
+      <MinRange>8.0</MinRange>
+      <ProjectileSpeed>50.0</ProjectileSpeed>
+      <PrepareTime>5000</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+    </Ranged>
+  </Attack>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
@@ -12,6 +25,13 @@
     </Resources>
 	<Population>2</Population>
   </Cost>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Siege Ballista</GenericName>
+    <Tooltip>Bonused vs. Infantry and Cavalry units.</Tooltip>
+  </Identity>
   <Loot>
     <xp>200</xp>
     <food>0</food>
@@ -19,38 +39,18 @@
     <stone>0</stone>
     <metal>10</metal>
   </Loot>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>2.0</Crush>
-  </Armour>
+  <Sound>
+    <SoundGroups>
+      <select>attack/siege/siege_select.xml</select>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>100.0</Pierce>
-      <Crush>25.0</Crush>
-      <MaxRange>60</MaxRange>
-      <MinRange>8.0</MinRange>
-      <ProjectileSpeed>50.0</ProjectileSpeed>
-      <PrepareTime>5000</PrepareTime>
-      <RepeatTime>3000</RepeatTime>
-    </Ranged>
-  </Attack>
   <Vision>
     <Range>80</Range>
   </Vision>
-  <Sound>
-    <SoundGroups>
-      <select>attack/siege/siege_select.xml</select>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: template_unit_champion_cavalry_swordsman.xml
===================================================================
--- template_unit_champion_cavalry_swordsman.xml	(revision 9928)
+++ template_unit_champion_cavalry_swordsman.xml	(working copy)
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
-  <Identity>
-    <GenericName>Champion Cavalry Spearman</GenericName>
-    <Classes datatype="tokens">Melee</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>16</BuildTime>
-    <Resources>
-      <wood>80</wood>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>160</Max>
-  </Health>
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>11.0</Pierce>
@@ -34,4 +21,17 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <BuildTime>16</BuildTime>
+    <Resources>
+      <wood>80</wood>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>160</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Cavalry Spearman</GenericName>
+    <Classes datatype="tokens">Melee</Classes>
+  </Identity>
 </Entity>
Index: template_unit_mechanical_ship_fishing.xml
===================================================================
--- template_unit_mechanical_ship_fishing.xml	(revision 9928)
+++ template_unit_mechanical_ship_fishing.xml	(working copy)
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+    <Height>6.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>1</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
   <Identity>
     <GenericName>Fishing Boat</GenericName>
     <Tooltip>Fish the waters for Food. Garrison a support or infantry unit inside to boost fishing rate.</Tooltip>
   </Identity>
+  <Obstruction>
+    <Unit radius="4.0"/>
+  </Obstruction>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -15,22 +33,4 @@
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
   </UnitMotion>
-  <Footprint>
-    <Square width="6.0" depth="12.0"/>
-    <Height>6.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="4.0"/>
-  </Obstruction>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
-  <GarrisonHolder>
-    <Max>1</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
 </Entity>
Index: template_unit_mechanical_siege_tower.xml
===================================================================
--- template_unit_mechanical_siege_tower.xml	(revision 9928)
+++ template_unit_mechanical_siege_tower.xml	(working copy)
@@ -1,31 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
-  <Identity>
-    <GenericName>Siege Tower</GenericName>
-    <Tooltip>A mobile missile platform.</Tooltip>
-  </Identity>
-  <StatusBars>
-    <BarWidth>4.0</BarWidth>
-    <BarHeight>0.666</BarHeight>
-    <HeightOffset>10.0</HeightOffset>
-  </StatusBars>
-  <Cost>
-    <Population>5</Population>
-  </Cost>
-  <Health>
-    <Max>800</Max>
-  </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>3.5</WalkSpeed>
-    <Run>
-      <Speed>8.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -38,9 +17,26 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
-  <Vision>
-    <Range>85</Range>
-  </Vision>
+  <BuildingAI>
+    <DefaultArrowCount>1</DefaultArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+  </BuildingAI>
+  <Cost>
+    <Population>5</Population>
+  </Cost>
+  <GarrisonHolder>
+    <Max>20</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>800</Max>
+  </Health>
+  <Identity>
+    <GenericName>Siege Tower</GenericName>
+    <Tooltip>A mobile missile platform.</Tooltip>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
@@ -49,14 +45,18 @@
 	  <trained>attack/siege/ram_move.xml</trained>
     </SoundGroups>
   </Sound>
-  <GarrisonHolder>
-    <Max>20</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-  </BuildingAI>
+  <StatusBars>
+    <BarWidth>4.0</BarWidth>
+    <BarHeight>0.666</BarHeight>
+    <HeightOffset>10.0</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <WalkSpeed>3.5</WalkSpeed>
+    <Run>
+      <Speed>8.0</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>85</Range>
+  </Vision>
 </Entity>
Index: template_structure_gaia_settlement.xml
===================================================================
--- template_structure_gaia_settlement.xml	(revision 9928)
+++ template_structure_gaia_settlement.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_entity_full">
+  <Footprint>
+    <Square width="32.0" depth="32.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Settlement</GenericName>
@@ -7,14 +11,9 @@
     <Tooltip>Build a Civic Centre at this location to expand your territory.</Tooltip>
     <Icon>gaia/special_settlement.png</Icon>
   </Identity>
-  <Settlement/>
   <Minimap>
     <Type>settlement</Type>
   </Minimap>
-  <Footprint>
-    <Square width="32.0" depth="32.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="32.0" depth="32.0"/>
     <Active>true</Active>
@@ -25,6 +24,7 @@
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
   </Obstruction>
+  <Settlement/>
   <Vision>
     <Range>0</Range>
     <RetainInFog>true</RetainInFog>
Index: special/actor.xml
===================================================================
--- special/actor.xml	(revision 9928)
+++ special/actor.xml	(working copy)
@@ -6,14 +6,14 @@
     <Floating>false</Floating>
     <TurnRate>6.0</TurnRate>
   </Position>
+  <Vision>
+    <Range>0</Range>
+    <RetainInFog>true</RetainInFog>
+    <AlwaysVisible>false</AlwaysVisible>
+  </Vision>
   <VisualActor>
     <Actor>(should be overridden)</Actor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
   </VisualActor>
-  <Vision>
-    <Range>0</Range>
-    <RetainInFog>true</RetainInFog>
-    <AlwaysVisible>false</AlwaysVisible>
-  </Vision>
 </Entity>
Index: special/player.xml
===================================================================
--- special/player.xml	(revision 9928)
+++ special/player.xml	(working copy)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
-  <Player/>
-  <StatisticsTracker/>
   <BuildLimits>
   	<LimitMultiplier>1.0</LimitMultiplier>
   	<Limits>
   	</Limits>
   </BuildLimits>
+  <Player/>
+  <StatisticsTracker/>
 </Entity>
Index: special/territory_block.xml
===================================================================
--- special/territory_block.xml	(revision 9928)
+++ special/territory_block.xml	(working copy)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
-  <Position>
-    <Altitude>0</Altitude>
-    <Anchor>upright</Anchor>
-    <Floating>false</Floating>
-    <TurnRate>6.0</TurnRate>
-  </Position>
   <Footprint>
     <Square width="64" depth="8"/>
     <Height>9.0</Height>
   </Footprint>
-  <Selectable/>
   <Obstruction>
     <Static width="64" depth="8"/>
     <Active>true</Active>
@@ -22,14 +15,21 @@
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
   </Obstruction>
   <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <TurnRate>6.0</TurnRate>
+  </Position>
+  <Selectable/>
+  <TerritoryInfluence>
+    <OverrideCost>64</OverrideCost>
+    <Weight>0</Weight>
+    <Radius>0</Radius>
+  </TerritoryInfluence>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
     <Actor>structures/hellenes/wall_med.xml</Actor>
   </VisualActor>
-  <TerritoryInfluence>
-    <OverrideCost>64</OverrideCost>
-    <Weight>0</Weight>
-    <Radius>0</Radius>
-  </TerritoryInfluence>
 </Entity>
Index: special/formation.xml
===================================================================
--- special/formation.xml	(revision 9928)
+++ special/formation.xml	(working copy)
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
+  <!--
+  <VisualActor>
+    <Actor>props/special/common/waypoint_flag.xml</Actor>
+  </VisualActor>
+  -->
+  <Formation/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
     <Floating>false</Floating>
     <TurnRate>6.0</TurnRate>
   </Position>
-  <Formation/>
   <UnitAI>
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
@@ -18,9 +23,4 @@
     <PassabilityClass>default</PassabilityClass>
     <CostClass>default</CostClass>
   </UnitMotion>
-  <!--
-  <VisualActor>
-    <Actor>props/special/common/waypoint_flag.xml</Actor>
-  </VisualActor>
-  -->
 </Entity>
Index: special/territory_pull.xml
===================================================================
--- special/territory_pull.xml	(revision 9928)
+++ special/territory_pull.xml	(working copy)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
-  <Position>
-    <Altitude>0</Altitude>
-    <Anchor>upright</Anchor>
-    <Floating>false</Floating>
-    <TurnRate>6.0</TurnRate>
-  </Position>
   <Footprint>
     <Square width="64" depth="8"/>
     <Height>9.0</Height>
   </Footprint>
-  <Selectable/>
   <Obstruction>
     <Static width="64" depth="8"/>
     <Active>true</Active>
@@ -22,14 +15,21 @@
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
   </Obstruction>
   <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <TurnRate>6.0</TurnRate>
+  </Position>
+  <Selectable/>
+  <TerritoryInfluence>
+    <OverrideCost>0</OverrideCost>
+    <Weight>0</Weight>
+    <Radius>0</Radius>
+  </TerritoryInfluence>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
     <Actor>structures/hellenes/wall_med.xml</Actor>
   </VisualActor>
-  <TerritoryInfluence>
-    <OverrideCost>0</OverrideCost>
-    <Weight>0</Weight>
-    <Radius>0</Radius>
-  </TerritoryInfluence>
 </Entity>
Index: template_unit_fauna_hunt.xml
===================================================================
--- template_unit_fauna_hunt.xml	(revision 9928)
+++ template_unit_fauna_hunt.xml	(working copy)
@@ -9,4 +9,4 @@
     <Amount>100</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
-</Entity>
\ No newline at end of file
+</Entity>
Index: structures/hele_wall_med.xml
===================================================================
--- structures/hele_wall_med.xml	(revision 9928)
+++ structures/hele_wall_med.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Teichos</SpecificName>
-    <History>All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures.</History>
-  </Identity>
   <Cost>
     <BuildTime>22</BuildTime>
   </Cost>
-  <Health>
-    <Max>2200</Max>
-  </Health>
   <Footprint>
     <Square width="25.0" depth="6.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>2200</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Teichos</SpecificName>
+    <History>All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures.</History>
+  </Identity>
   <Obstruction>
     <Static width="24.0" depth="6.0"/>
   </Obstruction>
Index: structures/hele_temple.xml
===================================================================
--- structures/hele_temple.xml	(revision 9928)
+++ structures/hele_temple.xml	(working copy)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Naos</SpecificName>
-    <History>The Hellenes built marvelous temples in order to honour their polytheistic pantheon. While all gods were venerated, a specific patron deity was supposed to watch over each polis.</History>
-  </Identity>
   <Cost>
     <BuildTime>220</BuildTime>
   </Cost>
+  <Footprint>
+    <Square width="19.0" depth="31.5"/>
+    <Height>12.0</Height>
+  </Footprint>
   <Health>
     <Max>2200</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Naos</SpecificName>
+    <History>The Hellenes built marvelous temples in order to honour their polytheistic pantheon. While all gods were venerated, a specific patron deity was supposed to watch over each polis.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="17.5" depth="30.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/temple_new.xml</Actor>
     <FoundationActor>props/special/eyecandy/greek_temple_unfinished.xml</FoundationActor>
   </VisualActor>
-  <Footprint>
-    <Square width="19.0" depth="31.5"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="17.5" depth="30.0"/>
-  </Obstruction>
 </Entity>
Index: structures/celt_scout_tower.xml
===================================================================
--- structures/celt_scout_tower.xml	(revision 9928)
+++ structures/celt_scout_tower.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_scout_tower">
+  <Footprint>
+    <Square width="8.0" depth="8.0"/>
+    <Height>15.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Tyrau</SpecificName>
     <History>*I could not find any evidence of a celtic tower, but I'm giving them one for gameplay reasons.*</History>
   </Identity>
-  <Footprint>
-    <Square width="8.0" depth="8.0"/>
-    <Height>15.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="7.5" depth="7.5"/>
   </Obstruction>
Index: structures/iber_sb1.xml
===================================================================
--- structures/iber_sb1.xml	(revision 9928)
+++ structures/iber_sb1.xml	(working copy)
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Monumento Venerado</SpecificName>
-    <Icon>structures/monument.png</Icon>
-    <Tooltip>All units within LOS of this monument will fight harder. Build limit: 1 per territory.</Tooltip>
-    <History>The Iberians were a religious people who built small monuments to their various gods. These monuments could also serve as family tombs.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/sb_1.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="10.0" depth="10.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="10.0" depth="10.0"/>
-  </Obstruction>
   <Cost>
     <BuildTime>120</BuildTime>
     <Resources>
@@ -27,9 +9,23 @@
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="10.0" depth="10.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
     <Max>1200</Max>
   </Health>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Monumento Venerado</SpecificName>
+    <Icon>structures/monument.png</Icon>
+    <Tooltip>All units within LOS of this monument will fight harder. Build limit: 1 per territory.</Tooltip>
+    <History>The Iberians were a religious people who built small monuments to their various gods. These monuments could also serve as family tombs.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="10.0"/>
+  </Obstruction>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_iber_monument.xml</select>
@@ -37,4 +33,8 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <VisualActor>
+    <Actor>structures/iberians/sb_1.xml</Actor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/celt_dock.xml
===================================================================
--- structures/celt_dock.xml	(revision 9928)
+++ structures/celt_dock.xml	(working copy)
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Crannog</SpecificName>
-    <History>A crannog (or crannoge) is the name given in Scotland and Ireland to an artificial island or natural island, used for a settlement. The name can also be used to refer to wooden platforms erected on shallow loch floors, although understandably few remains of this sort have been found. The choice of an island as a home is thought to have been for defence as well as the availability of food in the form of fish nearby.</History>
-  </Identity>
   <Cost>
     <PopulationBonus>2</PopulationBonus>
   </Cost>
-  <VisualActor>
-    <Actor>structures/celts/dock_new.xml</Actor>
-  </VisualActor>
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Crannog</SpecificName>
+    <History>A crannog (or crannoge) is the name given in Scotland and Ireland to an artificial island or natural island, used for a settlement. The name can also be used to refer to wooden platforms erected on shallow loch floors, although understandably few remains of this sort have been found. The choice of an island as a home is thought to have been for defence as well as the availability of food in the form of fish nearby.</History>
+  </Identity>
   <Obstruction>
     <Static width="10.0" depth="22.0"/>
   </Obstruction>
@@ -23,4 +20,7 @@
       units/celt_ship_trireme
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/celts/dock_new.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/cart_wall_short.xml
===================================================================
--- structures/cart_wall_short.xml	(revision 9928)
+++ structures/cart_wall_short.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="11.5" depth="6.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Homah</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="11.5" depth="6.5"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_short.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="11.5" depth="6.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="11.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_wall_long.xml
===================================================================
--- structures/cart_wall_long.xml	(revision 9928)
+++ structures/cart_wall_long.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="26.5" depth="6.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Homah</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="26.5" depth="6.5"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_long.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="26.5" depth="6.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="26.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_wall_tower.xml
===================================================================
--- structures/cart_wall_tower.xml	(revision 9928)
+++ structures/cart_wall_tower.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
+  <Footprint>
+    <Square width="9.0" depth="9.0"/>
+    <Height>18.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Migdál</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="9.0" depth="9.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_tower_middle.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>18.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="9.0" depth="9.0"/>
-  </Obstruction>
 </Entity>
Index: structures/celt_house.xml
===================================================================
--- structures/celt_house.xml	(revision 9928)
+++ structures/celt_house.xml	(working copy)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
+  <Footprint replace="">
+    <Circle radius="6.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Annedd</SpecificName>
     <History>Celts generally lived in round stone or wattle and daub walled structures with thatched roof.</History>
   </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="10.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/celts/house.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="6.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="10.0" depth="10.0"/>
-  </Obstruction>
 </Entity>
Index: structures/hele_civil_centre.xml
===================================================================
--- structures/hele_civil_centre.xml	(revision 9928)
+++ structures/hele_civil_centre.xml	(working copy)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Agora</SpecificName>
-    <History>The most important place in most Classical Greek poleis, the Agora served many purposes - it was a place for public speeches and was the stage for civic life and commercial interests.</History>
-  </Identity>
   <Cost>
     <BuildTime>330</BuildTime>
   </Cost>
   <Health>
     <Max>3300</Max>
   </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/civic_centre_new.xml</Actor>
-  </VisualActor>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Agora</SpecificName>
+    <History>The most important place in most Classical Greek poleis, the Agora served many purposes - it was a place for public speeches and was the stage for civic life and commercial interests.</History>
+  </Identity>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_infantry_spearman_b
@@ -21,4 +18,7 @@
       units/hele_cavalry_swordsman_b
 	</Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/hellenes/civic_centre_new.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/hele_farmstead.xml
===================================================================
--- structures/hele_farmstead.xml	(revision 9928)
+++ structures/hele_farmstead.xml	(working copy)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Sitoboleion</SpecificName>
-    <History>Grain wasn't plentiful in Hellas, which is why it was carefully stored in granaries, some of it being reserved for times of siege.</History>
-  </Identity>
   <Cost>
     <BuildTime>99</BuildTime>
   </Cost>
+  <Footprint>
+    <Square width="20.0" depth="18.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
     <Max>990</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Sitoboleion</SpecificName>
+    <History>Grain wasn't plentiful in Hellas, which is why it was carefully stored in granaries, some of it being reserved for times of siege.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="18.0" depth="16.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/farmstead_new.xml</Actor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
-  <Footprint>
-    <Square width="20.0" depth="18.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="18.0" depth="16.0"/>
-  </Obstruction>
 </Entity>
Index: structures/celt_mill.xml
===================================================================
--- structures/celt_mill.xml	(revision 9928)
+++ structures/celt_mill.xml	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_mill">
+  <Cost>
+    <PopulationBonus>2</PopulationBonus>
+  </Cost>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Ystordy</SpecificName>
     <History>In southern parts of the country, most of the wildwood had been cleared and given way to farming or coppice management. In northern parts, or where the ground was particularly unsuitable for agriculture, wildwood remained, but under constant threat. Land around the farmsteads was usually enclosed by hazel fencing or hedging.</History>
   </Identity>
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <VisualActor>
     <Actor>structures/celts/mill.xml</Actor>
   </VisualActor>
Index: structures/cart_mill.xml
===================================================================
--- structures/cart_mill.xml	(revision 9928)
+++ structures/cart_mill.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_mill">
+  <Footprint>
+    <Square width="15.0" depth="15.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Mehcabah</SpecificName>
     <History>Resources and building materials were kept in warehouses.</History>
   </Identity>
+  <Obstruction>
+    <Static width="15.0" depth="15.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/mill.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="15.0" depth="15.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="15.0" depth="15.0"/>
-  </Obstruction>
 </Entity>
Index: structures/celt_wall_gate.xml
===================================================================
--- structures/celt_wall_gate.xml	(revision 9928)
+++ structures/celt_wall_gate.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_gate">
+  <Footprint>
+    <Square width="15.0" depth="6.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gate</SpecificName>
     <History>(Insert History Here)</History>
   </Identity>
-  <Footprint>
-    <Square width="15.0" depth="6.5"/>
-    <Height>9.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="14.0" depth="6.0"/>
   </Obstruction>
Index: structures/hele_wall_long.xml
===================================================================
--- structures/hele_wall_long.xml	(revision 9928)
+++ structures/hele_wall_long.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Teichos</SpecificName>
-    <History>All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures.</History>
-  </Identity>
   <Cost>
     <BuildTime>22</BuildTime>
   </Cost>
-  <Health>
-    <Max>2200</Max>
-  </Health>
   <Footprint>
     <Square width="25.0" depth="6.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>2200</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Teichos</SpecificName>
+    <History>All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures.</History>
+  </Identity>
   <Obstruction>
     <Static width="24.0" depth="6.0"/>
   </Obstruction>
Index: structures/hele_wall_tower.xml
===================================================================
--- structures/hele_wall_tower.xml	(revision 9928)
+++ structures/hele_wall_tower.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Pyrgos</SpecificName>
-    <History>Towers were an important part of city fortifications. The defending troops shot arrows at the enemy and poured boiling oil over the assailants.</History>
-  </Identity>
   <Cost>
     <BuildTime>27</BuildTime>
   </Cost>
-  <Health>
-    <Max>2750</Max>
-  </Health>
   <Footprint>
     <Square width="7.5" depth="7.5"/>
     <Height>15.0</Height>
   </Footprint>
+  <Health>
+    <Max>2750</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Pyrgos</SpecificName>
+    <History>Towers were an important part of city fortifications. The defending troops shot arrows at the enemy and poured boiling oil over the assailants.</History>
+  </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
Index: structures/hele_dock.xml
===================================================================
--- structures/hele_dock.xml	(revision 9928)
+++ structures/hele_dock.xml	(working copy)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Limen</SpecificName>
-    <History>Greece is a sea country, which is why some of the greatest Hellenic and Hellenistic cities like Ephesus, Corinth, Alexandria and Antioch were built by the sea. It should also be noted that all colonies during the Great Colonisation were thriving port centres, which traded with the local population.</History>
-  </Identity>
   <Cost>
     <BuildTime>275</BuildTime>
   </Cost>
   <Health>
     <Max>2750</Max>
   </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/dock.xml</Actor>
-  </VisualActor>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Limen</SpecificName>
+    <History>Greece is a sea country, which is why some of the greatest Hellenic and Hellenistic cities like Ephesus, Corinth, Alexandria and Antioch were built by the sea. It should also be noted that all colonies during the Great Colonisation were thriving port centres, which traded with the local population.</History>
+  </Identity>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_ship_bireme
       units/hele_ship_trireme
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/hellenes/dock.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/iber_scout_tower.xml
===================================================================
--- structures/iber_scout_tower.xml	(revision 9928)
+++ structures/iber_scout_tower.xml	(working copy)
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_scout_tower">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Torre Iberica</SpecificName>
-    <History>These towers were quite large, high and monolithic stonework; being cylindrical lent them added strength. They were initially built at mountain passes to control access through them or on high places to provide overview and defense of surrounding terrain. They may have also been used as 'toll stations' along trading routes. Sometimes they were even built 'right out in the middle of nowhere' on the flatlands, but always with the idea of defensively controlling terrain.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/scout_tower.xml</Actor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
-  </VisualActor>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>17.0</HeightOffset>
-  </StatusBars>
-  <Footprint replace="">
-    <Circle radius="8.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="14.0" depth="14.0"/>
-  </Obstruction>
-  <Cost>
-    <PopulationBonus>5</PopulationBonus>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <wood>0</wood>
-      <stone>250</stone>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <GarrisonHolder>
-    <Max>10</Max>
-  </GarrisonHolder>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defense_scout_tower">
+  <Cost>
+    <PopulationBonus>5</PopulationBonus>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <wood>0</wood>
+      <stone>250</stone>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Circle radius="8.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Torre Iberica</SpecificName>
+    <History>These towers were quite large, high and monolithic stonework; being cylindrical lent them added strength. They were initially built at mountain passes to control access through them or on high places to provide overview and defense of surrounding terrain. They may have also been used as 'toll stations' along trading routes. Sometimes they were even built 'right out in the middle of nowhere' on the flatlands, but always with the idea of defensively controlling terrain.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="14.0" depth="14.0"/>
+  </Obstruction>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>17.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>structures/iberians/scout_tower.xml</Actor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: structures/hele_field.xml
===================================================================
--- structures/hele_field.xml	(revision 9928)
+++ structures/hele_field.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_field">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Agros</SpecificName>
-    <History>A farmer's field. The Hellenes were not reknowned as farmers and preferred to herd livestock instead.</History>
-  </Identity>
   <Cost>
     <BuildTime>33</BuildTime>
   </Cost>
   <Health>
     <Max>132</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Agros</SpecificName>
+    <History>A farmer's field. The Hellenes were not reknowned as farmers and preferred to herd livestock instead.</History>
+  </Identity>
 </Entity>
Index: structures/iber_corral.xml
===================================================================
--- structures/iber_corral.xml	(revision 9928)
+++ structures/iber_corral.xml	(working copy)
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_corral">
+  <Footprint>
+    <Square width="16.0" depth="16.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Corral</SpecificName>
     <History>A place for a farmer to pen his animals. Garrison a sheep, goat, or cow here to gain a trickle of the food resource. Garrisoning an animal here also "fattens" them so that they may be slaughtered and gathered for a quick burst of food. Horses can be captured in the wild and placed in the Corral. Unlike normal corralled animals that generate food, the corralled Horse functions similarly to a relic as in AoK.. As long as it/they remain(s) in the Corral, the resource cost of training horse-mounted units (cavalry) is reduced by a fixed amount of -5% per animal corralled.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/corral.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="16.0" depth="16.0"/>
-    <Height>5.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
@@ -21,4 +17,8 @@
       gaia/fauna_goat
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/iberians/corral.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/iber_house.xml
===================================================================
--- structures/iber_house.xml	(revision 9928)
+++ structures/iber_house.xml	(working copy)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
+  <Footprint>
+    <Square width="12.0" depth="12.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Casa</SpecificName>
     <History>Iberian structures of the time were typically built either entirely of stone or with stone stub walls with 'adobe' up to the roof lines above them. Roofs were then, depending on the economic status of individuals, covered with a composite of mud and binding vegetable and waterproofing asphaltic materials, or slate stone, or in many cases in the region, with so-called Spanish roofing tiles.</History>
   </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="10.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/house.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
-  <Footprint>
-    <Square width="12.0" depth="12.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="10.0" depth="10.0"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_wall_tower_end_left.xml
===================================================================
--- structures/cart_wall_tower_end_left.xml	(revision 9928)
+++ structures/cart_wall_tower_end_left.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
+  <Footprint>
+    <Square width="9.0" depth="9.0"/>
+    <Height>18.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Migdál</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="9.0" depth="9.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_tower_end_left.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>18.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="9.0" depth="9.0"/>
-  </Obstruction>
 </Entity>
Index: structures/iber_barracks.xml
===================================================================
--- structures/iber_barracks.xml	(revision 9928)
+++ structures/iber_barracks.xml	(working copy)
@@ -5,9 +5,6 @@
     <SpecificName>Cuartel</SpecificName>
     <History>To the best of our knowledge, the Iberians did not have standing armies in the sense that we know of them elsewhere or of today, it is doubtful that they had specific structures designated as military centres; however as a game construct we show a modest structure wherein military related activities take place.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/barracks.xml</Actor>
-  </VisualActor>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/iber_infantry_spearman_b
@@ -17,4 +14,7 @@
       units/iber_cavalry_spearman_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/iberians/barracks.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/hele_mill.xml
===================================================================
--- structures/hele_mill.xml	(revision 9928)
+++ structures/hele_mill.xml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_mill">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Anakeion</SpecificName>
-    <History>Resources and building materials were kept in warehouses.</History>
-  </Identity>
   <Cost>
     <BuildTime>88</BuildTime>
   </Cost>
   <Health>
     <Max>880</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Anakeion</SpecificName>
+    <History>Resources and building materials were kept in warehouses.</History>
+  </Identity>
   <VisualActor>
     <Actor>structures/hellenes/mill.xml</Actor>
   </VisualActor>
Index: structures/iber_wall_gate.xml
===================================================================
--- structures/iber_wall_gate.xml	(revision 9928)
+++ structures/iber_wall_gate.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_gate">
+  <Footprint>
+    <Square width="39.0" depth="14.0"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Puerta Mortal</SpecificName>
     <History>One of the central attributes of the Iberians civ is that it was a highly defensive one that constantly gave the Carthaginians trouble in their bid to conquer the peninsula (which they never really did) and took the Romans another 200 years to subdue, along with incredibly large cumulative loss of Roman soldier's lives. This doubled gate has been found incorporated into walls surrounding Iberian villages, Oppidum, and fortresses, Castros. It presents rather formidable aspects with its 4 towers, 2 gates, and a courtyard-like interior wherein enemy forces could become entrapped between the two gates, combined with a monolithically strong stone structure. The concept comes from archeologist and paleontologist descriptions of the remains of such gates at various locations scattered about the Iberian Peninsula.</History>
   </Identity>
-  <Footprint>
-    <Square width="39.0" depth="14.0"/>
-    <Height>9.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="38.0" depth="13.0"/>
   </Obstruction>
Index: structures/iber_wall.xml
===================================================================
--- structures/iber_wall.xml	(revision 9928)
+++ structures/iber_wall.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="29.75" depth="8.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Muro Ancho</SpecificName>
     <History>High and strongly built defensive stone walls were a common structure of the Iberian Peninsula during the period, and for long thereafter.</History>
   </Identity>
-  <Footprint>
-    <Square width="29.75" depth="8.5"/>
-    <Height>9.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="28.0" depth="7.25"/>
   </Obstruction>
Index: structures/hele_tholos.xml
===================================================================
--- structures/hele_tholos.xml	(revision 9928)
+++ structures/hele_tholos.xml	(working copy)
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Tholos</SpecificName>
-    <Tooltip>Train Heroes.</Tooltip>
-    <History>The Tholos was the meeting house of the city fathers and official dining hall of the state. Most Greeks cities had a Tholos somewhere within their walls.</History>
-    <Icon>structures/tholos.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>220</BuildTime>
     <Resources>
@@ -16,19 +9,30 @@
       <metal>200</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2200</Max>
-  </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/tholos.xml</Actor>
-  </VisualActor>
   <Footprint replace="">
     <Circle radius="10.5"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>2200</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Tholos</SpecificName>
+    <Tooltip>Train Heroes.</Tooltip>
+    <History>The Tholos was the meeting house of the city fathers and official dining hall of the state. Most Greeks cities had a Tholos somewhere within their walls.</History>
+    <Icon>structures/tholos.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_tholos.xml</select>
+      <constructed>interface/complete/building/complete_tholos.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_hero_alexander
@@ -39,11 +43,7 @@
       units/hele_hero_xenophon
     </Entities>
   </TrainingQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tholos.xml</select>
-      <constructed>interface/complete/building/complete_tholos.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
+  <VisualActor>
+    <Actor>structures/hellenes/tholos.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/iber_fortress.xml
===================================================================
--- structures/iber_fortress.xml	(revision 9928)
+++ structures/iber_fortress.xml	(working copy)
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Castro</SpecificName>
-    <History>The Castro can be likened to a more strongly fortified town centre than that of the common Oppidum which were also fortified places of habitation. As such it was widely and normally constructed upon a height, and almost always had some sort of an acropolis built at the highest point within its towered walls. In the archeological record of the Iberian Peninsula, the remnants of as many as a thousand fortified places identifiable as Castros can be found in modern day Portugal alone.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/fortress.xml</Actor>
-  </VisualActor>
   <Cost>
     <PopulationBonus>15</PopulationBonus>
     <BuildTime>500</BuildTime>
@@ -16,13 +8,18 @@
       <stone>600</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>5000</Max>
-  </Health>
   <Footprint>
     <Square width="29.0" depth="29.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>5000</Max>
+  </Health>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Castro</SpecificName>
+    <History>The Castro can be likened to a more strongly fortified town centre than that of the common Oppidum which were also fortified places of habitation. As such it was widely and normally constructed upon a height, and almost always had some sort of an acropolis built at the highest point within its towered walls. In the archeological record of the Iberian Peninsula, the remnants of as many as a thousand fortified places identifiable as Castros can be found in modern day Portugal alone.</History>
+  </Identity>
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
   </Obstruction>
@@ -36,4 +33,7 @@
 	  units/iber_mechanical_siege_ram
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/iberians/fortress.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/celt_farmstead.xml
===================================================================
--- structures/celt_farmstead.xml	(revision 9928)
+++ structures/celt_farmstead.xml	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
+  <Cost>
+    <PopulationBonus>2</PopulationBonus>
+  </Cost>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Ffermdy</SpecificName>
     <History>Farming typically revolved around small hamlets and farmsteads with enclosed rectilinear fields - each having areas of pasture, farmland and wood. Ploughing became more efficient with the arrival of the iron share (plough point ? courtesy of our Celts) and a two field rotation was introduced; crops one year followed by a fallow that was grazed by livestock. This lead to surprisingly high yields and fuelled population growth. The image of a farmstead would most likely be a house with some out-buildings. Storage of crops was either in pits or in raised stores and harvest was over several months - weeds, grain and then straw.</History>
   </Identity>
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <VisualActor>
     <Actor>structures/celts/farmstead.xml</Actor>
   </VisualActor>
Index: structures/celt_fortress_b.xml
===================================================================
--- structures/celt_fortress_b.xml	(revision 9928)
+++ structures/celt_fortress_b.xml	(working copy)
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Brythonic Broch</SpecificName>
-    <Tooltip>Train Brythonic Heroes and Champions.</Tooltip>
-    <History>The Broch is an Iron Age round tower fortification type unique to Scotland.  The origin of brochs remains a mystery. Some archaeologists believed the brochs were built by an influx of broch builders who had been displaced and pushed northward during the Roman invasion of Britain. However, this theory has been largely disproven and current thought is that they were built by itinerant (travelling) craftsmen since so many were built to almost the same exact design. </History>
-  </Identity>
+  <Attack>
+    <Ranged>
+      <MaxRange>60.0</MaxRange>
+      <MinRange>24.0</MinRange>
+    </Ranged>
+  </Attack>
   <Cost>
     <PopulationBonus>22</PopulationBonus>
   </Cost>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>structures/celts/fortress_briton.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>18.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Brythonic Broch</SpecificName>
+    <Tooltip>Train Brythonic Heroes and Champions.</Tooltip>
+    <History>The Broch is an Iron Age round tower fortification type unique to Scotland.  The origin of brochs remains a mystery. Some archaeologists believed the brochs were built by an influx of broch builders who had been displaced and pushed northward during the Roman invasion of Britain. However, this theory has been largely disproven and current thought is that they were built by itinerant (travelling) craftsmen since so many were built to almost the same exact design. </History>
+  </Identity>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_broch.xml</select>
+      <constructed>interface/complete/building/complete_broch.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/celt_hero_boudicca
@@ -33,17 +39,11 @@
 	  units/celt_mechanical_siege_ram
     </Entities>
   </TrainingQueue>
-  <Attack>
-    <Ranged>
-      <MaxRange>60.0</MaxRange>
-      <MinRange>24.0</MinRange>
-    </Ranged>
-  </Attack>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_broch.xml</select>
-      <constructed>interface/complete/building/complete_broch.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/celts/fortress_briton.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/hele_theatron.xml
===================================================================
--- structures/hele_theatron.xml	(revision 9928)
+++ structures/hele_theatron.xml	(working copy)
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Theatron</SpecificName>
-    <Tooltip>Take advantage of the Hellenisation civ bonus. (Currently a useless structure)</Tooltip>
-    <History>Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.</History>
-    <Icon>structures/theatron.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>550</BuildTime>
     <Resources>
@@ -14,17 +7,20 @@
       <stone>500</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>5500</Max>
-  </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/special_theatre.xml</Actor>
-    <FoundationActor>structures/fndn_theatron.xml</FoundationActor>
-  </VisualActor>
   <Footprint replace="">
     <Circle radius="26.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>5500</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Theatron</SpecificName>
+    <Tooltip>Take advantage of the Hellenisation civ bonus. (Currently a useless structure)</Tooltip>
+    <History>Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.</History>
+    <Icon>structures/theatron.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="52.0" depth="52.0"/>
   </Obstruction>
@@ -35,4 +31,8 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <VisualActor>
+    <Actor>structures/hellenes/special_theatre.xml</Actor>
+    <FoundationActor>structures/fndn_theatron.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/celt_kennel.xml
===================================================================
--- structures/celt_kennel.xml	(revision 9928)
+++ structures/celt_kennel.xml	(working copy)
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
-  <Identity>
-    <Civ>celt</Civ>
-    <GenericName>Special Building</GenericName>
-    <SpecificName>Kennel</SpecificName>
-    <Tooltip>Train Celtic war dogs.</Tooltip>
-    <Icon>structures/kennel.png</Icon>
-  </Identity>
-  <Cost>
-    <PopulationBonus>0</PopulationBonus>
-    <BuildTime>50</BuildTime>
-    <Resources>
-      <wood>50</wood>
-      <stone>50</stone>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <VisualActor>
-    <Actor>structures/celts/kennel.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-  <TrainingQueue>
-    <Entities datatype="tokens">
-      units/celt_cavalry_spearman_b
-    </Entities>
-  </TrainingQueue>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <Footprint>
-    <Square width="8.0" depth="7.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="7.5" depth="6.75"/>
-  </Obstruction>
-  <GarrisonHolder disable=""/>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_kennel.xml</select>
-      <constructed>interface/complete/building/complete_kennel.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_barracks">
+  <Cost>
+    <PopulationBonus>0</PopulationBonus>
+    <BuildTime>50</BuildTime>
+    <Resources>
+      <wood>50</wood>
+      <stone>50</stone>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="8.0" depth="7.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <GarrisonHolder disable=""/>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <GenericName>Special Building</GenericName>
+    <SpecificName>Kennel</SpecificName>
+    <Tooltip>Train Celtic war dogs.</Tooltip>
+    <Icon>structures/kennel.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="7.5" depth="6.75"/>
+  </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_kennel.xml</select>
+      <constructed>interface/complete/building/complete_kennel.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/celt_cavalry_spearman_b
+    </Entities>
+  </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/celts/kennel.xml</Actor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: structures/celt_fortress_g.xml
===================================================================
--- structures/celt_fortress_g.xml	(revision 9928)
+++ structures/celt_fortress_g.xml	(working copy)
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
+  <Cost>
+    <PopulationBonus>22</PopulationBonus>
+  </Cost>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gallic Dun</SpecificName>
     <Tooltip>Train Gallic Heroes and Champions.</Tooltip>
     <History>Dun comes from the Brythonic Din and Gaelic Dun, meaning fort, and is now used as a general term for small stone built strongholds. Duns appear to have arrived with the Brythonic Celts in about the 7th century BC, associated with their Iron age culture of warrior tribes and petty chieftains. Early Duns had near vertical ramparts constructed of stone laced with timber, and where this was set on fire (accidentally or on purpose) it forms the vitrified forts where stones have been partly melted, an effect that is still clearly visible. Use of Duns continued in some cases into the medieval period.</History>
   </Identity>
-  <Cost>
-    <PopulationBonus>22</PopulationBonus>
-  </Cost>
-  <VisualActor>
-    <Actor>structures/celts/fortress_gallic.xml</Actor>
-  </VisualActor>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_fortress.xml</select>
+      <constructed>interface/complete/building/complete_fortress.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/celt_hero_brennus
@@ -22,11 +26,7 @@
 	  units/celt_mechanical_siege_ram
     </Entities>
   </TrainingQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_fortress.xml</select>
-      <constructed>interface/complete/building/complete_fortress.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
+  <VisualActor>
+    <Actor>structures/celts/fortress_gallic.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/celt_wall_long.xml
===================================================================
--- structures/celt_wall_long.xml	(revision 9928)
+++ structures/celt_wall_long.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="22.0" depth="9.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gwarchglawdd</SpecificName>
     <History>The Romans called this wall 'Murus Gallicus'. Translated, it means 'Gaulish wall'. It was extremely resistant to assault by battering ram. Julius Caesar described a type of wood and stone wall, known as a Murus Gallicus, in his account of the Gallic Wars. These walls were made of a stone wall filled with rubble, with wooden logs inside for stability. Caesar noted how the flexibility of the wood added to the strength of the fort in case of battering ram attack.</History>
   </Identity>
-  <Footprint>
-    <Square width="22.0" depth="9.5"/>
-    <Height>9.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="20.0" depth="9.0"/>
   </Obstruction>
Index: structures/cart_scout_tower.xml
===================================================================
--- structures/cart_scout_tower.xml	(revision 9928)
+++ structures/cart_scout_tower.xml	(working copy)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_scout_tower">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Migdal</SpecificName>
-    <History>Sturdy stone outposts used to keep an eye on desert nomad tribes along the Carthaginian North African frontier.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/scout_tower.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>18.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="9.0" depth="9.0"/>
-  </Obstruction>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>20.0</HeightOffset>
-  </StatusBars>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defense_scout_tower">
+  <Footprint>
+    <Square width="9.0" depth="9.0"/>
+    <Height>18.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Migdal</SpecificName>
+    <History>Sturdy stone outposts used to keep an eye on desert nomad tribes along the Carthaginian North African frontier.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="9.0" depth="9.0"/>
+  </Obstruction>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>20.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>structures/carthaginians/scout_tower.xml</Actor>
+  </VisualActor>
+</Entity>
Index: structures/iber_temple.xml
===================================================================
--- structures/iber_temple.xml	(revision 9928)
+++ structures/iber_temple.xml	(working copy)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
+  <Footprint>
+    <Square width="14.0" depth="14.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Templo</SpecificName>
     <History>The Iberian tribes did not typically worship their gods at temples, but there has been a single instance in which the remains of an ancient Tartessian temple has been unearthed in Andalusia in southern Spain. The Iberians for the most part worshipped their gods at small household votive altars in their homes or sometimes at smallish monuments to them in the outdoors. Their two principal gods (though they are also known to have had many others) were Endovelico, as the male represented by a boar, and Ataecina, the female counterpart as represented by a goat.</History>
   </Identity>
+  <Obstruction>
+    <Static width="12.0" depth="12.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/temple.xml</Actor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
-  <Footprint>
-    <Square width="14.0" depth="14.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="12.0" depth="12.0"/>
-  </Obstruction>
 </Entity>
Index: structures/celt_corral.xml
===================================================================
--- structures/celt_corral.xml	(revision 9928)
+++ structures/celt_corral.xml	(working copy)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_corral">
+  <Footprint>
+    <Square width="11.0" depth="22.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Cavalidos</SpecificName>
     <History>A place for a farmer to pen his animals. Garrison a sheep, goat, or cow here to gain a trickle of the food resource. Garrisoning an animal here also "fattens" them so that they may be slaughtered and gathered for a quick burst of food.</History>
   </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="20.0"/>
+  </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">
       gaia/fauna_sheep
     </Entities>
   </TrainingQueue>
-  <Footprint>
-    <Square width="11.0" depth="22.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="10.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/celts/plot_corral.xml</Actor>
   </VisualActor>
Index: structures/celt_market.xml
===================================================================
--- structures/celt_market.xml	(revision 9928)
+++ structures/celt_market.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Marchnaty</SpecificName>
-    <History>Efficient farming led to food surpluses and a developing social hierarchy through the period with administration and power centred on the hill forts. Trade would have been buoyant with Europe; exported corn, cattle hides, tin, gold and iron in exchange for wine and olive oil. The first coins appeared although they were more items of wealth and status than trade. There is evidence too of standardised pottery and this suggests that weights and measures were controlled to provide consistency in trade.</History>
-  </Identity>
   <Cost>
     <PopulationBonus>12</PopulationBonus>
   </Cost>
@@ -12,6 +7,11 @@
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Marchnaty</SpecificName>
+    <History>Efficient farming led to food surpluses and a developing social hierarchy through the period with administration and power centred on the hill forts. Trade would have been buoyant with Europe; exported corn, cattle hides, tin, gold and iron in exchange for wine and olive oil. The first coins appeared although they were more items of wealth and status than trade. There is evidence too of standardised pottery and this suggests that weights and measures were controlled to provide consistency in trade.</History>
+  </Identity>
   <Obstruction>
     <Static width="25.0" depth="23.0"/>
   </Obstruction>
Index: structures/cart_corral.xml
===================================================================
--- structures/cart_corral.xml	(revision 9928)
+++ structures/cart_corral.xml	(working copy)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_corral">
+  <Footprint>
+    <Square width="18.0" depth="16.5"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Réfet</SpecificName>
     <History>A place for a farmer to pen his animals. Garrison a sheep, goat, or cow here to gain a trickle of the food resource. Garrisoning an animal here also "fattens" them so that they may be slaughtered and gathered for a quick burst of food. Horses or elephants can be captured in the wild and placed in the Corral. Unlike normal corralled animals that generate food, the corralled Horse and Elephant functions similarly to a relic as in AoK. As long as it/they remain(s) in the Corral, the resource cost of training horse-mounted units (cavalry) or War Elephant Super Units is reduced by a fixed amount of 5% per animal corralled appropriate to kind.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/corral.xml</Actor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
-  </VisualActor>
+  <Obstruction>
+    <Static width="16.0" depth="14.5"/>
+  </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">
       gaia/fauna_goat
     </Entities>
   </TrainingQueue>
-  <Footprint>
-    <Square width="18.0" depth="16.5"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="16.0" depth="14.5"/>
-  </Obstruction>
+  <VisualActor>
+    <Actor>structures/carthaginians/corral.xml</Actor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/cart_market.xml
===================================================================
--- structures/cart_market.xml	(revision 9928)
+++ structures/cart_market.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
+  <Footprint>
+    <Square width="27.0" depth="20.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>uq</SpecificName>
     <History>Carthaginian markets were probably just big sheds or structures surrounding a ?market? area or in a wharf area of a port.</History>
   </Identity>
+  <Obstruction>
+    <Static width="27.0" depth="20.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/market.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="27.0" depth="20.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="27.0" depth="20.0"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_house.xml
===================================================================
--- structures/cart_house.xml	(revision 9928)
+++ structures/cart_house.xml	(working copy)
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Bayit</SpecificName>
-    <History>Housing was generally built of adobe or sandstone then plastered with stucco. Flat roofs predominate, few windows, arched doorways in evidence, kind of a blend of Achaemenian and Mediterranean styles with some tiled roofs. In the biggest cities, especially Carthage and such as Utica, housing was in flat-roofed structures rising as high as 6 and 7 stories.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/house.xml</Actor>
-  </VisualActor>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>120</BuildTime>
@@ -15,14 +7,22 @@
       <wood>150</wood>
     </Resources>
   </Cost>
-  <Health>
-    <Max>1200</Max>
-  </Health>
   <Footprint>
     <Square width="14.5" depth="14.5"/>
     <Height>5.0</Height>
   </Footprint>
+  <Health>
+    <Max>1200</Max>
+  </Health>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Bayit</SpecificName>
+    <History>Housing was generally built of adobe or sandstone then plastered with stucco. Flat roofs predominate, few windows, arched doorways in evidence, kind of a blend of Achaemenian and Mediterranean styles with some tiled roofs. In the biggest cities, especially Carthage and such as Utica, housing was in flat-roofed structures rising as high as 6 and 7 stories.</History>
+  </Identity>
   <Obstruction>
     <Static width="13.0" depth="13.0"/>
   </Obstruction>
+  <VisualActor>
+    <Actor>structures/carthaginians/house.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/celt_barracks.xml
===================================================================
--- structures/celt_barracks.xml	(revision 9928)
+++ structures/celt_barracks.xml	(working copy)
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Gwersyllty</SpecificName>
-  </Identity>
   <Cost>
     <PopulationBonus>7</PopulationBonus>
     <Resources>
@@ -11,14 +7,14 @@
       <stone>0</stone>
     </Resources>
   </Cost>
-  <VisualActor>
-    <Actor>structures/celts/barracks_new.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="22.0" depth="22.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Gwersyllty</SpecificName>
+  </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
@@ -30,4 +26,8 @@
       units/celt_cavalry_javelinist_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/celts/barracks_new.xml</Actor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/cart_barracks.xml
===================================================================
--- structures/cart_barracks.xml	(revision 9928)
+++ structures/cart_barracks.xml	(working copy)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
+  <Footprint>
+    <Square width="24.0" depth="25.0"/>
+    <Height>15.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Mahaneh</SpecificName>
     <History>The Carthaginians incorporated stables and barracks into their city walls.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/barracks.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="24.0" depth="25.0"/>
-    <Height>15.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="22.0" depth="23.0"/>
   </Obstruction>
@@ -27,4 +24,7 @@
 	  units/cart_cavalry_javelinist_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/carthaginians/barracks.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/celt_wall.xml
===================================================================
--- structures/celt_wall.xml	(revision 9928)
+++ structures/celt_wall.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="22.0" depth="9.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gwarchglawdd</SpecificName>
     <History>The Romans called this wall 'Murus Gallicus'. Translated, it means 'Gaulish wall'. It was extremely resistant to assault by battering ram. Julius Caesar described a type of wood and stone wall, known as a Murus Gallicus, in his account of the Gallic Wars. These walls were made of a stone wall filled with rubble, with wooden logs inside for stability. Caesar noted how the flexibility of the wood added to the strength of the fort in case of battering ram attack.</History>
   </Identity>
-  <Footprint>
-    <Square width="22.0" depth="9.5"/>
-    <Height>9.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="20.0" depth="9.0"/>
   </Obstruction>
Index: structures/iber_civil_centre.xml
===================================================================
--- structures/iber_civil_centre.xml	(revision 9928)
+++ structures/iber_civil_centre.xml	(working copy)
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
+  <Footprint>
+    <Square width="26.0" depth="26.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Oppidum</SpecificName>
     <History>The Oppidum, plural Oppida (oh-PEE-dah), has a long history in the Iberian Peninsula. They were walled towns, dating back to even before the time period of the game and expanding greatly during it. They were usually built upon heights for better defensive purposes but sometimes right out on the plains, especially in the east where there may not have been heights at desirable locations near meandering rivers. This concept drawing is derived from an actual archeological site that has been excavated in the northeast of Spain having belonged to the Ilergete (ee-layer-HAY-tay) tribe as shown in the figure below and from the virtual reconstruction of the site at the museum located adjacent to it.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/civil_centre.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="26.0" depth="26.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="22.0" depth="22.0"/>
   </Obstruction>
@@ -23,4 +19,8 @@
       units/iber_cavalry_spearman_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/iberians/civil_centre.xml</Actor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/cart_wall.xml
===================================================================
--- structures/cart_wall.xml	(revision 9928)
+++ structures/cart_wall.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="26.5" depth="6.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Homah</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="26.5" depth="6.5"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_long.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="26.5" depth="6.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="26.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: structures/hele_scout_tower.xml
===================================================================
--- structures/hele_scout_tower.xml	(revision 9928)
+++ structures/hele_scout_tower.xml	(working copy)
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_scout_tower">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Pyrgion</SpecificName>
-    <History>Towers were an important part of city fortifications. The defending troops shot arrows at the enemy and poured boiling oil over the assailants.</History>
-  </Identity>
-  <Cost>
-    <BuildTime>132</BuildTime>
-  </Cost>
-  <Health>
-    <Max>1320</Max>
-  </Health>
-  <Footprint>
-    <Square width="7.5" depth="7.5"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/hellenes/scout_tower.xml</Actor>
-  </VisualActor>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>22.0</HeightOffset>
-  </StatusBars>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defense_scout_tower">
+  <Cost>
+    <BuildTime>132</BuildTime>
+  </Cost>
+  <Footprint>
+    <Square width="7.5" depth="7.5"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1320</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Pyrgion</SpecificName>
+    <History>Towers were an important part of city fortifications. The defending troops shot arrows at the enemy and poured boiling oil over the assailants.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>22.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>structures/hellenes/scout_tower.xml</Actor>
+  </VisualActor>
+</Entity>
Index: structures/hele_corral.xml
===================================================================
--- structures/hele_corral.xml	(revision 9928)
+++ structures/hele_corral.xml	(working copy)
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_corral">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Stavlos</SpecificName>
-    <History>A place for a farmer to pen his animals. Garrison a sheep, goat, or cow here to gain a trickle of the food resource. Garrisoning an animal here also "fattens" them so that they may be slaughtered and gathered for a quick burst of food.</History>
-  </Identity>
   <Cost>
     <BuildTime>11</BuildTime>
   </Cost>
+  <Footprint>
+    <Square width="17.0" depth="17.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
     <Max>110</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Stavlos</SpecificName>
+    <History>A place for a farmer to pen his animals. Garrison a sheep, goat, or cow here to gain a trickle of the food resource. Garrisoning an animal here also "fattens" them so that they may be slaughtered and gathered for a quick burst of food.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="14.0" depth="14.0"/>
+  </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">
       gaia/fauna_goat
@@ -20,11 +27,4 @@
     <Actor>structures/hellenes/corral.xml</Actor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
-  <Footprint>
-    <Square width="17.0" depth="17.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="14.0" depth="14.0"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_fortress.xml
===================================================================
--- structures/cart_fortress.xml	(revision 9928)
+++ structures/cart_fortress.xml	(working copy)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
+  <Footprint>
+    <Square width="30.0" depth="32.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Mecudah</SpecificName>
     <History>The Carthaginians built a number of rather 'monolithic' blockhouse forts sited at critical locations in North Africa, sometimes also in conjunction with long lengths of wall intended to keep the wilder people of the desert to the south from freely ranging into the ?civilised? territories under their direct control.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/fortress.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="30.0" depth="32.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="26.0" depth="28.0"/>
   </Obstruction>
@@ -23,4 +20,7 @@
       units/cart_champion_cavalry
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/carthaginians/fortress.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/hele_house.xml
===================================================================
--- structures/hele_house.xml	(revision 9928)
+++ structures/hele_house.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Oikos</SpecificName>
-    <History>Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia.</History>
-  </Identity>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>120</BuildTime>
@@ -15,7 +10,12 @@
   <Health>
     <Max>1200</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Oikos</SpecificName>
+    <History>Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia.</History>
+  </Identity>
   <VisualActor>
     <Actor>structures/hellenes/house_new.xml</Actor>
   </VisualActor>
-</Entity>
\ No newline at end of file
+</Entity>
Index: structures/hele_market.xml
===================================================================
--- structures/hele_market.xml	(revision 9928)
+++ structures/hele_market.xml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Emporion</SpecificName>
-    <History>Most Hellenic cities were centers of trade. The Emporion is the Hellenic marketplace, where commerce and trading occur. Economic technologies may be researched here as well.</History>
-  </Identity>
   <Cost>
     <BuildTime>165</BuildTime>
   </Cost>
   <Health>
     <Max>1650</Max>
   </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Emporion</SpecificName>
+    <History>Most Hellenic cities were centers of trade. The Emporion is the Hellenic marketplace, where commerce and trading occur. Economic technologies may be researched here as well.</History>
+  </Identity>
   <VisualActor>
     <Actor>structures/hellenes/market.xml</Actor>
   </VisualActor>
Index: structures/iber_wall_tower.xml
===================================================================
--- structures/iber_wall_tower.xml	(revision 9928)
+++ structures/iber_wall_tower.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
+  <Footprint>
+    <Square width="9.5" depth="10.5"/>
+    <Height>15.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Torre</SpecificName>
     <History>Sturdy battlements for city walls.</History>
   </Identity>
-  <Footprint>
-    <Square width="9.5" depth="10.5"/>
-    <Height>15.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="9.0" depth="10.0"/>
   </Obstruction>
Index: structures/iber_dock.xml
===================================================================
--- structures/iber_dock.xml	(revision 9928)
+++ structures/iber_dock.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
+  <Footprint>
+    <Square width="16.0" depth="26.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Puerto</SpecificName>
     <History>No one really knows how ancient 1st millennium Iberian Peninsular docks or ports looked, though they were probably pretty simple affairs having but a short pier, if even that. However, for the purposes of creating a structure in the game and because the Phoenicians / Carthaginians had such broad influence on the peninsula for a half millennium before the timeframe of the game, we have chosen to model something similar to the inner port centre at Carthage, with typical Iberians architectural applications applied to it. The largest port that was strictly Iberian, though said to have been founded by the Greeks (defaulting to the resident Iberians when Greek merchants were blocked by Carthage from further trading into the western Mediterranean), was probably only that of Saguntum (and possibly Emporion) on the eastern coast of Spain referred to as the Spanish Levant.</History>
   </Identity>
+  <Obstruction>
+    <Static width="14.0" depth="24.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/dock.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="16.0" depth="26.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="14.0" depth="24.0"/>
-  </Obstruction>
 </Entity>
Index: structures/hele_barracks.xml
===================================================================
--- structures/hele_barracks.xml	(revision 9928)
+++ structures/hele_barracks.xml	(working copy)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Strategeion</SpecificName>
-    <History>The Stratigeion was the main military headquarters, where important decisions were taken and plans for battles discussed by the Hellene Generals, or "Strategoi".</History>
-  </Identity>
   <Cost>
     <BuildTime>220</BuildTime>
   </Cost>
   <Health>
     <Max>2200</Max>
   </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/barracks.xml</Actor>
-  </VisualActor>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Strategeion</SpecificName>
+    <History>The Stratigeion was the main military headquarters, where important decisions were taken and plans for battles discussed by the Hellene Generals, or "Strategoi".</History>
+  </Identity>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_infantry_spearman_b
@@ -23,4 +20,7 @@
       units/hele_cavalry_javelinist_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/hellenes/barracks.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/hele_prytaneion.xml
===================================================================
--- structures/hele_prytaneion.xml	(revision 9928)
+++ structures/hele_prytaneion.xml	(working copy)
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Identity>
-    <Civ>hele</Civ>
-    <GenericName>Meeting Hall</GenericName>
-    <SpecificName>Prytaneion</SpecificName>
-    <Tooltip>Train Heroes.</Tooltip>
-    <History>The Prytaneion is the meeting place for the city elders to dine and to make swift decisions.</History>
-    <Icon>structures/tholos.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>220</BuildTime>
     <Resources>
@@ -17,19 +9,31 @@
       <metal>200</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2200</Max>
-  </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/tholos.xml</Actor>
-  </VisualActor>
   <Footprint replace="">
     <Circle radius="10.5"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>2200</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <GenericName>Meeting Hall</GenericName>
+    <SpecificName>Prytaneion</SpecificName>
+    <Tooltip>Train Heroes.</Tooltip>
+    <History>The Prytaneion is the meeting place for the city elders to dine and to make swift decisions.</History>
+    <Icon>structures/tholos.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_tholos.xml</select>
+      <constructed>interface/complete/building/complete_tholos.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_hero_alexander
@@ -40,11 +44,7 @@
       units/hele_hero_xenophon
     </Entities>
   </TrainingQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tholos.xml</select>
-      <constructed>interface/complete/building/complete_tholos.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
+  <VisualActor>
+    <Actor>structures/hellenes/tholos.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/celt_wall_med.xml
===================================================================
--- structures/celt_wall_med.xml	(revision 9928)
+++ structures/celt_wall_med.xml	(working copy)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="22.0" depth="9.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gwarchglawdd</SpecificName>
     <History>The Romans called this wall 'Murus Gallicus'. Translated, it means 'Gaulish wall'. It was extremely resistant to assault by battering ram. Julius Caesar described a type of wood and stone wall, known as a Murus Gallicus, in his account of the Gallic Wars. These walls were made of a stone wall filled with rubble, with wooden logs inside for stability. Caesar noted how the flexibility of the wood added to the strength of the fort in case of battering ram attack.</History>
   </Identity>
-  <Footprint>
-    <Square width="22.0" depth="9.5"/>
-    <Height>9.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="20.0" depth="9.0"/>
   </Obstruction>
Index: structures/hele_wall_gate.xml
===================================================================
--- structures/hele_wall_gate.xml	(revision 9928)
+++ structures/hele_wall_gate.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_gate">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Pyle</SpecificName>
-    <History>(Insert history)</History>
-  </Identity>
   <Cost>
     <BuildTime>33</BuildTime>
   </Cost>
-  <Health>
-    <Max>3300</Max>
-  </Health>
   <Footprint>
     <Square width="39.0" depth="8.0"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>3300</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Pyle</SpecificName>
+    <History>(Insert history)</History>
+  </Identity>
   <Obstruction>
     <Static width="38.0" depth="6.5"/>
   </Obstruction>
Index: structures/celt_sb1.xml
===================================================================
--- structures/celt_sb1.xml	(revision 9928)
+++ structures/celt_sb1.xml	(working copy)
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Ffactri</SpecificName>
-    <Tooltip>Build this to increase Farm output +15% per territory. (Currently a useless structure)</Tooltip>
-    <History>The Celts developed the first rotary flour mill.</History>
-    <Icon>structures/sb1.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>100</BuildTime>
     <PopulationBonus>2</PopulationBonus>
@@ -17,17 +10,17 @@
       <metal>0</metal>
     </Resources>
   </Cost>
-  <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>6.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Ffactri</SpecificName>
+    <Tooltip>Build this to increase Farm output +15% per territory. (Currently a useless structure)</Tooltip>
+    <History>The Celts developed the first rotary flour mill.</History>
+    <Icon>structures/sb1.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
@@ -38,4 +31,11 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>structures/celts/special.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/hele_wall.xml
===================================================================
--- structures/hele_wall.xml	(revision 9928)
+++ structures/hele_wall.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Teichos</SpecificName>
-    <History>All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures.</History>
-  </Identity>
   <Cost>
     <BuildTime>22</BuildTime>
   </Cost>
-  <Health>
-    <Max>2200</Max>
-  </Health>
   <Footprint>
     <Square width="23.5" depth="6.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>2200</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Teichos</SpecificName>
+    <History>All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures.</History>
+  </Identity>
   <Obstruction>
     <Static width="23.0" depth="6.0"/>
   </Obstruction>
Index: structures/celt_temple.xml
===================================================================
--- structures/celt_temple.xml	(revision 9928)
+++ structures/celt_temple.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Addoldy</SpecificName>
-    <History>Celts built large sanctuaries for feasting and worship. One such structure was the Sanctuary of Corent in modern-day France.</History>
-  </Identity>
   <Cost>
     <PopulationBonus>7</PopulationBonus>
     <Resources>
@@ -16,6 +11,11 @@
     <Square width="24.5" depth="24.5"/>
     <Height>8.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Addoldy</SpecificName>
+    <History>Celts built large sanctuaries for feasting and worship. One such structure was the Sanctuary of Corent in modern-day France.</History>
+  </Identity>
   <Obstruction>
     <Static width="22.5" depth="22.5"/>
   </Obstruction>
Index: structures/cart_wall_med.xml
===================================================================
--- structures/cart_wall_med.xml	(revision 9928)
+++ structures/cart_wall_med.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
+  <Footprint>
+    <Square width="18.5" depth="6.5"/>
+    <Height>9.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Homah</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="18.5" depth="6.5"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_med.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="18.5" depth="6.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="18.5" depth="6.5"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_temple.xml
===================================================================
--- structures/cart_temple.xml	(revision 9928)
+++ structures/cart_temple.xml	(working copy)
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Miqdá</SpecificName>
-    <History>What little we know of the Carthaginian religion has be pieced together from scattered sources. Tanit, a fertility goddess, was one of two principle gods in the Carthaginian pantheon, the other being her consort Ba'al, a deity of Phoenician origin.</History>
-    <Tooltip>Train Priestesses. Train Sacred Band pikemen.</Tooltip>
-  </Identity>
   <Cost>
     <Resources>
       <stone>400</stone>
     </Resources>
   </Cost>
-  <VisualActor>
-    <Actor>structures/carthaginians/temple_big.xml</Actor>
-  </VisualActor>
   <Footprint>
     <Square width="17.0" depth="30.0"/>
     <Height>12.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Miqdá</SpecificName>
+    <History>What little we know of the Carthaginian religion has be pieced together from scattered sources. Tanit, a fertility goddess, was one of two principle gods in the Carthaginian pantheon, the other being her consort Ba'al, a deity of Phoenician origin.</History>
+    <Tooltip>Train Priestesses. Train Sacred Band pikemen.</Tooltip>
+  </Identity>
   <Obstruction>
     <Static width="17.0" depth="30.0"/>
   </Obstruction>
@@ -26,4 +23,7 @@
       units/cart_champion_infantry
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/carthaginians/temple_big.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/hele_gymnasion.xml
===================================================================
--- structures/hele_gymnasion.xml	(revision 9928)
+++ structures/hele_gymnasion.xml	(working copy)
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Gymnasion</SpecificName>
-    <Tooltip>Train Champion Units.</Tooltip>
-    <History>The gymnasion was a vital place in Hellenistic polises, where physical exercises were performed and social contacts established.</History>
-    <Icon>structures/gymnasion.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>220</BuildTime>
     <Resources>
@@ -15,20 +8,30 @@
       <metal>200</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2200</Max>
-  </Health>
-  <VisualActor>
-    <Actor>structures/hellenes/gymnasion.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>2200</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Gymnasion</SpecificName>
+    <Tooltip>Train Champion Units.</Tooltip>
+    <History>The gymnasion was a vital place in Hellenistic polises, where physical exercises were performed and social contacts established.</History>
+    <Icon>structures/gymnasion.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_gymnasium.xml</select>
+      <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_champion_cavalry_mace
@@ -37,11 +40,8 @@
       units/hele_champion_ranged_polis
     </Entities>
   </TrainingQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_gymnasium.xml</select>
-      <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
+  <VisualActor>
+    <Actor>structures/hellenes/gymnasion.xml</Actor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: structures/hele_fortress.xml
===================================================================
--- structures/hele_fortress.xml	(revision 9928)
+++ structures/hele_fortress.xml	(working copy)
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
+  <Cost>
+    <BuildTime>462</BuildTime>
+  </Cost>
+  <Footprint>
+    <Square width="26.0" depth="28.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>4620</Max>
+  </Health>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Epiteichisma</SpecificName>
     <Tooltip>Build Siege Engines. Garrison soldiers inside for stout defense.</Tooltip>
     <History>The Akropolis was usually a fortified citadel in the upper part of the city. The Athenian Akropolis was renowned for its marvellous temples, among which was the Parthenon, while the Acro-Corinthus was highly prized by the Macedonians for its strategic location and good defences. Fortresses (also called a "phrourion") were also built to guard passes and atop hills in order to command plains and valleys below.</History>
   </Identity>
-  <Cost>
-    <BuildTime>462</BuildTime>
-  </Cost>
-  <Health>
-    <Max>4620</Max>
-  </Health>
+  <Obstruction>
+    <Static width="24.0" depth="26.0"/>
+  </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/hele_mechanical_siege_oxybeles
@@ -22,11 +29,4 @@
   <VisualActor>
     <Actor>structures/hellenes/fortress_new.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="26.0" depth="28.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="24.0" depth="26.0"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_wall_tower_end_right.xml
===================================================================
--- structures/cart_wall_tower_end_right.xml	(revision 9928)
+++ structures/cart_wall_tower_end_right.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
+  <Footprint>
+    <Square width="9.0" depth="9.0"/>
+    <Height>18.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Migdál</SpecificName>
     <History>The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders.</History>
   </Identity>
+  <Obstruction>
+    <Static width="9.0" depth="9.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_tower_end_right.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>18.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="9.0" depth="9.0"/>
-  </Obstruction>
 </Entity>
Index: structures/celt_civil_centre.xml
===================================================================
--- structures/celt_civil_centre.xml	(revision 9928)
+++ structures/celt_civil_centre.xml	(working copy)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
+  <Footprint>
+    <Square width="28.0" depth="28.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Caer</SpecificName>
     <History>This was be the centre of the town, a great hall where the clan leader resided. All political matters were probably performed inside such a structure.</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/celts/civic_centre.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="28.0" depth="28.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
@@ -22,4 +19,7 @@
       units/celt_cavalry_javelinist_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/celts/civic_centre.xml</Actor>
+  </VisualActor>
 </Entity>
Index: structures/cart_farmstead.xml
===================================================================
--- structures/cart_farmstead.xml	(revision 9928)
+++ structures/cart_farmstead.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
+  <Footprint>
+    <Square width="15.0" depth="15.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Ahuzah</SpecificName>
     <History>Although there must have been many small farms as well, when the Carthaginians expanded into the hinterland, most farms and orchardist establishments were created by the wealthy segment of society that became known as the landowners, and the resulting estates were mostly worked by ?almost enslaved? Liby-Phoenicians, Numidians, and whomever they could get.</History>
   </Identity>
+  <Obstruction>
+    <Static width="15.0" depth="15.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/farmstead.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="15.0" depth="15.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="15.0" depth="15.0"/>
-  </Obstruction>
 </Entity>
Index: structures/cart_civil_centre.xml
===================================================================
--- structures/cart_civil_centre.xml	(revision 9928)
+++ structures/cart_civil_centre.xml	(working copy)
@@ -5,9 +5,6 @@
     <SpecificName>Merkaz</SpecificName>
     <History>Carthiginian's History</History>
   </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/civil_centre.xml</Actor>
-  </VisualActor>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/cart_infantry_spearman_b
@@ -15,4 +12,7 @@
       units/cart_cavalry_javelinist_b
     </Entities>
   </TrainingQueue>
+  <VisualActor>
+    <Actor>structures/carthaginians/civil_centre.xml</Actor>
+  </VisualActor>
 </Entity>
Index: template_unit_support_healer.xml
===================================================================
--- template_unit_support_healer.xml	(revision 9928)
+++ template_unit_support_healer.xml	(working copy)
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
-  <Identity>
-    <GenericName>Healer</GenericName>
-    <Tooltip>Heal units within his Aura.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <metal>120</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>85</Max>
-    <RegenRate>0.3</RegenRate>
-  </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
-  </UnitMotion>
-  <Vision>
-    <Range>48</Range>
-  </Vision>
   <Auras>
     <Heal>
       <Radius>20</Radius>
       <Speed>2000</Speed>
     </Heal>
   </Auras>
+  <Cost>
+    <Resources>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>85</Max>
+    <RegenRate>0.3</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Healer</GenericName>
+    <Tooltip>Heal units within his Aura.</Tooltip>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -40,4 +34,10 @@
       <trained>actor/singlesteps/steps_gravel.xml</trained>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>48</Range>
+  </Vision>
 </Entity>
Index: template_unit_hero_infantry_spearman.xml
===================================================================
--- template_unit_hero_infantry_spearman.xml	(revision 9928)
+++ template_unit_hero_infantry_spearman.xml	(working copy)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
-  <Identity>
-    <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Hero Infantry Melee</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>20.0</Pierce>
+      <Crush>0.0</Crush>
+    </Melee>
+    <Charge>
+      <Hack>20.0</Hack>
+      <Pierce>40.0</Pierce>
+    </Charge>
+  </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry Melee</Classes>
+  </Identity>
   <Loot>
     <wood>10</wood>
     <metal>10</metal>
   </Loot>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
   <UnitMotion>
     <WalkSpeed>5.7</WalkSpeed>
     <Run>
       <Speed>15.6</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
-    </Melee>
-    <Charge>
-      <Hack>20.0</Hack>
-      <Pierce>40.0</Pierce>
-    </Charge>
-  </Attack>
 </Entity>
Index: template_unit_cavalry_melee_spearman.xml
===================================================================
--- template_unit_cavalry_melee_spearman.xml	(revision 9928)
+++ template_unit_cavalry_melee_spearman.xml	(working copy)
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
-  <Identity>
-    <GenericName>Cavalry Spearman</GenericName>
-    <History>This was the weapon of choice from horseback. This was the unit that would eventually evolve to the medieval knight (after heavy influence by the Sarmartians and their lances). Infantry were an easy kill; just ride them down and skewer them with your stick and its point on the end. As with all cavalry - it was only the rich and the nobles who were able to fight from horseback due to the cost of owning such a beast.</History>
-    <Tooltip>Bonused vs. Infantry Swordsmen and Infantry Javelinists.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <wood>55</wood>
-    </Resources>
-  </Cost>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>7.0</Pierce>
@@ -30,4 +20,14 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
-</Entity>
\ No newline at end of file
+  <Cost>
+    <Resources>
+      <wood>55</wood>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Cavalry Spearman</GenericName>
+    <History>This was the weapon of choice from horseback. This was the unit that would eventually evolve to the medieval knight (after heavy influence by the Sarmartians and their lances). Infantry were an easy kill; just ride them down and skewer them with your stick and its point on the end. As with all cavalry - it was only the rich and the nobles who were able to fight from horseback due to the cost of owning such a beast.</History>
+    <Tooltip>Bonused vs. Infantry Swordsmen and Infantry Javelinists.</Tooltip>
+  </Identity>
+</Entity>
Index: template_structure.xml
===================================================================
--- template_structure.xml	(revision 9928)
+++ template_structure.xml	(working copy)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_entity_full">
-  <Identity>
-    <GenericName>Structure</GenericName>
-    <Classes datatype="tokens">Structure ConquestCritical</Classes>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>42.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <BuildingAI>
+    <DefaultArrowCount>0</DefaultArrowCount>
+    <GarrisonArrowMultiplier>0</GarrisonArrowMultiplier>
+  </BuildingAI>
   <BuildRestrictions>
     <PlacementType>standard</PlacementType>
     <Territory>allied</Territory>
   </BuildRestrictions>
-  <Minimap>
-    <Type>structure</Type>
-  </Minimap>
   <Cost>
     <Population>0</Population>
     <PopulationBonus>0</PopulationBonus>
@@ -22,55 +24,53 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Decay>
+    <Inactive/>
+    <DelayTime>0.0</DelayTime>
+    <SinkRate>4.0</SinkRate>
+    <SinkAccel>9.8</SinkAccel>
+  </Decay>
   <Health>
     <DeathType>corpse</DeathType>
     <RegenRate>0</RegenRate>
     <Healable>false</Healable>
     <Repairable>true</Repairable>
   </Health>
-  <Decay>
-    <Inactive/>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>4.0</SinkRate>
-    <SinkAccel>9.8</SinkAccel>
-  </Decay>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>42.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Identity>
+    <GenericName>Structure</GenericName>
+    <Classes datatype="tokens">Structure ConquestCritical</Classes>
+  </Identity>
+  <Minimap>
+    <Type>structure</Type>
+  </Minimap>
+  <Obstruction>
+    <Active>true</Active>
+    <BlockMovement>true</BlockMovement>
+    <BlockPathfinding>true</BlockPathfinding>
+    <BlockFoundation>true</BlockFoundation>
+    <BlockConstruction>true</BlockConstruction>
+    <DisableBlockMovement>false</DisableBlockMovement>
+    <DisableBlockPathfinding>false</DisableBlockPathfinding>
+  </Obstruction>
+  <OverlayRenderer/>
+  <RallyPoint/>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+      <constructed>interface/complete/building/complete_universal.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
-  <OverlayRenderer/>
   <Vision>
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
-  </Vision>  
-  <RallyPoint/>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-      <constructed>interface/complete/building/complete_universal.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <BuildingAI>
-    <DefaultArrowCount>0</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0</GarrisonArrowMultiplier>
-  </BuildingAI>
-  <Obstruction>
-    <Active>true</Active>
-    <BlockMovement>true</BlockMovement>
-    <BlockPathfinding>true</BlockPathfinding>
-    <BlockFoundation>true</BlockFoundation>
-    <BlockConstruction>true</BlockConstruction>
-    <DisableBlockMovement>false</DisableBlockMovement>
-    <DisableBlockPathfinding>false</DisableBlockPathfinding>
-  </Obstruction>
+  </Vision>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
Index: template_gaia_geo_mineral.xml
===================================================================
--- template_gaia_geo_mineral.xml	(revision 9928)
+++ template_gaia_geo_mineral.xml	(working copy)
@@ -10,10 +10,10 @@
     <Type>metal</Type>
     <Colour r="192" g="192" b="0"/>
   </Minimap>
-  <Selectable/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>metal.ore</Type>
   </ResourceSupply>
+  <Selectable/>
 </Entity>
Index: template_structure_economic_farmstead.xml
===================================================================
--- template_structure_economic_farmstead.xml	(revision 9928)
+++ template_structure_economic_farmstead.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
-  <Identity>
-    <GenericName>Farmstead</GenericName>
-    <Tooltip>Dropsite for the Food resource.</Tooltip>
-    <Classes datatype="tokens">Village</Classes>
-    <Icon>structures/farmstead.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>15.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Farmstead</Category>
   </BuildRestrictions>
@@ -15,27 +14,26 @@
       <wood>100</wood>
     </Resources>
   </Cost>
-  <Health>
-    <Max>900</Max>
-  </Health>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>15.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="14.0" depth="14.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>900</Max>
+  </Health>
+  <Identity>
+    <GenericName>Farmstead</GenericName>
+    <Tooltip>Dropsite for the Food resource.</Tooltip>
+    <Classes datatype="tokens">Village</Classes>
+    <Icon>structures/farmstead.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="12.0" depth="12.0"/>
   </Obstruction>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
+  <RallyPoint disable=""/>
+  <ResourceDropsite>
+    <Types>food</Types>
+  </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_farmstead.xml</select>
@@ -43,8 +41,10 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <ResourceDropsite>
-    <Types>food</Types>
-  </ResourceDropsite>
-  <RallyPoint disable=""/>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_structure_civic_civil_centre.xml
===================================================================
--- template_structure_civic_civil_centre.xml	(revision 9928)
+++ template_structure_civic_civil_centre.xml	(working copy)
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>Civic Centre</GenericName>
-    <Tooltip>Build upon a settlement to capture territory. Train citizens.</Tooltip>
-    <Classes datatype="tokens">
-		Village 
-		Defensive
-		CivCentre
-	</Classes>
-    <Icon>structures/civic_centre.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <PlacementType>settlement</PlacementType>
     <Territory>all</Territory>
@@ -25,27 +20,35 @@
       <metal>300</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>3000</Max>
-  </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>20</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry Cavalry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>3000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Civic Centre</GenericName>
+    <Tooltip>Build upon a settlement to capture territory. Train citizens.</Tooltip>
+    <Classes datatype="tokens">
+		Village 
+		Defensive
+		CivCentre
+	</Classes>
+    <Icon>structures/civic_centre.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
+  <ResourceDropsite>
+    <Types>food wood stone metal</Types>
+  </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_civ_center.xml</select>
@@ -53,22 +56,19 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <GarrisonHolder>
-    <Max>20</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry Cavalry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
-  <ResourceDropsite>
-    <Types>food wood stone metal</Types>
-  </ResourceDropsite>
+  <TerritoryInfluence>
+    <Radius>256</Radius>
+    <Weight>65536</Weight>
+  </TerritoryInfluence>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen
     </Entities>
   </TrainingQueue>
-  <TerritoryInfluence>
-    <Radius>256</Radius>
-    <Weight>65536</Weight>
-  </TerritoryInfluence>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_champion_cavalry_spearman.xml
===================================================================
--- template_unit_champion_cavalry_spearman.xml	(revision 9928)
+++ template_unit_champion_cavalry_spearman.xml	(working copy)
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
-  <Identity>
-    <GenericName>Champion Cavalry Spearman</GenericName>
-    <Classes datatype="tokens">Melee</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>16</BuildTime>
-    <Resources>
-      <wood>80</wood>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>160</Max>
-  </Health>
   <Armour>
     <Hack>8.0</Hack>
     <Pierce>12.0</Pierce>
@@ -34,4 +21,17 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <BuildTime>16</BuildTime>
+    <Resources>
+      <wood>80</wood>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>160</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Cavalry Spearman</GenericName>
+    <Classes datatype="tokens">Melee</Classes>
+  </Identity>
 </Entity>
Index: template_unit_cavalry_melee_swordsman.xml
===================================================================
--- template_unit_cavalry_melee_swordsman.xml	(revision 9928)
+++ template_unit_cavalry_melee_swordsman.xml	(working copy)
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
-  <Identity>
-    <GenericName>Cavalry Swordsman</GenericName>
-    <History>Fighting from horseback with a sword is a tricky thing to do. This required usage of a sword that was longer than the typical infantry sword. One needed a good reach to attack from the height of a horse. If you were without spear (the ideal weapon of choice) it was probably because you needed your hands free to do other tasks such as riding hard and fast. It wasn't uncommon for the men to dismount and attack from foot if they were armed with only a sword.</History>
-    <Tooltip>Bonused vs. Support Units and Infantry Archers.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <metal>60</metal>
-    </Resources>
-  </Cost>
-  <UnitMotion>
-    <WalkSpeed>9.7</WalkSpeed>
-    <Run>
-      <Speed>27.6</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>6.0</Pierce>
@@ -38,4 +20,22 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <Resources>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Cavalry Swordsman</GenericName>
+    <History>Fighting from horseback with a sword is a tricky thing to do. This required usage of a sword that was longer than the typical infantry sword. One needed a good reach to attack from the height of a horse. If you were without spear (the ideal weapon of choice) it was probably because you needed your hands free to do other tasks such as riding hard and fast. It wasn't uncommon for the men to dismount and attack from foot if they were armed with only a sword.</History>
+    <Tooltip>Bonused vs. Support Units and Infantry Archers.</Tooltip>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>9.7</WalkSpeed>
+    <Run>
+      <Speed>27.6</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_hero_cavalry_javelinist.xml
===================================================================
--- template_unit_hero_cavalry_javelinist.xml	(revision 9928)
+++ template_unit_hero_cavalry_javelinist.xml	(working copy)
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
-  <Identity>
-    <GenericName>Hero Cavalry Javelinist</GenericName>
-    <Classes datatype="tokens">Hero Cavalry Ranged</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
+  <Armour>
+    <Hack>8.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>40.0</Pierce>
+    </Ranged>
+  </Attack>
   <Cost>
     <Population>2</Population>
     <BuildTime>45</BuildTime>
@@ -17,6 +20,14 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Health>
+    <Max>450</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero Cavalry Javelinist</GenericName>
+    <Classes datatype="tokens">Hero Cavalry Ranged</Classes>
+  </Identity>
   <Loot>
     <xp>450</xp>
     <food>10</food>
@@ -24,15 +35,9 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <Health>
-    <Max>450</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
-  <Armour>
-    <Hack>8.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>7.0</Crush>
-  </Armour>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
   <UnitMotion>
     <WalkSpeed>10.1</WalkSpeed>
     <Run>
@@ -41,9 +46,4 @@
       <RangeMin>16.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>40.0</Pierce>
-    </Ranged>
-  </Attack>
 </Entity>
Index: template_unit_cavalry_melee.xml
===================================================================
--- template_unit_cavalry_melee.xml	(revision 9928)
+++ template_unit_cavalry_melee.xml	(working copy)
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
-  <Identity>
-    <GenericName>Melee Cavalry</GenericName>
-  </Identity>
   <Attack>
     <Melee>
       <Hack>5.0</Hack>
@@ -19,4 +16,7 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Identity>
+    <GenericName>Melee Cavalry</GenericName>
+  </Identity>
 </Entity>
Index: units/hele_infantry_javelinist_b.xml
===================================================================
--- units/hele_infantry_javelinist_b.xml	(revision 9928)
+++ units/hele_infantry_javelinist_b.xml	(working copy)
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
+  <Attack>
+    <Ranged>
+      <MaxRange>44.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Builder>
+    <Entities datatype="tokens">
+      structures/hele_gymnasion
+      structures/hele_theatron
+      structures/hele_prytaneion
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>hele</Civ>
 	<SelectionGroupName>units/hele_infantry_javelinist_b</SelectionGroupName>
@@ -11,27 +28,10 @@
   <Promotion>
     <Entity>units/hele_infantry_javelinist_a</Entity>
   </Promotion>
-  <Cost>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
   <Vision>
     <Range>88</Range>
   </Vision>
-  <Attack>
-    <Ranged>
-      <MaxRange>44.0</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/hele_gymnasion
-      structures/hele_theatron
-      structures/hele_prytaneion
-    </Entities>
-  </Builder>
 </Entity>
Index: units/hele_ship_merchant.xml
===================================================================
--- units/hele_ship_merchant.xml	(revision 9928)
+++ units/hele_ship_merchant.xml	(working copy)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_merchant">
+  <Footprint replace="">
+    <Square width="8.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Emporiko Naus</SpecificName>
     <History>Need History</History>
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="6.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/merchant_new.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Square width="8.0" depth="24.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="6.0"/>
-  </Obstruction>
 </Entity>
Index: units/hele_mechanical_siege_lithobolos.xml
===================================================================
--- units/hele_mechanical_siege_lithobolos.xml	(revision 9928)
+++ units/hele_mechanical_siege_lithobolos.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_onager">
+  <Footprint replace="">
+    <Square width="3.5" depth="8.0"/>
+    <Height>3.5</Height>
+  </Footprint>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Lithobolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
   <Vision>
     <Range>99</Range>
   </Vision>
   <VisualActor>
     <Actor>units/hellenes/siege_rock.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Square width="3.5" depth="8.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
 </Entity>
Index: units/celt_champion_infantry_brit.xml
===================================================================
--- units/celt_champion_infantry_brit.xml	(revision 9928)
+++ units/celt_champion_infantry_brit.xml	(working copy)
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack>9.0</Hack>
+    <Pierce>5.0</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>25.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>50.0</Hack>
+    </Charge>
+  </Attack>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brythonic Delamokludda</SpecificName>
@@ -7,24 +19,12 @@
     <History>Two-handed swordsmen from Briton. These men are veteran soldiers who offer their lives in service to their Brythonic lords.</History>
     <Icon>units/celt_champion_infantry_brit.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>9.0</Hack>
-    <Pierce>5.0</Pierce>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.66</WalkSpeed>
     <Run>
       <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>25.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>50.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/champion_unit_3.xml</Actor>
   </VisualActor>
Index: units/celt_cavalry_javelinist_a.xml
===================================================================
--- units/celt_cavalry_javelinist_a.xml	(revision 9928)
+++ units/celt_cavalry_javelinist_a.xml	(working copy)
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_javelinist_b">
+  <Armour>
+    <Hack>3.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>3.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>36.0</Pierce>
+      <MaxRange>48</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>130</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,26 +23,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>130</Max>
-  </Health>
-  <Armour>
-    <Hack>3.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>3.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>11.44</WalkSpeed>
     <Run>
       <Speed>34.32</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>36.0</Pierce>
-      <MaxRange>48</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_a.xml</Actor>
   </VisualActor>
Index: units/samnite_skirmisher.xml
===================================================================
--- units/samnite_skirmisher.xml	(revision 9928)
+++ units/samnite_skirmisher.xml	(working copy)
@@ -9,10 +9,10 @@
     <History>The Samnites were an aboriginal people of Southern and Central Italy. They were fierce warriors and frequently rebelled against Roman rule.</History>
     <Icon>units/samnite_skirmisher.png</Icon>
   </Identity>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/carthaginians/samnite_skirmisher.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
 </Entity>
Index: units/hele_champion_cavalry_mace.xml
===================================================================
--- units/hele_champion_cavalry_mace.xml	(revision 9928)
+++ units/hele_champion_cavalry_mace.xml	(working copy)
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
+  <Armour>
+    <Hack>10.0</Hack>
+  </Armour>
+  <Attack>
+    <Melee>
+      <MaxRange>6.0</MaxRange>
+    </Melee>
+    <Charge>
+      <Hack>26.0</Hack>
+      <Pierce>60.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
+  <Cost>
+    <Resources>
+      <metal>20</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>hele</Civ>
 	<GenericName>Companion Cavalry</GenericName>
@@ -8,31 +27,12 @@
     <History>The Hetairoi, or Companion cavalry, were a preferred general stand in Macedonian armies. Macedonian noblemen made up this elite cavalry unit, which was key to victory for Macedonian kings starting with Philip II, who increased their number from 600 to several thousand.</History>
     <Icon>units/hele_champion_cavalry_mace.png</Icon>
   </Identity>
-  <Cost>
-    <Resources>
-      <metal>20</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Hack>10.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>8.8</WalkSpeed>
     <Run>
       <Speed>20.75</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <MaxRange>6.0</MaxRange>
-    </Melee>
-    <Charge>
-      <Hack>26.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
-  </Attack>
   <Vision>
     <Range>110</Range>
   </Vision>
Index: units/celt_cavalry_javelinist_e.xml
===================================================================
--- units/celt_cavalry_javelinist_e.xml	(revision 9928)
+++ units/celt_cavalry_javelinist_e.xml	(working copy)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_javelinist_a">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>37.0</Pierce>
+      <MaxRange>52</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
+  <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>10.56</WalkSpeed>
     <Run>
       <Speed>31.68</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>37.0</Pierce>
-      <MaxRange>52</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/hele_hero_xenophon.xml
===================================================================
--- units/hele_hero_xenophon.xml	(revision 9928)
+++ units/hele_hero_xenophon.xml	(working copy)
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_javelinist">
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Xenophon</SpecificName>
@@ -16,12 +22,6 @@
   <Vision>
     <Range>88</Range>
   </Vision>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <VisualActor>
     <Actor>units/hellenes/xenophon.xml</Actor>
   </VisualActor>
Index: units/mace_argyraspis.xml
===================================================================
--- units/mace_argyraspis.xml	(revision 9928)
+++ units/mace_argyraspis.xml	(working copy)
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_hypaspist">
-  <VisualActor>
-    <Actor>units/macedonians/mace_champion_argyraspis.xml</Actor>
-  </VisualActor>
-  <Identity>
-    <SpecificName>Argyraspides (Silver shield)</SpecificName>
-	<Tooltip>Alexander's elite guard infantry.</Tooltip>
-    <Icon>units/macedonian_argyraspidai.png</Icon>
-  </Identity>
-  <Health>
-    <Max>145</Max>
-  </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>12.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.5</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>11.0</Hack>
@@ -35,5 +18,22 @@
       <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
+  <Health>
+    <Max>145</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Argyraspides (Silver shield)</SpecificName>
+	<Tooltip>Alexander's elite guard infantry.</Tooltip>
+    <Icon>units/macedonian_argyraspidai.png</Icon>
+  </Identity>
   <Promotion disable=""/>
+  <UnitMotion>
+    <WalkSpeed>5.5</WalkSpeed>
+    <Run>
+      <Speed>15.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/macedonians/mace_champion_argyraspis.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_hero_vercingetorix.xml
===================================================================
--- units/celt_hero_vercingetorix.xml	(revision 9928)
+++ units/celt_hero_vercingetorix.xml	(working copy)
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
+  <Armour>
+    <Hack>10.0</Hack>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>27.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>54.0</Hack>
+    </Charge>
+  </Attack>
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
+  <Cost>
+    <Resources>
+      <metal>260</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Vercingetorix</SpecificName>
@@ -7,34 +29,12 @@
     <History>The most famous of all Celts, Vercingetorix lead the rebelling Gallic tribes against the might of Rome and Julius Caesars veteran army in 54 BC. Although successful in defeating several Roman forces, Vercingetorix was unable to defeat Caesar, who eventually surrounded the Celtic leaders in the town of Alesia along with 100,000 men. When a relief army arrived to lift the epic siege, the Romans were out numbered 7 to 1 but still defeated the Celts. Vercingetorix surrendered and was executed.</History>
     <Icon>units/celt_hero_vercingetorix.png</Icon>
   </Identity>
-  <Cost>
-    <Resources>
-      <metal>260</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Hack>10.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.74</WalkSpeed>
     <Run>
       <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
-  <Attack>
-    <Melee>
-      <Hack>27.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>54.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/vercingetorix_horse.xml</Actor>
   </VisualActor>
Index: units/hele_infantry_spearman_b.xml
===================================================================
--- units/hele_infantry_spearman_b.xml	(revision 9928)
+++ units/hele_infantry_spearman_b.xml	(working copy)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
+  <Armour>
+    <Pierce>7.0</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <MaxRange>6.0</MaxRange>
+    </Melee>
+    <Charge>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
+  <Builder>
+    <Entities datatype="tokens">
+      structures/hele_gymnasion
+      structures/hele_theatron
+      structures/hele_prytaneion
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <wood>60</wood>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>hele</Civ>
 	<SelectionGroupName>units/hele_infantry_spearman_b</SelectionGroupName>
@@ -13,33 +36,10 @@
   <Promotion>
     <Entity>units/hele_infantry_spearman_a</Entity>
   </Promotion>
-  <Cost>
-    <Resources>
-      <wood>60</wood>
-    </Resources>
-  </Cost>
   <Vision>
     <Range>88</Range>
   </Vision>
-  <Armour>
-    <Pierce>7.0</Pierce>
-  </Armour>
-  <Attack>
-    <Melee>
-      <MaxRange>6.0</MaxRange>
-    </Melee>
-    <Charge>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_spearman_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/hele_gymnasion
-      structures/hele_theatron
-      structures/hele_prytaneion
-    </Entities>
-  </Builder>
 </Entity>
Index: units/celt_support_female_citizen.xml
===================================================================
--- units/celt_support_female_citizen.xml	(revision 9928)
+++ units/celt_support_female_citizen.xml	(working copy)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Bodu</SpecificName>
-    <History>Celtic women enjoyed many freedoms, especially compared to their Greek and Roman counterparts. Although they did not fight in battle as some believe Gallic women were quite large and very strong compared to most men. They were able to own property and were capable of gaining considerable wealth. Some noblewomen took over power when their husbands died, such as Boudicca of the Iceni. In addition, family trees were drawn up along female lines, men claiming their ancestry through female ancestors.</History>
-    <Icon>units/celt_support_female_citizen.png</Icon>
-  </Identity>
-  <Health>
-    <Max>75</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
     </Melee>
   </Attack>
-  <VisualActor>
-    <Actor>units/celts/female_citizen.xml</Actor>
-  </VisualActor>
   <Builder>
     <Entities datatype="tokens">
       structures/celt_sb1
     </Entities>
   </Builder>
+  <Health>
+    <Max>75</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Bodu</SpecificName>
+    <History>Celtic women enjoyed many freedoms, especially compared to their Greek and Roman counterparts. Although they did not fight in battle as some believe Gallic women were quite large and very strong compared to most men. They were able to own property and were capable of gaining considerable wealth. Some noblewomen took over power when their husbands died, such as Boudicca of the Iceni. In addition, family trees were drawn up along female lines, men claiming their ancestry through female ancestors.</History>
+    <Icon>units/celt_support_female_citizen.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/female_citizen.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_hero_caros.xml
===================================================================
--- units/iber_hero_caros.xml	(revision 9928)
+++ units/iber_hero_caros.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <Hack>30.0</Hack>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <metal>225</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Caros</SpecificName>
@@ -9,14 +19,4 @@
   <VisualActor>
     <Actor>units/iberians/hero_caros.xml</Actor>
   </VisualActor>
-  <Cost>
-    <Resources>
-      <metal>225</metal>
-    </Resources>
-  </Cost>
-  <Attack>
-    <Melee>
-      <Hack>30.0</Hack>
-    </Melee>
-  </Attack>
 </Entity>
Index: units/celt_champion_infantry_gaul.xml
===================================================================
--- units/celt_champion_infantry_gaul.xml	(revision 9928)
+++ units/celt_champion_infantry_gaul.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack>8.0</Hack>
+	<Pierce>6</Pierce>
+    <Crush>8.0</Crush>
+  </Armour>
+  <Cost>
+    <Resources>
+      <metal>75</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gallic Solduros</SpecificName>
@@ -7,16 +17,6 @@
     <History>The sword among Celts varies in reputation and commonality. Shortswords, essentially truly just long, broad-bladed daggers, were common, but cheaply made, and most likely the swords refered to as bending after a hard strike, and needing bent back into place. The iron construction of longswords, such as used here, was greatly superior, but also much more expensive. The longsword was primarily a weapon of aristocracy and experienced professional soldiers, who could either afford the weapon, have it made for them by their lord as a reward for service, passed down to them by family, or looted from the field.</History>
     <Icon>units/celt_champion_infantry_gaul.png</Icon>
   </Identity>
-  <Cost>
-    <Resources>
-      <metal>75</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Hack>8.0</Hack>
-	<Pierce>6</Pierce>
-    <Crush>8.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.66</WalkSpeed>
     <Run>
Index: units/hele_cavalry_javelinist_b.xml
===================================================================
--- units/hele_cavalry_javelinist_b.xml	(revision 9928)
+++ units/hele_cavalry_javelinist_b.xml	(working copy)
@@ -17,5 +17,4 @@
   <VisualActor>
     <Actor>units/hellenes/cavalry_javelinist_b.xml</Actor>
   </VisualActor>
-  
 </Entity>
Index: units/celt_infantry_javelinist_a.xml
===================================================================
--- units/celt_infantry_javelinist_a.xml	(revision 9928)
+++ units/celt_infantry_javelinist_a.xml	(working copy)
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_javelinist_b">
+  <Armour>
+    <Hack>3.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>36.0</Pierce>
+      <MaxRange>44</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,26 +23,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>3.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.48</WalkSpeed>
     <Run>
       <Speed>22.44</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>36.0</Pierce>
-      <MaxRange>44</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_a.xml</Actor>
   </VisualActor>
Index: units/samnite_swordsman.xml
===================================================================
--- units/samnite_swordsman.xml	(revision 9928)
+++ units/samnite_swordsman.xml	(working copy)
@@ -9,10 +9,10 @@
     <History>The Samnites were an aboriginal people of Southern and Central Italy. They were fierce warriors and frequently rebelled against Roman rule.</History>
     <Icon>units/samnite_swordsman.png</Icon>
   </Identity>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/carthaginians/samnite_swordsman.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
 </Entity>
Index: units/celt_infantry_javelinist_e.xml
===================================================================
--- units/celt_infantry_javelinist_e.xml	(revision 9928)
+++ units/celt_infantry_javelinist_e.xml	(working copy)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_javelinist_a">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>37.0</Pierce>
+      <MaxRange>48</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
+  <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.6</WalkSpeed>
     <Run>
       <Speed>19.8</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>37.0</Pierce>
-      <MaxRange>48</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/iber_mechanical_siege_ram.xml
===================================================================
--- units/iber_mechanical_siege_ram.xml	(revision 9928)
+++ units/iber_mechanical_siege_ram.xml	(working copy)
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_ram">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Ariete</SpecificName>
-    <Tooltip>Siege Ram</Tooltip>
-    <History>It is not known if any of the Iberians culture tribes used rams; the unit is added to the civ roster for gameplay purposes.</History>
-    <Icon>units/iber_mechanical_siege_ram.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/siege_ram.xml</Actor>
-  </VisualActor>
+  <Armour>
+    <Pierce>20.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Crush>50.0</Crush>
+    </Melee>
+    <Charge>
+      <Crush>100.0</Crush>
+    </Charge>
+  </Attack>
   <Cost>
     <BuildTime>25</BuildTime>
     <Resources>
@@ -21,31 +23,29 @@
     <Square width="6.75" depth="10.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>3</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>250</Max>
+  </Health>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Ariete</SpecificName>
+    <Tooltip>Siege Ram</Tooltip>
+    <History>It is not known if any of the Iberians culture tribes used rams; the unit is added to the civ roster for gameplay purposes.</History>
+    <Icon>units/iber_mechanical_siege_ram.png</Icon>
+  </Identity>
   <Obstruction>
     <Unit radius="3.75"/>
   </Obstruction>
-  <Health>
-    <Max>250</Max>
-  </Health>
-  <Armour>
-    <Pierce>20.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.5</WalkSpeed>
   </UnitMotion>
-  <GarrisonHolder>
-    <Max>3</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
-  <Attack>
-    <Melee>
-      <Crush>50.0</Crush>
-    </Melee>
-    <Charge>
-      <Crush>100.0</Crush>
-    </Charge>
-  </Attack>
+  <VisualActor>
+    <Actor>structures/iberians/siege_ram.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_champion_cavalry_brit.xml
===================================================================
--- units/celt_champion_cavalry_brit.xml	(revision 9928)
+++ units/celt_champion_cavalry_brit.xml	(working copy)
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Brythonic Carbanto</SpecificName>
-    <Tooltip>Bonus vs. Infantry. High trample damage.</Tooltip>
-    <History>The Britons were one of the last European peoples to use two-horse chariots in combat. They had two iron-rimmed wheels and a flat riding platform that typically carried a driver and a warrior. Useless as shock weapons against tightly packed troops, they were useful for running down individual soldiers and as a stable mount to launch javelins from. The heads of defeated opponents often adorned the chassis to show the warriors prowess.</History>
-    <Icon>units/celt_champion_cavalry_brit.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Crush>12.0</Crush>
+  </Armour>
   <Cost>
     <Population>4</Population>
     <BuildTime>20</BuildTime>
@@ -16,13 +13,23 @@
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Crush>12.0</Crush>
-  </Armour>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Brythonic Carbanto</SpecificName>
+    <Tooltip>Bonus vs. Infantry. High trample damage.</Tooltip>
+    <History>The Britons were one of the last European peoples to use two-horse chariots in combat. They had two iron-rimmed wheels and a flat riding platform that typically carried a driver and a warrior. Useless as shock weapons against tightly packed troops, they were useful for running down individual soldiers and as a stable mount to launch javelins from. The heads of defeated opponents often adorned the chassis to show the warriors prowess.</History>
+    <Icon>units/celt_champion_cavalry_brit.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
   <UnitMotion>
     <WalkSpeed>10.5</WalkSpeed>
     <Run>
@@ -32,11 +39,4 @@
   <VisualActor>
     <Actor>units/celts/champion_unit_4.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="1.5"/>
-  </Obstruction>
 </Entity>
Index: units/hele_hero_leonidas.xml
===================================================================
--- units/hele_hero_leonidas.xml	(revision 9928)
+++ units/hele_hero_leonidas.xml	(working copy)
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Leonidas</SpecificName>
-    <Tooltip>Hero Aura: Increased Spartiate and Hoplite Attack.</Tooltip>
-    <History>The king of Sparta, who fought and died at the battle of Thermopylae in 480 BC. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw.</History>
-    <Icon>units/hele_hero_leonidas.png</Icon>
-  </Identity>
-  <Cost>
-    <Resources>
-      <metal>110</metal>
-    </Resources>
-  </Cost>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-  <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
-  </Auras>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
@@ -33,6 +12,27 @@
       <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
+  <Auras>
+    <Fear>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Fear>
+  </Auras>
+  <Cost>
+    <Resources>
+      <metal>110</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Leonidas</SpecificName>
+    <Tooltip>Hero Aura: Increased Spartiate and Hoplite Attack.</Tooltip>
+    <History>The king of Sparta, who fought and died at the battle of Thermopylae in 480 BC. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw.</History>
+    <Icon>units/hele_hero_leonidas.png</Icon>
+  </Identity>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/leonidas.xml</Actor>
   </VisualActor>
Index: units/iber_champion_infantry.xml
===================================================================
--- units/iber_champion_infantry.xml	(revision 9928)
+++ units/iber_champion_infantry.xml	(working copy)
@@ -6,13 +6,13 @@
     <Icon>units/iber_champion_infantry.png</Icon>
     <History>The Devoted were war-hardened veterans of Iberian mercenaries hired out by foreign powers to fight in far-off conflicts. Fighting with and against diverse types of opponents, these men were deeply knowledgeable about various fighting styles and tactics. Once they had returned home from combat they were lavishly taken care of, rising to important positions in society.</History>
   </Identity>
-  <VisualActor>
-    <Actor>units/iberians/champion_unit_1.xml</Actor>
-  </VisualActor>
   <UnitMotion>
     <WalkSpeed>9.3</WalkSpeed>
     <Run>
       <Speed>17.6</Speed>
     </Run>
   </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/champion_unit_1.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/hele_hero_demetrius.xml
===================================================================
--- units/hele_hero_demetrius.xml	(revision 9928)
+++ units/hele_hero_demetrius.xml	(working copy)
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_pikeman">
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <Identity>
     <Civ>hele</Civ>
 	<GenericName>Demetrius the Besieger</GenericName>
@@ -11,12 +17,6 @@
   <Vision>
     <Range>88</Range>
   </Vision>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <VisualActor>
     <Actor>units/hellenes/demetrius.xml</Actor>
   </VisualActor>
Index: units/iber_infantry_javelinist_a.xml
===================================================================
--- units/iber_infantry_javelinist_a.xml	(revision 9928)
+++ units/iber_infantry_javelinist_a.xml	(working copy)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_javelinist_b">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>36.0</Pierce>
+      <MaxRange>44</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_infantry_javelinist_e</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/iberians/infantry_javelinist_a.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.8</WalkSpeed>
     <Run>
       <Speed>20.4</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>36.0</Pierce>
-      <MaxRange>44</MaxRange>
-    </Ranged>
-  </Attack>
+  <VisualActor>
+    <Actor>units/iberians/infantry_javelinist_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_javelinist_e.xml
===================================================================
--- units/iber_infantry_javelinist_e.xml	(revision 9928)
+++ units/iber_infantry_javelinist_e.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_javelinist_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/infantry_javelinist_e.xml</Actor>
-  </VisualActor>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
-    <Run>
-      <Speed>18.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Pierce>0.0</Pierce>
@@ -31,5 +13,23 @@
       <PrepareTime>2000</PrepareTime>
     </Ranged>
   </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
   <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>6.0</WalkSpeed>
+    <Run>
+      <Speed>18.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/infantry_javelinist_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_cavalry_spearman_a.xml
===================================================================
--- units/iber_cavalry_spearman_a.xml	(revision 9928)
+++ units/iber_cavalry_spearman_a.xml	(working copy)
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_cavalry_spearman_b">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>9.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>6.0</Hack>
+      <Pierce>16.0</Pierce>
+    </Melee>
+    <Charge>
+      <Hack>18.0</Hack>
+      <Pierce>48.0</Pierce>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_cavalry_spearman_e</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/iberians/cavalry_spearman_a.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>9.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>8.4</WalkSpeed>
     <Run>
       <Speed>25.2</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
-    </Charge>
-  </Attack>
+  <VisualActor>
+    <Actor>units/iberians/cavalry_spearman_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_swordsman_a.xml
===================================================================
--- units/iber_infantry_swordsman_a.xml	(revision 9928)
+++ units/iber_infantry_swordsman_a.xml	(working copy)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_swordsman_b">
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>23.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>46.0</Hack>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_infantry_swordsman_e</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/iberians/infantry_swordsman_a.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
-  <Attack>
-    <Melee>
-      <Hack>23.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>46.0</Hack>
-    </Charge>
-  </Attack>
-  <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/infantry_swordsman_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_infantry_spearman_b.xml
===================================================================
--- units/celt_infantry_spearman_b.xml	(revision 9928)
+++ units/celt_infantry_spearman_b.xml	(working copy)
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
+  <Armour>
+    <Hack>3.0</Hack>
+  </Armour>
+  <Builder>
+    <Entities datatype="tokens">
+      -structures/{civ}_fortress
+      structures/celt_kennel
+      structures/celt_sb1
+      structures/celt_fortress_b
+      structures/celt_fortress_g
+	</Entities>
+  </Builder>
   <Identity>
     <Civ>celt</Civ>
 	<SelectionGroupName>units/celt_infantry_spearman_b</SelectionGroupName>
@@ -10,9 +22,6 @@
   <Promotion>
     <Entity>units/celt_infantry_spearman_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>3.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.1</WalkSpeed>
     <Run>
@@ -22,13 +31,4 @@
   <VisualActor>
     <Actor>units/celts/infantry_spearman_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      -structures/{civ}_fortress
-      structures/celt_kennel
-      structures/celt_sb1
-      structures/celt_fortress_b
-      structures/celt_fortress_g
-	</Entities>
-  </Builder>
 </Entity>
Index: units/hele_cavalry_swordsman_a.xml
===================================================================
--- units/hele_cavalry_swordsman_a.xml	(revision 9928)
+++ units/hele_cavalry_swordsman_a.xml	(working copy)
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_b">
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>21.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>63.0</Hack>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,30 +25,13 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>140</Max>
-  </Health>
   <UnitMotion>
     <WalkSpeed>8.8</WalkSpeed>
     <Run>
       <Speed>26.4</Speed>
     </Run>
   </UnitMotion>
-  <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Hack>21.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>63.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/cavalry_swordsman_a.xml</Actor>
   </VisualActor>
-  
 </Entity>
Index: units/iber_cavalry_spearman_e.xml
===================================================================
--- units/iber_cavalry_spearman_e.xml	(revision 9928)
+++ units/iber_cavalry_spearman_e.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_cavalry_spearman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/cavalry_spearman_e.xml</Actor>
-  </VisualActor>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>150</Max>
-  </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>11.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>8.0</WalkSpeed>
-    <Run>
-      <Speed>24.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>7.0</Hack>
@@ -33,5 +15,23 @@
       <Pierce>51.0</Pierce>
     </Charge>
   </Attack>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
   <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+    <Run>
+      <Speed>24.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/cavalry_spearman_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_swordsman_e.xml
===================================================================
--- units/iber_infantry_swordsman_e.xml	(revision 9928)
+++ units/iber_infantry_swordsman_e.xml	(working copy)
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_swordsman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/infantry_swordsman_e.xml</Actor>
-  </VisualActor>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>120</Max>
-  </Health>
+  <Armour>
+    <Hack>8.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
   <Attack>
     <Melee>
       <Hack>24.0</Hack>
@@ -20,16 +13,23 @@
       <Hack>48.0</Hack>
     </Charge>
   </Attack>
-  <Armour>
-    <Hack>8.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>7.0</Crush>
-  </Armour>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
   <UnitMotion>
     <WalkSpeed>5.6</WalkSpeed>
     <Run>
       <Speed>16.8</Speed>
     </Run>
   </UnitMotion>
-  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/iberians/infantry_swordsman_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_champion_cavalry_gaul.xml
===================================================================
--- units/celt_champion_cavalry_gaul.xml	(revision 9928)
+++ units/celt_champion_cavalry_gaul.xml	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
+  <Armour>
+    <Hack>7.0</Hack>
+  </Armour>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gallic Brihent</SpecificName>
@@ -7,9 +10,6 @@
     <History>In Gaul we know of heavy cavalry, possibly predecessors to later knights. They used a Celtic lance overhand, a good shield, and wore good armor. Vercingetorix was famous for having a number of them, but their use long precedes him. Heavy Celtic horsemen are found in graves as early as the 600s, with scale coats. Later, with the advent of mail, their armor would largely change to this. They would be experienced, aristocratic or noblemen, or their retainers equipped in kind. Each man would probably have several personal attendants. Some would be powerful noblemen, such as chiefs and kings. In battle, they would be on par with much of the best heavy cavalry in western Europe, due to superior armor, such as mail armor with additional layers of mail over the vital organs, weapons such as high-quality iron spearheads, swords, and a thong of javelins, giving them versatility, and years of experience and training. Their historical use saw them capable of breaking even well-defended positions, or acting to great effect in flanking manuevers.</History>
     <Icon>units/celt_champion_cavalry_gaul.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>7.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.3</WalkSpeed>
     <Run>
Index: units/hele_cavalry_swordsman_e.xml
===================================================================
--- units/hele_cavalry_swordsman_e.xml	(revision 9928)
+++ units/hele_cavalry_swordsman_e.xml	(working copy)
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>150</Max>
-  </Health>
-  <UnitMotion>
-    <WalkSpeed>8.4</WalkSpeed>
-    <Run>
-      <Speed>25.2</Speed>
-    </Run>
-  </UnitMotion>
   <Armour>
     <Hack>8.0</Hack>
     <Pierce>10.0</Pierce>
@@ -28,8 +13,23 @@
       <Hack>66.0</Hack>
     </Charge>
   </Attack>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>8.4</WalkSpeed>
+    <Run>
+      <Speed>25.2</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/cavalry_swordsman_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/thespian_melanochitones.xml
===================================================================
--- units/thespian_melanochitones.xml	(revision 9928)
+++ units/thespian_melanochitones.xml	(working copy)
@@ -9,10 +9,10 @@
     <History>The Thespians were among the 700 or so soldiers to stay behind and hold the pass at Thermopylae to delay the Persians long enough for the rest of the Greek army to withdraw. This heroic deed made the Thespians "friends forever" to the Spartans.</History>
     <Icon>units/thespian_melanochitones.png</Icon>
   </Identity>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/thespian.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
 </Entity>
Index: units/celt_mechanical_siege_ram.xml
===================================================================
--- units/celt_mechanical_siege_ram.xml	(revision 9928)
+++ units/celt_mechanical_siege_ram.xml	(working copy)
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_ram">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Reithe</SpecificName>
-    <Tooltip>Siege Ram</Tooltip>
-    <History>Celtic assaults on fortified positions were relegated largely to three methods. Creating a shell of shields and setting fire to gatehouses, sapping, at which they were noted as being most expert by Caesar, and rams, known only from votive inscriptions and some Celtic art.</History>
-    <Icon>units/celt_mechanical_siege_ram.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/celts/siege_ram.xml</Actor>
-  </VisualActor>
+  <Armour>
+    <Pierce>25.0</Pierce>
+    <Crush>20.0</Crush>
+  </Armour>
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
@@ -21,23 +15,29 @@
     <Square width="6.75" depth="10.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>350</Max>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Reithe</SpecificName>
+    <Tooltip>Siege Ram</Tooltip>
+    <History>Celtic assaults on fortified positions were relegated largely to three methods. Creating a shell of shields and setting fire to gatehouses, sapping, at which they were noted as being most expert by Caesar, and rams, known only from votive inscriptions and some Celtic art.</History>
+    <Icon>units/celt_mechanical_siege_ram.png</Icon>
+  </Identity>
   <Obstruction>
     <Unit radius="3.75"/>
   </Obstruction>
-  <Health>
-    <Max>350</Max>
-  </Health>
-  <Armour>
-    <Pierce>25.0</Pierce>
-    <Crush>20.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
   </UnitMotion>
-  <GarrisonHolder>
-    <Max>5</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
+  <VisualActor>
+    <Actor>structures/celts/siege_ram.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/hele_mechanical_siege_oxybeles.xml
===================================================================
--- units/hele_mechanical_siege_oxybeles.xml	(revision 9928)
+++ units/hele_mechanical_siege_oxybeles.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_ballista">
+  <Footprint replace="">
+    <Square width="2.0" depth="4.0"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Oxybeles</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/siege_spear.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-  <Footprint replace="">
-    <Square width="2.0" depth="4.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
 </Entity>
Index: units/thebes_sacred_band_hoplitai.xml
===================================================================
--- units/thebes_sacred_band_hoplitai.xml	(revision 9928)
+++ units/thebes_sacred_band_hoplitai.xml	(working copy)
@@ -8,10 +8,10 @@
     <History>The Theban Sacred Band.</History>
     <Icon>units/thebes_sacred_band_hoplitai.png</Icon>
   </Identity>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/champion_sacred_band.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
 </Entity>
Index: units/celt_fanatic.xml
===================================================================
--- units/celt_fanatic.xml	(revision 9928)
+++ units/celt_fanatic.xml	(working copy)
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>1.0</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>30.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>60.0</Hack>
+    </Charge>
+  </Attack>
+  <Cost>
+    <Resources>
+      <food>60</food>
+      <metal>70</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Celtic Fanatic</SpecificName>
@@ -7,30 +25,12 @@
     <History>A Celtic fanatic warrior, devoted to war and his Gallic lord.</History>
     <Icon>units/celt_fanatic.png</Icon>
   </Identity>
-  <Cost>
-    <Resources>
-      <food>60</food>
-      <metal>70</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.5</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>30.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>60.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/fanatic.xml</Actor>
   </VisualActor>
Index: units/hele_hero_themistocles.xml
===================================================================
--- units/hele_hero_themistocles.xml	(revision 9928)
+++ units/hele_hero_themistocles.xml	(working copy)
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Auras>
+    <Fear>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Fear>
+  </Auras>
   <Identity>
     <Civ>hele</Civ>
 	<GenericName>Themistocles</GenericName>
@@ -11,12 +17,6 @@
   <Vision>
     <Range>88</Range>
   </Vision>
-  <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
-  </Auras>
   <VisualActor>
     <Actor>units/hellenes/themistocles.xml</Actor>
   </VisualActor>
Index: units/iber_infantry_slinger_b.xml
===================================================================
--- units/iber_infantry_slinger_b.xml	(revision 9928)
+++ units/iber_infantry_slinger_b.xml	(working copy)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/iber_sb1
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>iber</Civ>
 	<SelectionGroupName>units/iber_infantry_slinger_b</SelectionGroupName>
@@ -13,9 +18,4 @@
   <VisualActor>
     <Actor>units/iberians/infantry_slinger_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber_sb1
-    </Entities>
-  </Builder>
 </Entity>
Index: units/iber_infantry_spearman_a.xml
===================================================================
--- units/iber_infantry_spearman_a.xml	(revision 9928)
+++ units/iber_infantry_spearman_a.xml	(working copy)
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_spearman_b">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>7.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>6.0</Hack>
+      <Pierce>16.0</Pierce>
+    </Melee>
+    <Charge>
+      <Hack>12.0</Hack>
+      <Pierce>32.0</Pierce>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_infantry_spearman_e</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/iberians/infantry_spearman_a.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>7.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>5.2</WalkSpeed>
     <Run>
       <Speed>15.6</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>32.0</Pierce>
-    </Charge>
-  </Attack>
+  <VisualActor>
+    <Actor>units/iberians/infantry_spearman_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_spearman_e.xml
===================================================================
--- units/iber_infantry_spearman_e.xml	(revision 9928)
+++ units/iber_infantry_spearman_e.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_spearman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/infantry_spearman_e.xml</Actor>
-  </VisualActor>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>120</Max>
-  </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>4.8</WalkSpeed>
-    <Run>
-      <Speed>14.4</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>7.0</Hack>
@@ -33,5 +15,23 @@
       <Pierce>34.0</Pierce>
     </Charge>
   </Attack>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
   <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>4.8</WalkSpeed>
+    <Run>
+      <Speed>14.4</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/infantry_spearman_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/samnite_spearman.xml
===================================================================
--- units/samnite_spearman.xml	(revision 9928)
+++ units/samnite_spearman.xml	(working copy)
@@ -9,10 +9,10 @@
     <History>The Samnites were an aboriginal people of Southern and Central Italy. They were fierce warriors and frequently rebelled against Roman rule.</History>
     <Icon>units/samnite_spearman.png</Icon>
   </Identity>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/carthaginians/samnite_spearman.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
 </Entity>
Index: units/cart_infantry_archer_a.xml
===================================================================
--- units/cart_infantry_archer_a.xml	(revision 9928)
+++ units/cart_infantry_archer_a.xml	(working copy)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_infantry_archer_b">
+  <Armour>
+    <Hack>3.0</Hack>
+    <Pierce>3.0</Pierce>
+    <Crush>3.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>30.0</Pierce>
+      <MaxRange>64.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>95</Max>
+    <RegenRate>0.3</RegenRate>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_archer_e</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/carthaginians/infantry_archer_a.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>95</Max>
-    <RegenRate>0.3</RegenRate>
-  </Health>
   <Stamina>
     <Max>700</Max>
   </Stamina>
-  <Armour>
-    <Hack>3.0</Hack>
-    <Pierce>3.0</Pierce>
-    <Crush>3.0</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Pierce>30.0</Pierce>
-      <MaxRange>64.0</MaxRange>
-    </Ranged>
-  </Attack>
+  <VisualActor>
+    <Actor>units/carthaginians/infantry_archer_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/cart_infantry_archer_e.xml
===================================================================
--- units/cart_infantry_archer_e.xml	(revision 9928)
+++ units/cart_infantry_archer_e.xml	(working copy)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_infantry_archer_a">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>35.0</Pierce>
+      <MaxRange>68.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>105</Max>
+    <RegenRate>0.4</RegenRate>
+  </Health>
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/carthaginians/infantry_archer_e.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>105</Max>
-    <RegenRate>0.4</RegenRate>
-  </Health>
   <Stamina>
     <Max>690</Max>
   </Stamina>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.7</WalkSpeed>
     <Run>
       <Speed>16.75</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>35.0</Pierce>
-      <MaxRange>68.0</MaxRange>
-    </Ranged>
-  </Attack>
+  <VisualActor>
+    <Actor>units/carthaginians/infantry_archer_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/cart_hero_maharbal.xml
===================================================================
--- units/cart_hero_maharbal.xml	(revision 9928)
+++ units/cart_hero_maharbal.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
+  <Footprint>
+    <Circle radius="1.5"/>
+    <Height>7.5</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Maharbal</SpecificName>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>units/carthaginians/hero_maharbal_horse.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>7.5</Height>
-  </Footprint>
 </Entity>
Index: units/celt_cavalry_spearman_b.xml
===================================================================
--- units/celt_cavalry_spearman_b.xml	(revision 9928)
+++ units/celt_cavalry_spearman_b.xml	(working copy)
@@ -1,42 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_spearman">
-  <Identity>
-    <Civ>celt</Civ>
-	<SelectionGroupName>units/celt_cavalry_spearman_b</SelectionGroupName>
-    <GenericName>War Dog</GenericName>
-    <SpecificName>Coun</SpecificName>
-    <History>The Celts used large dogs such as mastiffs or wolfhounds in combat, especially against enemy cavalry. The Romans were very impressed with the strength and ferocity of these dogs. Many were brought back to Rome for the gladiator arena or to serve as guard dogs.</History>
-    <Tooltip>Bonused vs. Infantry Swordsmen, Infantry Javelinists, and Fauna.</Tooltip>
-    <Icon>units/celt_cavalry_spearman.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/celt_cavalry_spearman_a</Entity>
-  </Promotion>
-  <Cost>
-    <BuildTime>10</BuildTime>
-    <Population>1</Population>
-    <Resources>
-      <food>75</food>
-      <wood>0</wood>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>100</Max>
-  </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>3.0</Pierce>
     <Crush>3.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>10.18</WalkSpeed>
-    <Run>
-      <Speed>29.04</Speed>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
@@ -48,16 +16,36 @@
       <Pierce>0.0</Pierce>
     </Charge>
   </Attack>
-  <VisualActor>
-    <Actor>units/celts/cavalry_spearman_b.xml</Actor>
-  </VisualActor>
+  <Cost>
+    <BuildTime>10</BuildTime>
+    <Population>1</Population>
+    <Resources>
+      <food>75</food>
+      <wood>0</wood>
+    </Resources>
+  </Cost>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+	<SelectionGroupName>units/celt_cavalry_spearman_b</SelectionGroupName>
+    <GenericName>War Dog</GenericName>
+    <SpecificName>Coun</SpecificName>
+    <History>The Celts used large dogs such as mastiffs or wolfhounds in combat, especially against enemy cavalry. The Romans were very impressed with the strength and ferocity of these dogs. Many were brought back to Rome for the gladiator arena or to serve as guard dogs.</History>
+    <Tooltip>Bonused vs. Infantry Swordsmen, Infantry Javelinists, and Fauna.</Tooltip>
+    <Icon>units/celt_cavalry_spearman.png</Icon>
+  </Identity>
   <Obstruction>
     <Unit radius="1.0"/>
   </Obstruction>
+  <Promotion>
+    <Entity>units/celt_cavalry_spearman_a</Entity>
+  </Promotion>
   <Sound>
     <SoundGroups>
       <select>voice/celts/civ/civ_dog_bark.xml</select>
@@ -72,4 +60,16 @@
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>10.18</WalkSpeed>
+    <Run>
+      <Speed>29.04</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>units/celts/cavalry_spearman_b.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/cart_hero_hannibal.xml
===================================================================
--- units/cart_hero_hannibal.xml	(revision 9928)
+++ units/cart_hero_hannibal.xml	(working copy)
@@ -1,32 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Hannibal Barca</SpecificName>
-    <History>TBA</History>
-    <Icon>units/cart_hero_hannibal.png</Icon>
-  </Identity>
-  <Cost>
-    <Population>3</Population>
-    <Resources>
-      <food>300</food>
-      <metal>500</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>400</Max>
-  </Health>
   <Armour>
     <Hack>13.0</Hack>
     <Pierce>25.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
-    <Run>
-      <Speed>13.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>27.0</Hack>
@@ -37,14 +15,36 @@
       <Crush>90.0</Crush>
     </Charge>
   </Attack>
-  <VisualActor>
-    <Actor>units/carthaginians/hero_hannibal_mount.xml</Actor>
-  </VisualActor>
+  <Cost>
+    <Population>3</Population>
+    <Resources>
+      <food>300</food>
+      <metal>500</metal>
+    </Resources>
+  </Cost>
   <Footprint>
     <Circle radius="2.8"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>400</Max>
+  </Health>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Hannibal Barca</SpecificName>
+    <History>TBA</History>
+    <Icon>units/cart_hero_hannibal.png</Icon>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>8.5</WalkSpeed>
+    <Run>
+      <Speed>13.0</Speed>
+    </Run>
+  </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
+  <VisualActor>
+    <Actor>units/carthaginians/hero_hannibal_mount.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_cavalry_swordsman_a.xml
===================================================================
--- units/celt_cavalry_swordsman_a.xml	(revision 9928)
+++ units/celt_cavalry_swordsman_a.xml	(working copy)
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_swordsman_b">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>21.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>63.0</Hack>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,28 +25,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>140</Max>
-  </Health>
   <UnitMotion>
     <WalkSpeed>9.68</WalkSpeed>
     <Run>
       <Speed>29.04</Speed>
     </Run>
   </UnitMotion>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Hack>21.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>63.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_swordsman_a.xml</Actor>
   </VisualActor>
Index: units/celt_cavalry_swordsman_e.xml
===================================================================
--- units/celt_cavalry_swordsman_e.xml	(revision 9928)
+++ units/celt_cavalry_swordsman_e.xml	(working copy)
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_swordsman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>150</Max>
-  </Health>
-  <UnitMotion>
-    <WalkSpeed>9.24</WalkSpeed>
-    <Run>
-      <Speed>27.72</Speed>
-    </Run>
-  </UnitMotion>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>10.0</Pierce>
@@ -28,8 +13,23 @@
       <Hack>66.0</Hack>
     </Charge>
   </Attack>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>9.24</WalkSpeed>
+    <Run>
+      <Speed>27.72</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/cavalry_swordsman_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/celt_hero_cynvelin.xml
===================================================================
--- units/celt_hero_cynvelin.xml	(revision 9928)
+++ units/celt_hero_cynvelin.xml	(working copy)
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
+  <Armour>
+    <Hack>10.0</Hack>
+  </Armour>
+  <Auras>
+    <Heal>
+      <Radius>25</Radius>
+      <Speed>1000</Speed>
+    </Heal>
+  </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Cynvelin</SpecificName>
@@ -7,21 +16,12 @@
     <History>Cynvelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cynvelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacoss capture. According to legend, the Apostle Paul baptized Cynvelin into Christianity before he died in Italy.</History>
     <Icon>units/celt_hero_cynvelin.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>10.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.74</WalkSpeed>
     <Run>
       <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
-  <Auras>
-    <Heal>
-      <Radius>25</Radius>
-      <Speed>1000</Speed>
-    </Heal>
-  </Auras>
   <VisualActor>
     <Actor>units/celts/cynvelin_horse.xml</Actor>
   </VisualActor>
Index: units/hele_infantry_archer_a.xml
===================================================================
--- units/hele_infantry_archer_a.xml	(revision 9928)
+++ units/hele_infantry_archer_a.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_archer_b">
+  <Armour>
+    <Hack>3.0</Hack>
+    <Pierce>1.0</Pierce>
+    <Crush>3.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>30.0</Pierce>
+      <MaxRange>64.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>95</Max>
+    <RegenRate>0.3</RegenRate>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,24 +24,9 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>95</Max>
-    <RegenRate>0.3</RegenRate>
-  </Health>
   <Stamina>
     <Max>700</Max>
   </Stamina>
-  <Armour>
-    <Hack>3.0</Hack>
-    <Pierce>1.0</Pierce>
-    <Crush>3.0</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Pierce>30.0</Pierce>
-      <MaxRange>64.0</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_a.xml</Actor>
   </VisualActor>
Index: units/hele_infantry_archer_e.xml
===================================================================
--- units/hele_infantry_archer_e.xml	(revision 9928)
+++ units/hele_infantry_archer_e.xml	(working copy)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_archer_a">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>2.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>35.0</Pierce>
+      <MaxRange>68.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>105</Max>
+    <RegenRate>0.4</RegenRate>
+  </Health>
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
+  <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>105</Max>
-    <RegenRate>0.4</RegenRate>
-  </Health>
   <Stamina>
     <Max>690</Max>
   </Stamina>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>2.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.7</WalkSpeed>
     <Run>
       <Speed>16.75</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>35.0</Pierce>
-      <MaxRange>68.0</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/hele_infantry_javelinist_a.xml
===================================================================
--- units/hele_infantry_javelinist_a.xml	(revision 9928)
+++ units/hele_infantry_javelinist_a.xml	(working copy)
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_javelinist_b">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>36.0</Pierce>
+      <MaxRange>48.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,26 +23,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.8</WalkSpeed>
     <Run>
       <Speed>20.4</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>36.0</Pierce>
-      <MaxRange>48.0</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_a.xml</Actor>
   </VisualActor>
Index: units/iber_hero_variato.xml
===================================================================
--- units/iber_hero_variato.xml	(revision 9928)
+++ units/iber_hero_variato.xml	(working copy)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Cost>
+    <Resources>
+      <food>55</food>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Variato</SpecificName>
     <Icon>units/iber_hero_variato.png</Icon>
     <History>Viriato, like Vercingentorix amongst the Gauls, was the most famous of the Iberian tribal war leaders, having conducted at least 7 campaigns against the Romans in the southern half of the peninsula during the 'Lusitani Wars' from 147 to 139 BCE. He surfaced as a survivor of the treacherous massacre of 9,000 men and the selling into slavery of 21,000 elderly, women, and children of the Lusitani. They had signed a treaty of peace with the Romans, conducted by Servius Sulpicius Galba, governor of Hispania Ulterior, as the 'final solution' to the Lusitani problem. He emerged from humble beginnings in 151 BCE to become war chief of the Lusitani. He was intelligent and a superior tactician, never really defeated in any encounter (though suffered losses in some requiring retreat). He succumbed instead to another treachery arranged by a later Roman commander, Q. Servilius Cepio, to have him assassinated by three comrades that were close to him.</History>
   </Identity>
-  <VisualActor>
-    <Actor>units/iberians/hero_variato.xml</Actor>
-  </VisualActor>
-  <Cost>
-    <Resources>
-      <food>55</food>
-    </Resources>
-  </Cost>
   <UnitMotion>
     <WalkSpeed>9.3</WalkSpeed>
     <Run>
       <Speed>17.6</Speed>
     </Run>
   </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/hero_variato.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/pers_ship_trireme.xml
===================================================================
--- units/pers_ship_trireme.xml	(revision 9928)
+++ units/pers_ship_trireme.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_trireme">
+  <Footprint>
+    <Square width="6.0" depth="36.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Trireme</SpecificName>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>structures/persians/trireme.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="6.0" depth="36.0"/>
-    <Height>8.0</Height>
-  </Footprint>
 </Entity>
Index: units/hele_infantry_javelinist_e.xml
===================================================================
--- units/hele_infantry_javelinist_e.xml	(revision 9928)
+++ units/hele_infantry_javelinist_e.xml	(working copy)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_javelinist_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
   <Attack>
     <Ranged>
       <Pierce>37.0</Pierce>
       <MaxRange>52.0</MaxRange>
     </Ranged>
   </Attack>
-  <VisualActor>
-    <Actor>units/hellenes/infantry_javelinist_e.xml</Actor>
-  </VisualActor>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
   <Promotion disable=""/>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/infantry_javelinist_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_support_trader.xml
===================================================================
--- units/celt_support_trader.xml	(revision 9928)
+++ units/celt_support_trader.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_trader">
+  <Footprint>
+    <Circle radius="1.5"/>
+    <Height>3.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Cyfnewidiwr</SpecificName>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>units/celts/trader.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>3.0</Height>
-  </Footprint>
 </Entity>
Index: units/celt_hero_brennus.xml
===================================================================
--- units/celt_hero_brennus.xml	(revision 9928)
+++ units/celt_hero_brennus.xml	(working copy)
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Armour>
+    <Hack>9.0</Hack>
+  </Armour>
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brennus</SpecificName>
@@ -7,21 +16,12 @@
     <History>Brennus is the name which the Roman historians give to the famous leader of the Gauls who took Rome in the time of Camillus. According to Geoffrey, the brothers invaded Gaul and sacked Rome in 390 B.C., "proving" that Britons had conquered Rome, the greatest civilization in the world, long before Rome conquered the Britons. We know from many ancient sources which predate Geoffrey that Rome was indeed sacked in 390 B.C., and that the raid was led by a man named Brennus, but he and his invading horde were Gallic, not British. In this episode several features of Geoffrey's editing method can be seen: he modified the historical Brennus, created the brother Belinus, borrowed the Gallic invasion, but omitted the parts where the Gauls seemed weak or foolish. His technique is both additive and subtractive. Like the tale of Trojan origin, the story of the sack of Rome is not pure fabrication; it is a creative rearrangement of the available facts, with details added as necessary. By virtue of their historical association, Beli and Bran are often muddled with the earlier brothers Belinus and Brennus (the sons of Porrex) who contended for power in northern Britain in around 390 BC, and were regarded as gods in old Celtic tradition.</History>
     <Icon>units/celt_hero_brennus.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>9.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.66</WalkSpeed>
     <Run>
       <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <VisualActor>
     <Actor>units/celts/brennus.xml</Actor>
   </VisualActor>
Index: units/celt_ship_trireme.xml
===================================================================
--- units/celt_ship_trireme.xml	(revision 9928)
+++ units/celt_ship_trireme.xml	(working copy)
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_trireme">
+  <Armour>
+    <Pierce>25.0</Pierce>
+    <Crush>20.0</Crush>
+  </Armour>
+  <Cost>
+    <BuildTime>88</BuildTime>
+    <Resources>
+      <wood>350</wood>
+      <metal>250</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="12.0" depth="36.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>40</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>880</Max>
+  </Health>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Venetic Ponti</SpecificName>
@@ -7,34 +28,13 @@
     <History>The ships of Gaul were described by Julias Caesar as:  flat bottoms to ride the shallows, exceptionally high bows and sterns, hulls were made entirely of oak, the foot wide cross-timbers were fastened with iron bolts as thick as a mans thumb, sails of raw hides or thin leather, adapted for sailing treacherous and stormy waters of the north atlantic.  Caesar could not injure them by ramming because they were so solidly built, and their height made it difficult to reach them with missiles or board them with grappling irons.</History>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
-  <VisualActor>
-    <Actor>structures/celts/warship.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="12.0" depth="36.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Obstruction>
     <Unit radius="6.0"/>
   </Obstruction>
-  <Cost>
-    <BuildTime>88</BuildTime>
-    <Resources>
-      <wood>350</wood>
-      <metal>250</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>880</Max>
-  </Health>
-  <Armour>
-    <Pierce>25.0</Pierce>
-    <Crush>20.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>12.5</WalkSpeed>
   </UnitMotion>
-  <GarrisonHolder>
-    <Max>40</Max>
-  </GarrisonHolder>
+  <VisualActor>
+    <Actor>structures/celts/warship.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/celt_cavalry_javelinist_b.xml
===================================================================
--- units/celt_cavalry_javelinist_b.xml	(revision 9928)
+++ units/celt_cavalry_javelinist_b.xml	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_javelinist">
+  <Armour>
+    <Hack>2.0</Hack>
+  </Armour>
   <Identity>
     <Civ>celt</Civ>
 	<SelectionGroupName>units/celt_cavalry_javelinist_b</SelectionGroupName>
@@ -10,9 +13,6 @@
   <Promotion>
     <Entity>units/celt_cavalry_javelinist_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>2.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>12.38</WalkSpeed>
     <Run>
Index: units/rome_legionnaire_marian.xml
===================================================================
--- units/rome_legionnaire_marian.xml	(revision 9928)
+++ units/rome_legionnaire_marian.xml	(working copy)
@@ -13,13 +13,13 @@
     <Entity>units/rome_legionnaire_imperial</Entity>
     <RequiredXp>150</RequiredXp>
   </Promotion>
-  <VisualActor>
-    <Actor>units/romans/champion_unit_3.xml</Actor>
-  </VisualActor>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
+  <VisualActor>
+    <Actor>units/romans/champion_unit_3.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/hele_champion_infantry_polis.xml
===================================================================
--- units/hele_champion_infantry_polis.xml	(revision 9928)
+++ units/hele_champion_infantry_polis.xml	(working copy)
@@ -1,36 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>hele</Civ>
-	<GenericName>Spartan Hoplite</GenericName>
-    <SpecificName>Spartiates</SpecificName>
-    <Tooltip>Bonused vs. Melee Cavalry and Melee Infantry. Weak vs. Ranged Infantry and Ranged Cavalry. Long Train Time. Small Bonus vs. All Non-Greek Units.</Tooltip>
-    <History>The Spartans had a very peculiar form of government which enabled them to be professional soldiers. It not only enabled them, but actually forced them to be superior soldiers as a small group of Spartans had to dominate an enormous number of subjects and unwilling allies. The Spartan army was superior in Hellas, and in the rest of the known world. No other army was so well trained, and had such excellent equipment. They believed that traditional training was the key to success, and for centuries they were correct, as they rarely lost a battle in spite of their small numbers. Ironic enough, this concept ended the Spartan supremacy, as the Spartan phalanx could not resist the new sloped Theban phalanx and the invading integrated Macedonian forces. The end of the Spartan power marked the decline of the domination of traditional phalanx warfare.</History>
-    <Icon>units/hele_champion_infantry_polis.png</Icon>
-  </Identity>
-  <Cost>
-    <BuildTime>16</BuildTime>
-    <Resources>
-      <metal>25</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>12.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.5</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
@@ -43,8 +17,33 @@
       <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
+  <Cost>
+    <BuildTime>16</BuildTime>
+    <Resources>
+      <metal>25</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>140</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+	<GenericName>Spartan Hoplite</GenericName>
+    <SpecificName>Spartiates</SpecificName>
+    <Tooltip>Bonused vs. Melee Cavalry and Melee Infantry. Weak vs. Ranged Infantry and Ranged Cavalry. Long Train Time. Small Bonus vs. All Non-Greek Units.</Tooltip>
+    <History>The Spartans had a very peculiar form of government which enabled them to be professional soldiers. It not only enabled them, but actually forced them to be superior soldiers as a small group of Spartans had to dominate an enormous number of subjects and unwilling allies. The Spartan army was superior in Hellas, and in the rest of the known world. No other army was so well trained, and had such excellent equipment. They believed that traditional training was the key to success, and for centuries they were correct, as they rarely lost a battle in spite of their small numbers. Ironic enough, this concept ended the Spartan supremacy, as the Spartan phalanx could not resist the new sloped Theban phalanx and the invading integrated Macedonian forces. The end of the Spartan power marked the decline of the domination of traditional phalanx warfare.</History>
+    <Icon>units/hele_champion_infantry_polis.png</Icon>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>5.5</WalkSpeed>
+    <Run>
+      <Speed>15.0</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/champion_unit_1.xml</Actor>
   </VisualActor>
-  
 </Entity>
Index: units/hele_infantry_spearman_a.xml
===================================================================
--- units/hele_infantry_spearman_a.xml	(revision 9928)
+++ units/hele_infantry_spearman_a.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/hele_infantry_spearman_e</Entity>
-  </Promotion>
-  <ResourceGatherer>
-    <BaseSpeed>0.75</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.6</WalkSpeed>
-    <Run>
-      <Speed>16.8</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>6.0</Hack>
@@ -33,8 +15,25 @@
       <Pierce>32.0</Pierce>
     </Charge>
   </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/hele_infantry_spearman_e</Entity>
+  </Promotion>
+  <ResourceGatherer>
+    <BaseSpeed>0.75</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>5.6</WalkSpeed>
+    <Run>
+      <Speed>16.8</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_spearman_a.xml</Actor>
   </VisualActor>
-  
 </Entity>
Index: units/hele_champion_ranged_polis.xml
===================================================================
--- units/hele_champion_ranged_polis.xml	(revision 9928)
+++ units/hele_champion_ranged_polis.xml	(working copy)
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>40.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>50</MaxRange>
+      <MinRange>10.0</MinRange>
+    </Ranged>
+  </Attack>
   <Identity>
     <Civ>hele</Civ>
 	<GenericName>Athenian Ekdromos</GenericName>
@@ -8,25 +21,12 @@
     <History>Ekdromos (literally: out runner) was a development of the Hoplite. Development of the Hoplite took many twists and turns based on the changing dynamics on the field of battle. Once armies began using Peltasts imported from Thrace something had to be done to counter this barrage of javelins thrown into the midst of a phalanx. The Thebans began to increase the armor of their hoplites, but the Athenians took a completely different approach and lightened the load for their infantry. The Ekdromoi would dash out from the phalanx, close with the enemy ranged units at speed, and cut them down at will. This approach also worked to harass more heavily armed troops as well, the enemy carrying too much weight to catch the vexatious Ekdromoi.</History>
     <Icon>units/hele_champion_ranged_polis.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.3</WalkSpeed>
     <Run>
       <Speed>17.6</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>40.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>50</MaxRange>
-      <MinRange>10.0</MinRange>
-    </Ranged>
-  </Attack>
   <Vision>
     <Range>88</Range>
   </Vision>
Index: units/hele_infantry_spearman_e.xml
===================================================================
--- units/hele_infantry_spearman_e.xml	(revision 9928)
+++ units/hele_infantry_spearman_e.xml	(working copy)
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>120</Max>
-  </Health>
   <Armour>
     <Hack>7.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.2</WalkSpeed>
-    <Run>
-      <Speed>15.6</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>7.0</Hack>
@@ -30,8 +15,23 @@
       <Pierce>34.0</Pierce>
     </Charge>
   </Attack>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>5.2</WalkSpeed>
+    <Run>
+      <Speed>15.6</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_spearman_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/hele_ship_bireme.xml
===================================================================
--- units/hele_ship_bireme.xml	(revision 9928)
+++ units/hele_ship_bireme.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_bireme">
+  <Footprint>
+    <Square width="6.0" depth="30.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Pentekontoros</SpecificName>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>structures/hellenes/bireme.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="6.0" depth="30.0"/>
-    <Height>8.0</Height>
-  </Footprint>
 </Entity>
Index: units/celt_hero_caratacos.xml
===================================================================
--- units/celt_hero_caratacos.xml	(revision 9928)
+++ units/celt_hero_caratacos.xml	(working copy)
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Armour>
+    <Hack>8.0</Hack>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>27.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>54.0</Hack>
+    </Charge>
+  </Attack>
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Caratacos</SpecificName>
@@ -7,29 +24,12 @@
     <History>Caratacos's name is better known in its Romanized form, Caratacus. Under this name he is remembered as a fierce defender of Britain against the Romans after their invasion in 43 AD. Son of King Cynvelin of the Catuvellauni tribe, Caratacos fought for nine years against the Romans with little success, eventually fleeing to the tribes in Wales, where he was defeated decisively. Finally he entered Northern Britain, where was handed over to the Romans. Taken to Rome, Caratacos was allowed to live by the Emperor Claudius and died in Italy.</History>
     <Icon>units/celt_hero_caratacos.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>8.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.66</WalkSpeed>
     <Run>
       <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
-  <Attack>
-    <Melee>
-      <Hack>27.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>54.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/caradoc.xml</Actor>
   </VisualActor>
Index: units/hele_cavalry_javelinist_a.xml
===================================================================
--- units/hele_cavalry_javelinist_a.xml	(revision 9928)
+++ units/hele_cavalry_javelinist_a.xml	(working copy)
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_javelinist_b">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>3.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>36.0</Pierce>
+      <MaxRange>48</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>130</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,28 +23,13 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>130</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>3.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>10.4</WalkSpeed>
     <Run>
       <Speed>31.2</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>36.0</Pierce>
-      <MaxRange>48</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/cavalry_javelinist_a.xml</Actor>
   </VisualActor>
-  
 </Entity>
Index: units/hele_cavalry_javelinist_e.xml
===================================================================
--- units/hele_cavalry_javelinist_e.xml	(revision 9928)
+++ units/hele_cavalry_javelinist_e.xml	(working copy)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_javelinist_a">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>37.0</Pierce>
+      <MaxRange>52</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
+  <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.6</WalkSpeed>
     <Run>
       <Speed>28.8</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>37.0</Pierce>
-      <MaxRange>52</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/hellenes/cavalry_javelinist_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/celt_infantry_javelinist_b.xml
===================================================================
--- units/celt_infantry_javelinist_b.xml	(revision 9928)
+++ units/celt_infantry_javelinist_b.xml	(working copy)
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
+  <Armour>
+    <Hack>2.0</Hack>
+  </Armour>
+  <Builder>
+    <Entities datatype="tokens">
+      -structures/{civ}_fortress
+      structures/celt_kennel
+      structures/celt_sb1
+      structures/celt_fortress_b
+      structures/celt_fortress_g
+	</Entities>
+  </Builder>
   <Identity>
     <Civ>celt</Civ>
 	<SelectionGroupName>units/celt_infantry_javelinist_b</SelectionGroupName>
@@ -10,9 +22,6 @@
   <Promotion>
     <Entity>units/celt_infantry_javelinist_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>2.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>8.42</WalkSpeed>
     <Run>
@@ -22,13 +31,4 @@
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      -structures/{civ}_fortress
-      structures/celt_kennel
-      structures/celt_sb1
-      structures/celt_fortress_b
-      structures/celt_fortress_g
-	</Entities>
-  </Builder>
 </Entity>
Index: units/hele_champion_infantry_mace.xml
===================================================================
--- units/hele_champion_infantry_mace.xml	(revision 9928)
+++ units/hele_champion_infantry_mace.xml	(working copy)
@@ -14,5 +14,4 @@
   <VisualActor>
     <Actor>units/hellenes/champion_unit_3.xml</Actor>
   </VisualActor>
-
 </Entity>
Index: units/celt_ship_merchant.xml
===================================================================
--- units/celt_ship_merchant.xml	(revision 9928)
+++ units/celt_ship_merchant.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_merchant">
+  <Footprint>
+    <Square width="12.0" depth="24.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Currach</SpecificName>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>structures/celts/merchant_ship.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="12.0" depth="24.0"/>
-    <Height>6.0</Height>
-  </Footprint>
 </Entity>
Index: units/celt_hero_britomartus.xml
===================================================================
--- units/celt_hero_britomartus.xml	(revision 9928)
+++ units/celt_hero_britomartus.xml	(working copy)
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
+  <Armour>
+    <Hack>9.0</Hack>
+  </Armour>
+  <Auras>
+    <Fear>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Fear>
+  </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Britomartus</SpecificName>
@@ -7,9 +16,6 @@
     <History> The story of how Marcus Claudius Marcellus killed a Gallic leader at Clastidium (222 BC) is typical of such encounters. Advancing with a smallish army, Marcellus met a combined force of Insubrian Gauls and Gaesatae at Clastidium. The Gallic army advanced with the usual rush and terrifying cries, and their king, Britomartus, picking out Marcellus by means of his badges of rank, made for him, shouting a challenge and brandishing his spear. Britomartus was an outstanding figure not only for his size but also for his adornments; for he was resplendent in bright colours and his armour shone with gold and silver. This armour, thought Marcellus, would be a fitting offering to the gods. He charged the Gaul, pierced his bright breastplate and cast him to the ground. It was an easy task to kill Britomartus and strip him of his armour.</History>
     <Icon>units/celt_hero_britomartus.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>9.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.22</WalkSpeed>
     <Run>
@@ -19,10 +25,4 @@
   <VisualActor>
     <Actor>units/celts/britomartus.xml</Actor>
   </VisualActor>
-  <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
-  </Auras>
 </Entity>
Index: units/rome_ship_quinquereme.xml
===================================================================
--- units/rome_ship_quinquereme.xml	(revision 9928)
+++ units/rome_ship_quinquereme.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_quinquereme">
+  <Footprint>
+    <Square width="8.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Quinquereme</SpecificName>
@@ -8,8 +12,4 @@
   <VisualActor>
     <Actor>structures/romans/quinquereme.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square width="8.0" depth="48.0"/>
-    <Height>8.0</Height>
-  </Footprint>
 </Entity>
Index: units/cart_hero_hamilcar.xml
===================================================================
--- units/cart_hero_hamilcar.xml	(revision 9928)
+++ units/cart_hero_hamilcar.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
+  <Footprint>
+    <Circle radius="1.5"/>
+    <Height>7.5</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Hamilcar Barca</SpecificName>
@@ -9,8 +13,4 @@
   <VisualActor>
     <Actor>units/carthaginians/hero_hamilcar_horse.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>7.5</Height>
-  </Footprint>
 </Entity>
Index: units/mace_hypaspist.xml
===================================================================
--- units/mace_hypaspist.xml	(revision 9928)
+++ units/mace_hypaspist.xml	(working copy)
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
+  <Armour>
+    <Hack>9.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>9.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>20.0</Pierce>
+      <MaxRange>6.0</MaxRange>
+    </Melee>
+    <Charge>
+      <Hack>20.0</Hack>
+      <Pierce>40.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
+  <Cost>
+    <Resources>
+      <metal>20</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>135</Max>
+  </Health>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Macedonian Shield Bearer</GenericName>
@@ -13,38 +39,12 @@
     <Entity>units/mace_argyraspis</Entity>
     <RequiredXp>200</RequiredXp>
   </Promotion>
-  <Cost>
-    <Resources>
-      <metal>20</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>135</Max>
-  </Health>
-  <Armour>
-    <Hack>9.0</Hack>
-    <Pierce>12.0</Pierce>
-    <Crush>9.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
       <Speed>16.5</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>20.0</Pierce>
-      <MaxRange>6.0</MaxRange>
-    </Melee>
-    <Charge>
-      <Hack>20.0</Hack>
-      <Pierce>40.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/macedonians/mace_champion_hypaspist.xml</Actor>
   </VisualActor>
Index: units/thrace_black_cloak.xml
===================================================================
--- units/thrace_black_cloak.xml	(revision 9928)
+++ units/thrace_black_cloak.xml	(working copy)
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>9.0</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>30.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>60.0</Hack>
+    </Charge>
+  </Attack>
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <metal>140</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Thracian Black Cloak</GenericName>
@@ -9,33 +27,15 @@
     <History>Thracian tribesmen who wield the fiercesome rhomphaia polearm weapon in combat. They were ubiquitous mercenary swordsmen throughout Hellenistic times, sometimes even serving in two opposing armies.</History>
     <Icon>units/thracian_rhomphaia.png</Icon>
   </Identity>
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal>140</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>9.0</Pierce>
-  </Armour>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <UnitMotion>
     <WalkSpeed>7.5</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>30.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>60.0</Hack>
-    </Charge>
-  </Attack>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/thracian_blackcloak.xml</Actor>
   </VisualActor>
Index: units/iber_champion_cavalry.xml
===================================================================
--- units/iber_champion_cavalry.xml	(revision 9928)
+++ units/iber_champion_cavalry.xml	(working copy)
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Epones Devotio</SpecificName>
-    <Icon>units/iber_champion_cavalry.png</Icon>
-    <History>Elite warriors known as The Devoted were adept warriors who could be either infantry or cavalry. Adding to their already considerable skill, The Devoted were renowned for the experience in foreign wars, often in the service of the Carthaginians. Considering that Iberian troops were commonly used as cannon fodder gives some idea of just how good these fierce warriors had to be in order to survive. These cavalrymen skirmish with flaming javelins, giving them a rare siege ability.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/champion_unit_2.xml</Actor>
-  </VisualActor>
+  <Armour>
+    <Hack>8.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>8.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>0.0</Pierce>
+      <Crush>30.0</Crush>
+      <MaxRange>48</MaxRange>
+      <MinRange>16.0</MinRange>
+    </Ranged>
+  </Attack>
   <Cost>
     <Resources>
       <food>100</food>
@@ -16,11 +20,12 @@
       <metal>50</metal>
     </Resources>
   </Cost>
-  <Armour>
-    <Hack>8.0</Hack>
-    <Pierce>12.0</Pierce>
-    <Crush>8.0</Crush>
-  </Armour>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Epones Devotio</SpecificName>
+    <Icon>units/iber_champion_cavalry.png</Icon>
+    <History>Elite warriors known as The Devoted were adept warriors who could be either infantry or cavalry. Adding to their already considerable skill, The Devoted were renowned for the experience in foreign wars, often in the service of the Carthaginians. Considering that Iberian troops were commonly used as cannon fodder gives some idea of just how good these fierce warriors had to be in order to survive. These cavalrymen skirmish with flaming javelins, giving them a rare siege ability.</History>
+  </Identity>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
@@ -29,12 +34,7 @@
       <RangeMin>10.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>0.0</Pierce>
-      <Crush>30.0</Crush>
-      <MaxRange>48</MaxRange>
-      <MinRange>16.0</MinRange>
-    </Ranged>
-  </Attack>
+  <VisualActor>
+    <Actor>units/iberians/champion_unit_2.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_javelinist_b.xml
===================================================================
--- units/iber_infantry_javelinist_b.xml	(revision 9928)
+++ units/iber_infantry_javelinist_b.xml	(working copy)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/iber_sb1
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>iber</Civ>
 	<SelectionGroupName>units/iber_infantry_javelinist_b</SelectionGroupName>
@@ -13,9 +18,4 @@
   <VisualActor>
     <Actor>units/iberians/infantry_javelinist_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber_sb1
-    </Entities>
-  </Builder>
 </Entity>
Index: units/iber_ship_merchant.xml
===================================================================
--- units/iber_ship_merchant.xml	(revision 9928)
+++ units/iber_ship_merchant.xml	(working copy)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_merchant">
+  <Footprint replace="">
+    <Square width="8.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Emporiko Plio</SpecificName>
     <History>Need History</History>
     <Icon>units/iber_ship_merchant.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="6.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/merchant.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Square width="8.0" depth="24.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="6.0"/>
-  </Obstruction>
 </Entity>
Index: units/celt_infantry_spearman_a.xml
===================================================================
--- units/celt_infantry_spearman_a.xml	(revision 9928)
+++ units/celt_infantry_spearman_a.xml	(working copy)
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_spearman_b">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>6.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>6.0</Hack>
+      <Pierce>16.0</Pierce>
+    </Melee>
+    <Charge>
+      <Hack>12.0</Hack>
+      <Pierce>32.0</Pierce>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,30 +27,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>6.0</Pierce>
-    <Crush>6.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.16</WalkSpeed>
     <Run>
       <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>32.0</Pierce>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_a.xml</Actor>
   </VisualActor>
Index: units/iber_cavalry_spearman_b.xml
===================================================================
--- units/iber_cavalry_spearman_b.xml	(revision 9928)
+++ units/iber_cavalry_spearman_b.xml	(working copy)
@@ -13,4 +13,4 @@
   <VisualActor>
     <Actor>units/iberians/cavalry_spearman_b.xml</Actor>
   </VisualActor>
-</Entity>
\ No newline at end of file
+</Entity>
Index: units/iber_infantry_swordsman_b.xml
===================================================================
--- units/iber_infantry_swordsman_b.xml	(revision 9928)
+++ units/iber_infantry_swordsman_b.xml	(working copy)
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <Hack>22.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>44.0</Hack>
+    </Charge>
+  </Attack>
+  <Builder>
+    <Entities datatype="tokens">
+      structures/iber_sb1
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>iber</Civ>
 	<SelectionGroupName>units/iber_infantry_swordsman_b</SelectionGroupName>
@@ -13,22 +31,4 @@
   <VisualActor>
     <Actor>units/iberians/infantry_swordsman_b.xml</Actor>
   </VisualActor>
-  <Cost>
-    <Resources>
-      <metal>60</metal>
-    </Resources>
-  </Cost>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber_sb1
-    </Entities>
-  </Builder>
-  <Attack>
-    <Melee>
-      <Hack>22.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>44.0</Hack>
-    </Charge>
-  </Attack>
 </Entity>
Index: units/celt_infantry_spearman_e.xml
===================================================================
--- units/celt_infantry_spearman_e.xml	(revision 9928)
+++ units/celt_infantry_spearman_e.xml	(working copy)
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_spearman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>120</Max>
-  </Health>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.72</WalkSpeed>
-    <Run>
-      <Speed>17.16</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>7.0</Hack>
@@ -30,8 +15,23 @@
       <Pierce>34.0</Pierce>
     </Charge>
   </Attack>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>5.72</WalkSpeed>
+    <Run>
+      <Speed>17.16</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/hele_cavalry_swordsman_b.xml
===================================================================
--- units/hele_cavalry_swordsman_b.xml	(revision 9928)
+++ units/hele_cavalry_swordsman_b.xml	(working copy)
@@ -17,5 +17,4 @@
   <VisualActor>
     <Actor>units/hellenes/cavalry_swordsman_b.xml</Actor>
   </VisualActor>
-  
 </Entity>
Index: units/rome_centurio_imperial.xml
===================================================================
--- units/rome_centurio_imperial.xml	(revision 9928)
+++ units/rome_centurio_imperial.xml	(working copy)
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome_legionnaire_imperial">
+  <Attack>
+    <Melee>
+      <Hack>26.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>52.0</Hack>
+    </Charge>
+  </Attack>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Identity>
     <Civ>rome</Civ>
 	<GenericName>Roman Centurion</GenericName>
@@ -8,19 +19,8 @@
     <Tooltip>Swordsman. Bonused vs. Infantry Spearmen and Elephants. Pilum Ranged Attack Bonused vs. Infantry Swordsmen and Infantry Javelinists. Small Weakness vs. All Germanic Units.</Tooltip>
     <Icon>units/rome_champion_legion_centurio.png</Icon>
   </Identity>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Attack>
-    <Melee>
-      <Hack>26.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>52.0</Hack>
-    </Charge>
-  </Attack>
+  <Promotion disable=""/>
   <VisualActor>
     <Actor>units/romans/imp_rome_champion_1.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/celt_hero_boudicca.xml
===================================================================
--- units/celt_hero_boudicca.xml	(revision 9928)
+++ units/celt_hero_boudicca.xml	(working copy)
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_javelinist">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Boudicca</SpecificName>
-    <Tooltip>Hero Aura: Increased Attack and Speed for Super Units.</Tooltip>
-    <History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colours over which a thick cloak was fastened by a brooch.</History>
-    <Icon>units/celt_hero_boudicca.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>7.0</Hack>
+    <Crush>12.0</Crush>
+  </Armour>
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <Cost>
     <Population>4</Population>
     <BuildTime>50</BuildTime>
@@ -16,33 +19,30 @@
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Health>
     <Max>500</Max>
   </Health>
-  <Armour>
-    <Hack>7.0</Hack>
-    <Crush>12.0</Crush>
-  </Armour>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Boudicca</SpecificName>
+    <Tooltip>Hero Aura: Increased Attack and Speed for Super Units.</Tooltip>
+    <History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colours over which a thick cloak was fastened by a brooch.</History>
+    <Icon>units/celt_hero_boudicca.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Unit radius="1.5"/>
+  </Obstruction>
   <UnitMotion>
     <WalkSpeed>14.5</WalkSpeed>
     <Run>
       <Speed>26.0</Speed>
     </Run>
   </UnitMotion>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="1.5"/>
-  </Obstruction>
 </Entity>
Index: units/hele_hero_philip.xml
===================================================================
--- units/hele_hero_philip.xml	(revision 9928)
+++ units/hele_hero_philip.xml	(working copy)
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Philip II</SpecificName>
@@ -10,12 +16,6 @@
   <Vision>
     <Range>110</Range>
   </Vision>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <VisualActor>
     <Actor>units/hellenes/philip_horse.xml</Actor>
   </VisualActor>
Index: units/pers_war_elephant.xml
===================================================================
--- units/pers_war_elephant.xml	(revision 9928)
+++ units/pers_war_elephant.xml	(working copy)
@@ -1,33 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Indian War Elephant</GenericName>
-    <SpecificName>Pil Jangi Hendi</SpecificName>
-    <Icon>units/pers_war_elephant.png</Icon>
-    <History>Elephants were rare sights in Persian armies but they were used and their effect on the battlefield could not be ignored. As their tusks and feet physically attacked the enemy, archers and javelin throwers launched projectiles from atop the animals back. While huge, they could be just as much a threat to their own side and could be easily hamstrung. But their ability to stop a full-blown cavalry charge when in a line made up for any questions of effectiveness.</History>
-  </Identity>
-  <Cost>
-    <Population>3</Population>
-    <Resources>
-      <food>300</food>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>450</Max>
-  </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
-    <Run>
-      <Speed>14.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>25.0</Hack>
@@ -38,14 +15,37 @@
       <Crush>90.0</Crush>
     </Charge>
   </Attack>
-  <VisualActor>
-    <Actor>units/persians/war_elephant.xml</Actor>
-  </VisualActor>
+  <Cost>
+    <Population>3</Population>
+    <Resources>
+      <food>300</food>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
   <Footprint>
     <Circle radius="2.8"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>450</Max>
+  </Health>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Indian War Elephant</GenericName>
+    <SpecificName>Pil Jangi Hendi</SpecificName>
+    <Icon>units/pers_war_elephant.png</Icon>
+    <History>Elephants were rare sights in Persian armies but they were used and their effect on the battlefield could not be ignored. As their tusks and feet physically attacked the enemy, archers and javelin throwers launched projectiles from atop the animals back. While huge, they could be just as much a threat to their own side and could be easily hamstrung. But their ability to stop a full-blown cavalry charge when in a line made up for any questions of effectiveness.</History>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>7.5</WalkSpeed>
+    <Run>
+      <Speed>14.0</Speed>
+    </Run>
+  </UnitMotion>
   <Vision>
     <Range>120</Range>
   </Vision>
+  <VisualActor>
+    <Actor>units/persians/war_elephant.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/pers_champion_cavalry.xml
===================================================================
--- units/pers_champion_cavalry.xml	(revision 9928)
+++ units/pers_champion_cavalry.xml	(working copy)
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Bactrian Lancer</GenericName>
-    <SpecificName>Bakhtris Asabari</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
-    <History>Cataphracts were the crushing blow of the Persian cavalry. The development of the Persian cataphract is not well understood, as is the relationship between these men and future generations of cataphract cavalry. At best it seems the Persians adopted the catapharct from encounters with Iranian nomads like the Massagetes.</History>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/champion_unit_2.xml</Actor>
-  </VisualActor>
+  <Armour>
+    <Hack>15.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>8.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>5.0</Hack>
+      <Pierce>15.0</Pierce>
+    </Melee>
+    <Charge>
+      <Hack>20.0</Hack>
+      <Pierce>60.0</Pierce>
+      <Crush>10.0</Crush>
+    </Charge>
+  </Attack>
   <Cost>
     <Resources>
       <wood>80</wood>
@@ -19,11 +25,13 @@
   <Health>
     <Max>150</Max>
   </Health>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>12.0</Pierce>
-    <Crush>8.0</Crush>
-  </Armour>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Bactrian Lancer</GenericName>
+    <SpecificName>Bakhtris Asabari</SpecificName>
+    <Icon>units/pers_champion_cavalry.png</Icon>
+    <History>Cataphracts were the crushing blow of the Persian cavalry. The development of the Persian cataphract is not well understood, as is the relationship between these men and future generations of cataphract cavalry. At best it seems the Persians adopted the catapharct from encounters with Iranian nomads like the Massagetes.</History>
+  </Identity>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
     <Run>
@@ -32,15 +40,7 @@
       <RangeMin>10.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>5.0</Hack>
-      <Pierce>15.0</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>20.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>10.0</Crush>
-    </Charge>
-  </Attack>
+  <VisualActor>
+    <Actor>units/persians/champion_unit_2.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/hele_hero_alexander.xml
===================================================================
--- units/hele_hero_alexander.xml	(revision 9928)
+++ units/hele_hero_alexander.xml	(working copy)
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
+  <Armour>
+    <Crush>20.0</Crush>
+  </Armour>
+  <Auras>
+    <Fear>
+      <Radius>80</Radius>
+      <Bonus>15</Bonus>
+    </Fear>
+  </Auras>
+  <Cost>
+    <Resources>
+      <metal>300</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Alexander The Great</SpecificName>
@@ -7,23 +21,9 @@
     <History>The most powerful hero of them all - son of Philip II, king of Macedonia (336 BC - 323 BC). After conquering the rest of the Thracians and quelling the unrest of the Greeks, Alexander embarked on a world-conquest march. Defeating the Persian forces at Granicus (334 BC), Issus (333 BC) and Gaugamela (331 BC), he became master of the Persian Empire. Entering India, he defeated king Porus at Hydaspes (326 BC), but his weary troops made him halt. Died in Babylon at the age of 33 while planning a campaign against Arabia.</History>
     <Icon>units/hele_hero_alexander.png</Icon>
   </Identity>
-  <Cost>
-    <Resources>
-      <metal>300</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Crush>20.0</Crush>
-  </Armour>
   <Vision>
     <Range>110</Range>
   </Vision>
-  <Auras>
-    <Fear>
-      <Radius>80</Radius>
-      <Bonus>15</Bonus>
-    </Fear>
-  </Auras>
   <VisualActor>
     <Actor>units/hellenes/alexander.xml</Actor>
   </VisualActor>
Index: units/iber_infantry_slinger_a.xml
===================================================================
--- units/iber_infantry_slinger_a.xml	(revision 9928)
+++ units/iber_infantry_slinger_a.xml	(working copy)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_slinger_b">
+  <Armour>
+    <Hack>3.0</Hack>
+    <Pierce>3.0</Pierce>
+    <Crush>3.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>21.0</Pierce>
+      <MaxRange>52.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_infantry_slinger_e</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/iberians/infantry_slinger_a.xml</Actor>
-  </VisualActor>
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>  
-  <Armour>
-    <Hack>3.0</Hack>
-    <Pierce>3.0</Pierce>
-    <Crush>3.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.2</WalkSpeed>
     <Run>
       <Speed>21.6</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>21.0</Pierce>
-      <MaxRange>52.0</MaxRange>
-    </Ranged>
-  </Attack>
+  <VisualActor>
+    <Actor>units/iberians/infantry_slinger_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_spearman_b.xml
===================================================================
--- units/iber_infantry_spearman_b.xml	(revision 9928)
+++ units/iber_infantry_spearman_b.xml	(working copy)
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
+  <Armour>
+    <Pierce>6.0</Pierce>
+  </Armour>
+  <Builder>
+    <Entities datatype="tokens">
+      structures/iber_sb1
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>iber</Civ>
 	<SelectionGroupName>units/iber_infantry_spearman_b</SelectionGroupName>
@@ -10,21 +18,13 @@
   <Promotion>
     <Entity>units/iber_infantry_spearman_a</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/iberians/infantry_spearman_b.xml</Actor>
-  </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber_sb1
-    </Entities>
-  </Builder>
-  <Armour>
-    <Pierce>6.0</Pierce>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.1</WalkSpeed>
     <Run>
       <Speed>16.8</Speed>
     </Run>
   </UnitMotion>
+  <VisualActor>
+    <Actor>units/iberians/infantry_spearman_b.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/iber_infantry_slinger_e.xml
===================================================================
--- units/iber_infantry_slinger_e.xml	(revision 9928)
+++ units/iber_infantry_slinger_e.xml	(working copy)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_slinger_a">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>22.0</Pierce>
+      <MaxRange>56.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
-  <VisualActor>
-    <Actor>units/iberians/infantry_slinger_e.xml</Actor>
-  </VisualActor>
+  <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>  
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.8</WalkSpeed>
     <Run>
       <Speed>20.4</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>22.0</Pierce>
-      <MaxRange>56.0</MaxRange>
-    </Ranged>
-  </Attack>
-  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/iberians/infantry_slinger_e.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/cart_champion_cavalry.xml
===================================================================
--- units/cart_champion_cavalry.xml	(revision 9928)
+++ units/cart_champion_cavalry.xml	(working copy)
@@ -1,31 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Pil Qrav</SpecificName>
-    <Icon>units/cart_champion_cavalry.png</Icon>
-    <History>By far the most famous of Carthaginian weapons was the small, ugly, and now extinct, North African forest elephants. Going into battle without a war tower carrying only a driver, Carthaginian war elephants were used as terror weapons: horses could not stand their smell, inexperienced troops were frightened, and the havoc they could cause was immense. Yet by the time of the Second Punic War elephants were at the end of their time. Armies had learned the weaknesses of the giant beasts, specifically how to hamstring and confuse them. More often than not a war elephant could be just as dangerous to its own side as the enemy.</History>
-  </Identity>
-  <Cost>
-    <Resources>
-      <food>200</food>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>400</Max>
-  </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
-    <Run>
-      <Speed>14.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
@@ -36,14 +15,35 @@
       <Crush>90.0</Crush>
     </Charge>
   </Attack>
-  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_2.xml</Actor>
-  </VisualActor>
+  <Cost>
+    <Resources>
+      <food>200</food>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>6.0</Height>
   </Footprint>
+  <Health>
+    <Max>400</Max>
+  </Health>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Pil Qrav</SpecificName>
+    <Icon>units/cart_champion_cavalry.png</Icon>
+    <History>By far the most famous of Carthaginian weapons was the small, ugly, and now extinct, North African forest elephants. Going into battle without a war tower carrying only a driver, Carthaginian war elephants were used as terror weapons: horses could not stand their smell, inexperienced troops were frightened, and the havoc they could cause was immense. Yet by the time of the Second Punic War elephants were at the end of their time. Armies had learned the weaknesses of the giant beasts, specifically how to hamstring and confuse them. More often than not a war elephant could be just as dangerous to its own side as the enemy.</History>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+    <Run>
+      <Speed>14.0</Speed>
+    </Run>
+  </UnitMotion>
   <Vision>
     <Range>110</Range>
   </Vision>
+  <VisualActor>
+    <Actor>units/carthaginians/champion_unit_2.xml</Actor>
+  </VisualActor>
 </Entity>
Index: units/cart_infantry_archer_b.xml
===================================================================
--- units/cart_infantry_archer_b.xml	(revision 9928)
+++ units/cart_infantry_archer_b.xml	(working copy)
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <metal>85</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>cart</Civ>
 	<SelectionGroupName>units/cart_infantry_archer_b</SelectionGroupName>
@@ -11,13 +18,6 @@
   <Promotion>
     <Entity>units/cart_infantry_archer_a</Entity>
   </Promotion>
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <metal>85</metal>
-    </Resources>
-  </Cost>
   <VisualActor>
     <Actor>units/carthaginians/infantry_archer_b.xml</Actor>
   </VisualActor>
Index: units/cart_ship_merchant.xml
===================================================================
--- units/cart_ship_merchant.xml	(revision 9928)
+++ units/cart_ship_merchant.xml	(working copy)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Merchant Ship</SpecificName>
-    <History>Need History</History>
-    <Icon>units/iber_ship_merchant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/merchant_ship.xml</Actor>
-  </VisualActor>
-  <Footprint replace="">
-    <Square width="8.0" depth="24.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="6.0"/>
-  </Obstruction>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_merchant">
+  <Footprint replace="">
+    <Square width="8.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Merchant Ship</SpecificName>
+    <History>Need History</History>
+    <Icon>units/iber_ship_merchant.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Unit radius="6.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/carthaginians/merchant_ship.xml</Actor>
+  </VisualActor>
+</Entity>
Index: units/celt_cavalry_spearman_a.xml
===================================================================
--- units/celt_cavalry_spearman_a.xml	(revision 9928)
+++ units/celt_cavalry_spearman_a.xml	(working copy)
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_spearman_b">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>21.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>63.0</Hack>
+    </Charge>
+  </Attack>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
@@ -9,25 +22,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.24</WalkSpeed>
     <Run>
       <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>21.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>63.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_spearman_a.xml</Actor>
   </VisualActor>
Index: units/rome_legionnaire_imperial.xml
===================================================================
--- units/rome_legionnaire_imperial.xml	(revision 9928)
+++ units/rome_legionnaire_imperial.xml	(working copy)
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome_legionnaire_marian">
-  <Identity>
-    <Civ>rome</Civ>
-	<GenericName>Roman Legionnaire</GenericName>
-    <SpecificName>Legionarius Romanus</SpecificName>
-    <History>The Imperial Legionnaire.</History>
-	<Tooltip>The famed legion of the Early Empire.</Tooltip>
-    <Icon>units/rome_champion_legion_imperial.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/rome_centurio_imperial</Entity>
-    <RequiredXp>300</RequiredXp>
-  </Promotion>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>6.0</Pierce>
@@ -25,6 +13,18 @@
       <Hack>50.0</Hack>
     </Charge>
   </Attack>
+  <Identity>
+    <Civ>rome</Civ>
+	<GenericName>Roman Legionnaire</GenericName>
+    <SpecificName>Legionarius Romanus</SpecificName>
+    <History>The Imperial Legionnaire.</History>
+	<Tooltip>The famed legion of the Early Empire.</Tooltip>
+    <Icon>units/rome_champion_legion_imperial.png</Icon>
+  </Identity>
+  <Promotion>
+    <Entity>units/rome_centurio_imperial</Entity>
+    <RequiredXp>300</RequiredXp>
+  </Promotion>
   <VisualActor>
     <Actor>units/romans/champion_unit_4_imp_legion.xml</Actor>
   </VisualActor>
Index: units/celt_cavalry_spearman_e.xml
===================================================================
--- units/celt_cavalry_spearman_e.xml	(revision 9928)
+++ units/celt_cavalry_spearman_e.xml	(working copy)
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_spearman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>8.8</WalkSpeed>
-    <Run>
-      <Speed>26.4</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>22.0</Hack>
@@ -25,8 +13,20 @@
       <Hack>66.0</Hack>
     </Charge>
   </Attack>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>8.8</WalkSpeed>
+    <Run>
+      <Speed>26.4</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/cavalry_spearman_e.xml</Actor>
   </VisualActor>
-  <Promotion disable=""/>
 </Entity>
Index: units/celt_cavalry_swordsman_b.xml
===================================================================
--- units/celt_cavalry_swordsman_b.xml	(revision 9928)
+++ units/celt_cavalry_swordsman_b.xml	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
+  <Armour>
+    <Hack>3.0</Hack>
+  </Armour>
   <Identity>
     <Civ>celt</Civ>
 	<SelectionGroupName>units/celt_cavalry_swordsman_b</SelectionGroupName>
@@ -10,9 +13,6 @@
   <Promotion>
     <Entity>units/celt_cavalry_swordsman_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>3.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>10.62</WalkSpeed>
     <Run>
Index: units/noldor_ship_trireme.xml
===================================================================
--- units/noldor_ship_trireme.xml	(revision 9928)
+++ units/noldor_ship_trireme.xml	(working copy)
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Mankar Cirya</SpecificName>
-    <History>Elven Trading ship, coz elves love to trade.</History>
-    <Icon>units/noldor_ship_trireme.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/elven_transport.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_trireme">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Mankar Cirya</SpecificName>
+    <History>Elven Trading ship, coz elves love to trade.</History>
+    <Icon>units/noldor_ship_trireme.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/elven_transport.xml</Actor>
+  </VisualActor>
+</Entity>
Index: units/hele_infantry_archer_b.xml
===================================================================
--- units/hele_infantry_archer_b.xml	(revision 9928)
+++ units/hele_infantry_archer_b.xml	(working copy)
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/hele_gymnasion
+      structures/hele_theatron
+      structures/hele_prytaneion
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <metal>90</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>hele</Civ>
 	<SelectionGroupName>units/hele_infantry_archer_b</SelectionGroupName>
@@ -11,25 +25,10 @@
   <Promotion>
     <Entity>units/hele_infantry_archer_a</Entity>
   </Promotion>
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <metal>90</metal>
-    </Resources>
-  </Cost>
   <Vision>
     <Range>88</Range>
   </Vision>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/hele_gymnasion
-      structures/hele_theatron
-      structures/hele_prytaneion
-    </Entities>
-  </Builder>
-  
 </Entity>
Index: units/hele_mechanical_siege_tower.xml
===================================================================
--- units/hele_mechanical_siege_tower.xml	(revision 9928)
+++ units/hele_mechanical_siege_tower.xml	(working copy)
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_tower">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Helepolis</SpecificName>
-    <Tooltip>Siege Tower</Tooltip>
-    <History>When Demetrius Poliorcetes besieged Salamis, in Cyprus, he instructed that a machine be constructed, which he called "the taker of cities." Its form was that of a square tower, each side 90 cubits high and 45 wide. It rested on four wheels, each eight cubits high. It was divided into nine stories, the lower of which contained machines for throwing great stones, the middle large catapults for throwing spears, and the highest, other machines for throwing smaller stones, together with smaller catapults. It was manned with 200 soldiers, besides those that moved it by pushing the parallel beams at the bottom.</History>
-    <Icon>units/hele_mechanical_siege_tower.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/hellenes/siege_tower.xml</Actor>
-  </VisualActor>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
@@ -21,7 +11,17 @@
     <Square width="11.5" depth="10.0"/>
     <Height>20.0</Height>
   </Footprint>
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Helepolis</SpecificName>
+    <Tooltip>Siege Tower</Tooltip>
+    <History>When Demetrius Poliorcetes besieged Salamis, in Cyprus, he instructed that a machine be constructed, which he called "the taker of cities." Its form was that of a square tower, each side 90 cubits high and 45 wide. It rested on four wheels, each eight cubits high. It was divided into nine stories, the lower of which contained machines for throwing great stones, the middle large catapults for throwing spears, and the highest, other machines for throwing smaller stones, together with smaller catapults. It was manned with 200 soldiers, besides those that moved it by pushing the parallel beams at the bottom.</History>
+    <Icon>units/hele_mechanical_siege_tower.png</Icon>
+  </Identity>
   <Obstruction>
     <Unit radius="3.75"/>
   </Obstruction>
+  <VisualActor>
+    <Actor>structures/hellenes/siege_tower.xml</Actor>
+  </VisualActor>
 </Entity>
Index: template_gaia_geo_rock.xml
===================================================================
--- template_gaia_geo_rock.xml	(revision 9928)
+++ template_gaia_geo_rock.xml	(working copy)
@@ -10,10 +10,10 @@
     <Type>stone</Type>
     <Colour r="128" g="128" b="128"/>
   </Minimap>
-  <Selectable/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>stone.rock</Type>
   </ResourceSupply>
+  <Selectable/>
 </Entity>
Index: template_structure_resource_field.xml
===================================================================
--- template_structure_resource_field.xml	(revision 9928)
+++ template_structure_resource_field.xml	(working copy)
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
-  <Identity>
-    <GenericName>Field</GenericName>
-    <Tooltip>Harvest grain for Food.</Tooltip>
-    <History>Farming originated around 9500 BC in India and the Middle East. The history of agriculture is a central element of human history, as agricultural progress has been a crucial factor in worldwide socio-economic change. Wealth-building and militaristic specializations rarely seen in hunter-gatherer cultures are commonplace in agricultural and agro-industrial societieswhen farmers became capable of producing food beyond the needs of their own families, others in the tribe/nation/empire were freed to devote themselves to projects other than food acquisition.</History>
-    <Icon>structures/field.png</Icon>
-  </Identity>
-  <Minimap>
-    <Colour r="119" g="82" b="46"/>
-  </Minimap>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>40.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Field</Category>
   </BuildRestrictions>
@@ -18,36 +14,33 @@
       <wood>50</wood>
     </Resources>
   </Cost>
-  <ResourceSupply>
-    <KillBeforeGather>false</KillBeforeGather>
-    <Amount>2000</Amount>
-    <Type>food.grain</Type>
-  </ResourceSupply>
-  <Health>
-    <Max>120</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>40.0</Crush>
-  </Armour>
-  <VisualActor>
-    <Actor>structures/plot_field_new.xml</Actor>
-    <FoundationActor>structures/plot_field_found.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="28.0" depth="28.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <GenericName>Field</GenericName>
+    <Tooltip>Harvest grain for Food.</Tooltip>
+    <History>Farming originated around 9500 BC in India and the Middle East. The history of agriculture is a central element of human history, as agricultural progress has been a crucial factor in worldwide socio-economic change. Wealth-building and militaristic specializations rarely seen in hunter-gatherer cultures are commonplace in agricultural and agro-industrial societieswhen farmers became capable of producing food beyond the needs of their own families, others in the tribe/nation/empire were freed to devote themselves to projects other than food acquisition.</History>
+    <Icon>structures/field.png</Icon>
+  </Identity>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
-  <Vision>
-    <Range>28</Range>
-  </Vision>
   <RallyPoint disable=""/>
+  <ResourceSupply>
+    <KillBeforeGather>false</KillBeforeGather>
+    <Amount>2000</Amount>
+    <Type>food.grain</Type>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_field.xml</select>
@@ -55,4 +48,11 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <Vision>
+    <Range>28</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/plot_field_new.xml</Actor>
+    <FoundationActor>structures/plot_field_found.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_champion_infantry_pikeman.xml
===================================================================
--- template_unit_champion_infantry_pikeman.xml	(revision 9928)
+++ template_unit_champion_infantry_pikeman.xml	(working copy)
@@ -1,33 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
-  <Identity>
-    <GenericName>Champion Infantry Pikeman</GenericName>
-    <Classes datatype="tokens">Melee</Classes>
-  </Identity>
-  <Cost>
-    <Resources>
-      <food>50</food>
-      <wood>50</wood>
-      <stone>0</stone>
-      <metal>50</metal>
-    </Resources>
-  </Cost>
-  <Stamina>
-    <Max>1200</Max>
-  </Stamina>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>9.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>4.5</WalkSpeed>
-    <Run>
-      <Speed>12.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
@@ -44,6 +21,18 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <wood>50</wood>
+      <stone>0</stone>
+      <metal>50</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Champion Infantry Pikeman</GenericName>
+    <Classes datatype="tokens">Melee</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -57,4 +46,15 @@
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
+  <Stamina>
+    <Max>1200</Max>
+  </Stamina>
+  <UnitMotion>
+    <WalkSpeed>4.5</WalkSpeed>
+    <Run>
+      <Speed>12.0</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_support_trader.xml
===================================================================
--- template_unit_support_trader.xml	(revision 9928)
+++ template_unit_support_trader.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
-  <Identity>
-    <GenericName>Trader</GenericName>
-    <Rollover>Trade was a very important part of ancient civilisation - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</Rollover>
-    <Tooltip>Trades resources between allied Markets.</Tooltip>
-	<Classes datatype="tokens">Trade</Classes>
-  </Identity>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
   <Cost>
     <Resources>
       <food>50</food>
@@ -15,11 +14,12 @@
   <Health>
     <Max>100</Max>
   </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
+  <Identity>
+    <GenericName>Trader</GenericName>
+    <Rollover>Trade was a very important part of ancient civilisation - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</Rollover>
+    <Tooltip>Trades resources between allied Markets.</Tooltip>
+	<Classes datatype="tokens">Trade</Classes>
+  </Identity>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
   </UnitMotion>
Index: template_structure_economic_market.xml
===================================================================
--- template_structure_economic_market.xml	(revision 9928)
+++ template_structure_economic_market.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
-  <Identity>
-    <GenericName>Market</GenericName>
-    <Tooltip>Create Trade units and Barter resources. (Currently a useless structure)</Tooltip>
-    <Classes datatype="tokens">Town</Classes>
-    <Icon>structures/market.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>20.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Market</Category>
   </BuildRestrictions>
@@ -15,27 +14,22 @@
       <wood>300</wood>
     </Resources>
   </Cost>
-  <Health>
-    <Max>1500</Max>
-  </Health>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>20.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="17.0" depth="17.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>1500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Market</GenericName>
+    <Tooltip>Create Trade units and Barter resources. (Currently a useless structure)</Tooltip>
+    <Classes datatype="tokens">Town</Classes>
+    <Icon>structures/market.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
-  <Vision>
-    <Range>28</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_market.xml</select>
@@ -48,4 +42,10 @@
       units/{civ}_support_trader
     </Entities>
   </TrainingQueue>
+  <Vision>
+    <Range>28</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_structure_military_barracks.xml
===================================================================
--- template_structure_military_barracks.xml	(revision 9928)
+++ template_structure_military_barracks.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <Identity>
-    <GenericName>Barracks</GenericName>
-    <Tooltip>Train Citizen-Soldiers.</Tooltip>
-    <Classes datatype="tokens">Town</Classes>
-    <Icon>structures/barracks.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>15.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>20.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Barracks</Category>
   </BuildRestrictions>
@@ -17,27 +16,28 @@
       <stone>100</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>20.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Infantry Cavalry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Barracks</GenericName>
+    <Tooltip>Train Citizen-Soldiers.</Tooltip>
+    <Classes datatype="tokens">Town</Classes>
+    <Icon>structures/barracks.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_barracks.xml</select>
@@ -45,10 +45,10 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <GarrisonHolder>
-    <Max>10</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Infantry Cavalry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
+  <Vision>
+    <Range>40</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_fauna_wild_aggressive.xml
===================================================================
--- template_unit_fauna_wild_aggressive.xml	(revision 9928)
+++ template_unit_fauna_wild_aggressive.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
-  <Identity>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>aggressive</NaturalBehaviour>
-  </UnitAI>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
@@ -14,4 +9,9 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Identity>
+  </Identity>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
 </Entity>
Index: template_unit_fauna_hunt_violent.xml
===================================================================
--- template_unit_fauna_hunt_violent.xml	(revision 9928)
+++ template_unit_fauna_hunt_violent.xml	(working copy)
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
-  <Identity>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </UnitAI>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
@@ -14,4 +9,9 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
+  <Identity>
+  </Identity>
+  <UnitAI>
+    <NaturalBehaviour>violent</NaturalBehaviour>
+  </UnitAI>
 </Entity>
Index: other/celt_homestead.xml
===================================================================
--- other/celt_homestead.xml	(revision 9928)
+++ other/celt_homestead.xml	(working copy)
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Identity>
-    <Civ>celt</Civ>
-    <GenericName>Homestead</GenericName>
-    <SpecificName>Caer</SpecificName>
-    <History>This was be the centre of the town, a great hall where the clan leader resided. All political matters were probably performed inside such a structure.</History>
-	<Tooltip>A Celtic homestead.</Tooltip>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/celts/homestead.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
-  <Footprint replace="">
-    <Circle radius="15.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <Cost>
     <PopulationBonus>20</PopulationBonus>
     <BuildTime>600</BuildTime>
@@ -28,17 +15,23 @@
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Footprint replace="">
+    <Circle radius="15.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
     <Max>3000</Max>
   </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
+  <Identity>
+    <Civ>celt</Civ>
+    <GenericName>Homestead</GenericName>
+    <SpecificName>Caer</SpecificName>
+    <History>This was be the centre of the town, a great hall where the clan leader resided. All political matters were probably performed inside such a structure.</History>
+	<Tooltip>A Celtic homestead.</Tooltip>
+  </Identity>
+  <Obstruction>
+    <Static width="24.0" depth="24.0"/>
+  </Obstruction>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
   </ResourceDropsite>
@@ -49,4 +42,11 @@
       units/celt_infantry_spearman_b
     </Entities>
   </TrainingQueue>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/celts/homestead.xml</Actor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: other/fence_stone.xml
===================================================================
--- other/fence_stone.xml	(revision 9928)
+++ other/fence_stone.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>15.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="1.5" depth="11.0"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Stone Fence</GenericName>
@@ -7,14 +22,6 @@
     <History>A stone fence.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>15.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -22,24 +29,17 @@
     <stone>20</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/fence_stone_medit.xml</Actor>
-  </VisualActor>
+  <Obstruction>
+    <Static width="1.0" depth="10.5"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="1.5" depth="11.0"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="1.0" depth="10.5"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/fence_stone_medit.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/hellenic_propylaea.xml
===================================================================
--- other/hellenic_propylaea.xml	(revision 9928)
+++ other/hellenic_propylaea.xml	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <Identity>
-    <Civ>hele</Civ>
-    <GenericName>Portico</GenericName>
-    <SpecificName>Propylaea</SpecificName>
-    <History>A Propylaea was used as a gate into a sacred precinct. The most famous of these is the monumental gate at the top of the Acropolis in Athens.</History>
-	<Tooltip>Add +10 to Population Cap.</Tooltip>
-    <Icon>structures/tholos.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>200</BuildTime>
@@ -18,14 +18,21 @@
       <metal>200</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="28.0" depth="32.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Identity>
+    <Civ>hele</Civ>
+    <GenericName>Portico</GenericName>
+    <SpecificName>Propylaea</SpecificName>
+    <History>A Propylaea was used as a gate into a sacred precinct. The most famous of these is the monumental gate at the top of the Acropolis in Athens.</History>
+	<Tooltip>Add +10 to Population Cap.</Tooltip>
+    <Icon>structures/tholos.png</Icon>
+  </Identity>
   <Loot>
     <xp>10</xp>
     <food>0</food>
@@ -33,14 +40,6 @@
     <stone>75</stone>
     <metal>75</metal>
   </Loot>
-  <VisualActor>
-    <Actor>structures/hellenes/propylaea.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="28.0" depth="32.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="26.0" depth="30.0"/>
   </Obstruction>
@@ -48,7 +47,8 @@
     <Range>20</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>structures/hellenes/propylaea.xml</Actor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: other/fence_short.xml
===================================================================
--- other/fence_short.xml	(revision 9928)
+++ other/fence_short.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>2.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>2.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="0.8" depth="6.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Fence</GenericName>
@@ -7,17 +22,6 @@
     <History>A split rail wooden fence.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Minimap>
-    <Colour r="119" g="82" b="46"/>
-  </Minimap>
-  <Health>
-    <Max>50</Max>
-  </Health>
-  <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>2.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -25,24 +29,20 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>temp/fence_wood_short_a.xml</Actor>
-  </VisualActor>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="0.8" depth="6.5"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="0.8" depth="6.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="0.8" depth="6.5"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>temp/fence_wood_short_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/fence_long.xml
===================================================================
--- other/fence_long.xml	(revision 9928)
+++ other/fence_long.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>2.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>2.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="0.8" depth="13.0"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Fence</GenericName>
@@ -7,17 +22,6 @@
     <History>A split rail wooden fence.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Minimap>
-    <Colour r="119" g="82" b="46"/>
-  </Minimap>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>2.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -25,24 +29,20 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>temp/fence_wood_long_a.xml</Actor>
-  </VisualActor>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="0.8" depth="13.0"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="0.8" depth="13.0"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="0.8" depth="13.0"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>temp/fence_wood_long_a.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/column_doric_fallen_b.xml
===================================================================
--- other/column_doric_fallen_b.xml	(revision 9928)
+++ other/column_doric_fallen_b.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="2.5" depth="2.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Column</GenericName>
@@ -7,14 +22,6 @@
     <History>Column drums fallen off some Greek ruin.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -22,24 +29,17 @@
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/column_doric_fallen_b.xml</Actor>
-  </VisualActor>
+  <Obstruction>
+    <Static width="2.0" depth="2.0"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="2.5" depth="2.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="2.0" depth="2.0"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric_fallen_b.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/special_treasure_shipwreck_debris.xml
===================================================================
--- other/special_treasure_shipwreck_debris.xml	(revision 9928)
+++ other/special_treasure_shipwreck_debris.xml	(working copy)
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="4.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck Cargo</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
   <Position>
     <Floating>true</Floating>
   </Position>
@@ -16,11 +23,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrels_floating.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="4.0"/>
-    <Height>2.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
 </Entity>
Index: other/palisades_rocks_outpost.xml
===================================================================
--- other/palisades_rocks_outpost.xml	(revision 9928)
+++ other/palisades_rocks_outpost.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Outpost</SpecificName>
-    <History>Wooden defensive structure</History>
-  </Identity>
   <Cost>
     <BuildTime>18</BuildTime>
   </Cost>
-  <Health>
-    <Max>2000</Max>
-  </Health>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>15.0</Height>
   </Footprint>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Outpost</SpecificName>
+    <History>Wooden defensive structure</History>
+  </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
Index: other/celt_tavern.xml
===================================================================
--- other/celt_tavern.xml	(revision 9928)
+++ other/celt_tavern.xml	(working copy)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Identity>
-    <Civ>celt</Civ>
-    <GenericName>Tavern</GenericName>
-    <SpecificName>Celtic Tavern</SpecificName>
-    <History>Taverns are where Celtic warriors go for a tall glass of mead after a hard-won battle. Some might even find rest in one of the back rooms for rent in this seedy establishment.</History>
-	<Tooltip>Add +10 to Population Cap. Recruit fanatics.</Tooltip>
-  </Identity>
+  <Auras>
+    <Heal>
+      <Radius>30</Radius>
+      <Speed>1000</Speed>
+    </Heal>
+  </Auras>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>200</BuildTime>
@@ -17,27 +16,28 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="18.0" depth="18.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <GenericName>Tavern</GenericName>
+    <SpecificName>Celtic Tavern</SpecificName>
+    <History>Taverns are where Celtic warriors go for a tall glass of mead after a hard-won battle. Some might even find rest in one of the back rooms for rent in this seedy establishment.</History>
+	<Tooltip>Add +10 to Population Cap. Recruit fanatics.</Tooltip>
+  </Identity>
+  <Obstruction>
+    <Static width="17.0" depth="17.0"/>
+  </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/celt_fanatic
     </Entities>
   </TrainingQueue>
-  <Footprint>
-    <Square width="18.0" depth="18.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="17.0" depth="17.0"/>
-  </Obstruction>
-  <Auras>
-    <Heal>
-      <Radius>30</Radius>
-      <Speed>1000</Speed>
-    </Heal>
-  </Auras>
   <VisualActor>
     <Actor>structures/celts/tavern.xml</Actor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
Index: other/palisades_angle_spike.xml
===================================================================
--- other/palisades_angle_spike.xml	(revision 9928)
+++ other/palisades_angle_spike.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade Angle Spike</SpecificName>
-    <History>A cheap, quick defensive spike</History>
-  </Identity>
   <Cost>
     <BuildTime>8</BuildTime>
   </Cost>
-  <Health>
-    <Max>500</Max>
-  </Health>
   <Footprint>
     <Square width="3.5" depth="1.0"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade Angle Spike</SpecificName>
+    <History>A cheap, quick defensive spike</History>
+  </Identity>
   <Obstruction>
     <Static width="3.5" depth="1.0"/>
   </Obstruction>
Index: other/celt_hut.xml
===================================================================
--- other/celt_hut.xml	(revision 9928)
+++ other/celt_hut.xml	(working copy)
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Hut</SpecificName>
-    <History>This is a small round Celtic hut.</History>
-	<Tooltip>Add +2 to Population Cap.</Tooltip>
-  </Identity>
   <Cost>
     <PopulationBonus>2</PopulationBonus>
     <Resources>
@@ -15,19 +9,25 @@
       <metal>0</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <StatusBars>
-    <HeightOffset>7.0</HeightOffset>
-  </StatusBars>
   <Footprint replace="">
     <Circle radius="4.5"/>
     <Height>5.0</Height>
   </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Hut</SpecificName>
+    <History>This is a small round Celtic hut.</History>
+	<Tooltip>Add +2 to Population Cap.</Tooltip>
+  </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
+  <StatusBars>
+    <HeightOffset>7.0</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>structures/celts/hut.xml</Actor>
   </VisualActor>
Index: other/special_treasure_shipwreck.xml
===================================================================
--- other/special_treasure_shipwreck.xml	(revision 9928)
+++ other/special_treasure_shipwreck.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="12.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
@@ -7,6 +11,9 @@
     <Tooltip>A shipwreck with much loss of life. A good opportunity for any businessman.</Tooltip>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
+  <Obstruction>
+    <Static width="20.0" depth="20.0"/>
+  </Obstruction>
   <Position>
     <Floating>true</Floating>
   </Position>
@@ -17,11 +24,4 @@
   <VisualActor>
     <Actor>props/special/eyecandy/shipwreck_hull.xml</Actor>
   </VisualActor>
-  <Footprint replace="">
-    <Circle radius="12.0"/>
-    <Height>2.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
 </Entity>
Index: other/pyramid_minor.xml
===================================================================
--- other/pyramid_minor.xml	(revision 9928)
+++ other/pyramid_minor.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>40.0</Hack>
+    <Pierce>50.0</Pierce>
+    <Crush>50.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="35.5" depth="35.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>10000</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Pyramid</GenericName>
@@ -8,14 +23,6 @@
 	<Tooltip>What treasures lay within this monumental tomb?</Tooltip>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
-  <Health>
-    <Max>10000</Max>
-  </Health>
-  <Armour>
-    <Hack>40.0</Hack>
-    <Pierce>50.0</Pierce>
-    <Crush>50.0</Crush>
-  </Armour>
   <Loot>
     <xp>100</xp>
     <food>0</food>
@@ -23,13 +30,6 @@
     <stone>10000</stone>
     <metal>10000</metal>
   </Loot>
-  <VisualActor>
-    <Actor>special/pyramid_minor.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="35.5" depth="35.5"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="34.0" depth="34.0"/>
   </Obstruction>
@@ -37,7 +37,7 @@
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>special/pyramid_minor.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/palisades_rocks_straight.xml
===================================================================
--- other/palisades_rocks_straight.xml	(revision 9928)
+++ other/palisades_rocks_straight.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
-    <Icon>gaia/special_palisade.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Footprint>
     <Square width="3.0" depth="15.0"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
+    <Icon>gaia/special_palisade.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="3.0" depth="15.0"/>
   </Obstruction>
Index: other/palisades_small_spikes.xml
===================================================================
--- other/palisades_small_spikes.xml	(revision 9928)
+++ other/palisades_small_spikes.xml	(working copy)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Spikes Small</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened branches</History>
-    <Icon>gaia/special_palisade.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
-  <Health>
-    <Max>200</Max>
-  </Health>
   <Footprint>
     <Square width="3.0" depth="11.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Spikes Small</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened branches</History>
+    <Icon>gaia/special_palisade.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="3.0" depth="11.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>props/special/palisade_small_spikes.xml</Actor>
   </VisualActor>
-</Entity>
\ No newline at end of file
+</Entity>
Index: other/table_rectangle.xml
===================================================================
--- other/table_rectangle.xml	(revision 9928)
+++ other/table_rectangle.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="4.0" depth="5.25"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Table</GenericName>
@@ -7,17 +22,6 @@
     <History>A wooden table.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Minimap>
-    <Colour r="119" g="82" b="46"/>
-  </Minimap>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -25,24 +29,20 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/table_rectangle.xml</Actor>
-  </VisualActor>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="3.5" depth="4.75"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="4.0" depth="5.25"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="3.5" depth="4.75"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/table_rectangle.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/celt_fanatic.xml
===================================================================
--- other/celt_fanatic.xml	(revision 9928)
+++ other/celt_fanatic.xml	(working copy)
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>1.0</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>30.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>60.0</Hack>
+    </Charge>
+  </Attack>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Celtic Fanatic</SpecificName>
@@ -7,24 +19,12 @@
     <History>A Celtic fanatic warrior, devoted to war and his Gallic lord.</History>
     <Icon>units/celt_fanatic.png</Icon>
   </Identity>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>30.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>60.0</Hack>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/fanatic.xml</Actor>
   </VisualActor>
Index: other/palisades_rocks_watchtower.xml
===================================================================
--- other/palisades_rocks_watchtower.xml	(revision 9928)
+++ other/palisades_rocks_watchtower.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Watchtower</SpecificName>
-    <History>A cheap, quick tall structure</History>
-  </Identity>
   <Cost>
     <BuildTime>18</BuildTime>
   </Cost>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Footprint>
     <Square width="5.0" depth="5.0"/>
     <Height>12.0</Height>
   </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Watchtower</SpecificName>
+    <History>A cheap, quick tall structure</History>
+  </Identity>
   <Obstruction>
     <Static width="5.0" depth="5.0"/>
   </Obstruction>
Index: other/unfinished_greek_temple.xml
===================================================================
--- other/unfinished_greek_temple.xml	(revision 9928)
+++ other/unfinished_greek_temple.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="19.0" depth="31.5"/>
+    <Height>12.0</Height>
+  </Footprint>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Ruins</GenericName>
@@ -11,13 +15,6 @@
   <Loot>
     <xp>10</xp>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/greek_temple_unfinished.xml</Actor>
-  </VisualActor>
-  <Footprint replace="">
-    <Square width="19.0" depth="31.5"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
@@ -25,4 +22,7 @@
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
+  <VisualActor>
+    <Actor>props/special/eyecandy/greek_temple_unfinished.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/bench.xml
===================================================================
--- other/bench.xml	(revision 9928)
+++ other/bench.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="1.5" depth="4.25"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>75</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Bench</GenericName>
@@ -7,17 +22,6 @@
     <History>A short wooden bench.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Minimap>
-    <Colour r="119" g="82" b="46"/>
-  </Minimap>
-  <Health>
-    <Max>75</Max>
-  </Health>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -25,24 +29,20 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/bench_1.xml</Actor>
-  </VisualActor>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="1.0" depth="4.0"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="1.5" depth="4.25"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="1.0" depth="4.0"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/bench_1.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/hellenic_royal_stoa.xml
===================================================================
--- other/hellenic_royal_stoa.xml	(revision 9928)
+++ other/hellenic_royal_stoa.xml	(working copy)
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <Identity>
-    <Civ>hele</Civ>
-    <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Royal Stoa</SpecificName>
-    <History>A structure built for civic purposes. Stoas eventually became meeting places for philosophy and commerce. They were usually built within the Agora, or city center, of a Greek city.</History>
-	<Tooltip>Add +10 to Population Cap. Recruit special units.</Tooltip>
-    <Icon>gaia/special_stoa.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Stoa</Category>
   </BuildRestrictions>
@@ -21,19 +18,21 @@
       <metal>150</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="29" depth="21.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
-  <TrainingQueue>
-    <Entities datatype="tokens">
-      units/thrace_black_cloak
-    </Entities>
-  </TrainingQueue>
+  <Identity>
+    <Civ>hele</Civ>
+    <GenericName>Stoa</GenericName>
+    <SpecificName>Hellenic Royal Stoa</SpecificName>
+    <History>A structure built for civic purposes. Stoas eventually became meeting places for philosophy and commerce. They were usually built within the Agora, or city center, of a Greek city.</History>
+	<Tooltip>Add +10 to Population Cap. Recruit special units.</Tooltip>
+    <Icon>gaia/special_stoa.png</Icon>
+  </Identity>
   <Loot>
     <xp>10</xp>
     <food>0</food>
@@ -41,19 +40,20 @@
     <stone>10</stone>
     <metal>15</metal>
   </Loot>
-  <VisualActor>
-    <Actor>special/greek_stoa_great.xml</Actor>
-    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="29" depth="21.0"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="28.0" depth="20.0"/>
   </Obstruction>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/thrace_black_cloak
+    </Entities>
+  </TrainingQueue>
   <Vision>
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
+  <VisualActor>
+    <Actor>special/greek_stoa_great.xml</Actor>
+    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: other/palisades_rocks_tower.xml
===================================================================
--- other/palisades_rocks_tower.xml	(revision 9928)
+++ other/palisades_rocks_tower.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade Tower</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
-    <Icon>gaia/special_palisade.png</Icon>
-	</Identity>
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Footprint>
     <Square width="4.5" depth="4.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade Tower</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
+    <Icon>gaia/special_palisade.png</Icon>
+	</Identity>
   <Obstruction>
     <Static width="4.0" depth="4.0"/>
   </Obstruction>
Index: other/pyramid_great.xml
===================================================================
--- other/pyramid_great.xml	(revision 9928)
+++ other/pyramid_great.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>40.0</Hack>
+    <Pierce>50.0</Pierce>
+    <Crush>50.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="60.5" depth="60.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>20000</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Pyramid</GenericName>
@@ -8,14 +23,6 @@
 	<Tooltip>What treasures lay within this monumental tomb?</Tooltip>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
-  <Health>
-    <Max>20000</Max>
-  </Health>
-  <Armour>
-    <Hack>40.0</Hack>
-    <Pierce>50.0</Pierce>
-    <Crush>50.0</Crush>
-  </Armour>
   <Loot>
     <xp>100</xp>
     <food>0</food>
@@ -23,13 +30,6 @@
     <stone>20000</stone>
     <metal>20000</metal>
   </Loot>
-  <VisualActor>
-    <Actor>special/pyramid.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="60.5" depth="60.5"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="59.0" depth="59.0"/>
   </Obstruction>
@@ -37,7 +37,7 @@
     <Range>72</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>special/pyramid.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/obelisk.xml
===================================================================
--- other/obelisk.xml	(revision 9928)
+++ other/obelisk.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>15.0</Hack>
+    <Pierce>20.0</Pierce>
+    <Crush>20.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="4.5" depth="4.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Obelisk</GenericName>
@@ -7,14 +22,6 @@
     <History>A monumental ornamental structure built by the Egyptians of old.</History>
     <Icon>gaia/special_obelisk.png</Icon>
   </Identity>
-  <Health>
-    <Max>1000</Max>
-  </Health>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>20.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -22,13 +29,6 @@
     <stone>200</stone>
     <metal>200</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/obelisk.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="4.5" depth="4.5"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="4.0" depth="4.0"/>
   </Obstruction>
@@ -36,7 +36,7 @@
     <Range>12</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/obelisk.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/bridge_hele.xml
===================================================================
--- other/bridge_hele.xml	(revision 9928)
+++ other/bridge_hele.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="62" depth="15.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200000</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Bridge</GenericName>
@@ -7,16 +17,6 @@
     <History>Roman engineers constructed bridges using concrete, which they called Opus caementicium.</History>
     <Icon>gaia/special_blank.png</Icon>
   </Identity>
-  <Health>
-    <Max>200000</Max>
-  </Health>
-  <VisualActor>
-    <Actor>props/special/eyecandy/bridge_edge_hele.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="62" depth="15.5"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="59" depth="15"/>
   </Obstruction>
@@ -25,7 +25,7 @@
     <Range>72</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/bridge_edge_hele.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/hellenic_epic_temple.xml
===================================================================
--- other/hellenic_epic_temple.xml	(revision 9928)
+++ other/hellenic_epic_temple.xml	(working copy)
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/hele_temple">
-  <Identity>
-    <Civ>hele</Civ>
-    <GenericName>Epic Temple</GenericName>
-    <SpecificName>Naos</SpecificName>
-    <History>The Hellenes built marvelous temples in order to honour their polytheistic pantheon. While all gods were venerated, a specific patron deity was supposed to watch over each polis.</History>
-  </Identity>
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>500</stone>
-      <metal>500</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>5000</Max>
-  </Health>
-  <Loot>
-    <xp>50</xp>
-    <food>0</food>
-    <wood>0</wood>
-    <stone>500</stone>
-    <metal>500</metal>
-  </Loot>
-  <VisualActor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-    <Actor>structures/hellenes/temple_epic.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="28.0" depth="58.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="27.0" depth="57.0"/>
-  </Obstruction>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-</Entity>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="structures/hele_temple">
+  <Cost>
+    <BuildTime>300</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>500</stone>
+      <metal>500</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="28.0" depth="58.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Health>
+    <Max>5000</Max>
+  </Health>
+  <Identity>
+    <Civ>hele</Civ>
+    <GenericName>Epic Temple</GenericName>
+    <SpecificName>Naos</SpecificName>
+    <History>The Hellenes built marvelous temples in order to honour their polytheistic pantheon. While all gods were venerated, a specific patron deity was supposed to watch over each polis.</History>
+  </Identity>
+  <Loot>
+    <xp>50</xp>
+    <food>0</food>
+    <wood>0</wood>
+    <stone>500</stone>
+    <metal>500</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="27.0" depth="57.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+    <Actor>structures/hellenes/temple_epic.xml</Actor>
+  </VisualActor>
+</Entity>
Index: other/palisades_rocks_end.xml
===================================================================
--- other/palisades_rocks_end.xml	(revision 9928)
+++ other/palisades_rocks_end.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade End</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
-    <Icon>gaia/special_palisade.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>8</BuildTime>
   </Cost>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade End</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
+    <Icon>gaia/special_palisade.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="1.5" depth="3.0"/>
   </Obstruction>
Index: other/column_doric_fallen.xml
===================================================================
--- other/column_doric_fallen.xml	(revision 9928)
+++ other/column_doric_fallen.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="2.5" depth="12.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Column</GenericName>
@@ -7,14 +22,6 @@
     <History>A column fallen off some Greek ruin.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -22,24 +29,17 @@
     <stone>20</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
-  </VisualActor>
+  <Obstruction>
+    <Static width="2.0" depth="12.0"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="2.5" depth="12.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="2.0" depth="12.0"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/plane.xml
===================================================================
--- other/plane.xml	(revision 9928)
+++ other/plane.xml	(working copy)
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>100.0</Pierce>
+      <Crush>25.0</Crush>
+      <MaxRange>48</MaxRange>
+      <MinRange>24</MinRange>
+      <ProjectileSpeed>60.0</ProjectileSpeed>
+      <PrepareTime>0</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>P-51 Mustang</SpecificName>
     <History>This may be anachronistic.</History>
     <Tooltip>A World War 2 American fighter plane.</Tooltip>
     <Icon>units/global_mustang.png</Icon>
-    <Formations datatype="tokens" replace=""></Formations>
+    <Formations datatype="tokens" replace=""/>
   </Identity>
-  <VisualActor>
-    <Actor>units/global/plane.xml</Actor>
-  </VisualActor>
-    <Vision>
-    <Range>100</Range>
-  </Vision>
   <Obstruction disable=""/>
-  <UnitMotion disable=""/>
   <Position>
     <TurnRate>1.0</TurnRate>
   </Position>
+  <UnitMotion disable=""/>
   <UnitMotionFlying>
     <MaxSpeed>40.0</MaxSpeed>
     <AccelRate>15.0</AccelRate>
@@ -27,16 +33,10 @@
     <FlyingHeight>50.0</FlyingHeight>
     <ClimbRate>5.0</ClimbRate>
   </UnitMotionFlying>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>100.0</Pierce>
-      <Crush>25.0</Crush>
-      <MaxRange>48</MaxRange>
-      <MinRange>24</MinRange>
-      <ProjectileSpeed>60.0</ProjectileSpeed>
-      <PrepareTime>0</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>units/global/plane.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/palisades_tall_spikes.xml
===================================================================
--- other/palisades_tall_spikes.xml	(revision 9928)
+++ other/palisades_tall_spikes.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Spikes Tall</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
-    <Icon>gaia/special_palisade.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
-  <Health>
-    <Max>500</Max>
-  </Health>
   <Footprint>
     <Square width="3.0" depth="11.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Spikes Tall</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
+    <Icon>gaia/special_palisade.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="3.0" depth="11.0"/>
   </Obstruction>
Index: other/palisades_rocks_fort.xml
===================================================================
--- other/palisades_rocks_fort.xml	(revision 9928)
+++ other/palisades_rocks_fort.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade Fort</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
-    <Icon>gaia/special_palisade.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>18</BuildTime>
   </Cost>
-  <Health>
-    <Max>2000</Max>
-  </Health>
   <Footprint>
     <Square width="9.5" depth="8.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade Fort</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
+    <Icon>gaia/special_palisade.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="9.0" depth="7.5"/>
   </Obstruction>
Index: other/palisades_rocks_gate.xml
===================================================================
--- other/palisades_rocks_gate.xml	(revision 9928)
+++ other/palisades_rocks_gate.xml	(working copy)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade Gate</SpecificName>
-    <History>A cheap, quick wooden gate</History>
-  </Identity>
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
-  <Health>
-    <Max>2600</Max>
-  </Health>
   <Footprint>
     <Square width="1.8" depth="14.0"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>2600</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade Gate</SpecificName>
+    <History>A cheap, quick wooden gate</History>
+  </Identity>
   <Obstruction>
     <Static width="1.8" depth="14.0"/>
   </Obstruction>
Index: other/bridge_wooden.xml
===================================================================
--- other/bridge_wooden.xml	(revision 9928)
+++ other/bridge_wooden.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="62" depth="15.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200000</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Wooden Bridge</GenericName>
@@ -7,16 +17,6 @@
     <History>Roman engineers constructed bridges using concrete, which they called Opus caementicium.</History>
     <Icon>gaia/special_blank.png</Icon>
   </Identity>
-  <Health>
-    <Max>200000</Max>
-  </Health>
-  <VisualActor>
-    <Actor>props/special/eyecandy/bridge_edge_wooden.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Square width="62" depth="15.5"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="59" depth="15"/>
   </Obstruction>
@@ -25,7 +25,7 @@
     <Range>72</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/bridge_edge_wooden.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/table_square.xml
===================================================================
--- other/table_square.xml	(revision 9928)
+++ other/table_square.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Special</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="4.5" depth="4.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Table</GenericName>
@@ -7,17 +22,6 @@
     <History>A wooden table.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <Minimap>
-    <Colour r="119" g="82" b="46"/>
-  </Minimap>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -25,24 +29,20 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/table_square.xml</Actor>
-  </VisualActor>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="4.0" depth="4.0"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="4.5" depth="4.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="4.0" depth="4.0"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
+  <VisualActor>
+    <Actor>props/special/eyecandy/table_square.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/hellenic_stoa.xml
===================================================================
--- other/hellenic_stoa.xml	(revision 9928)
+++ other/hellenic_stoa.xml	(working copy)
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <Identity>
-    <Civ>hele</Civ>
-    <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Stoa</SpecificName>
-    <History>A structure built for civic purposes. Stoa eventually became meeting places for philosophy and commerce. They were usually built within the Agora, or city center, of a Greek city.</History>
-	<Tooltip>Add +10 to Population Cap.</Tooltip>
-    <Icon>gaia/special_stoa.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Stoa</Category>
   </BuildRestrictions>
@@ -21,14 +18,21 @@
       <metal>100</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="28" depth="12.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Health>
     <Max>1100</Max>
   </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Identity>
+    <Civ>hele</Civ>
+    <GenericName>Stoa</GenericName>
+    <SpecificName>Hellenic Stoa</SpecificName>
+    <History>A structure built for civic purposes. Stoa eventually became meeting places for philosophy and commerce. They were usually built within the Agora, or city center, of a Greek city.</History>
+	<Tooltip>Add +10 to Population Cap.</Tooltip>
+    <Icon>gaia/special_stoa.png</Icon>
+  </Identity>
   <Loot>
     <xp>10</xp>
     <food>0</food>
@@ -36,14 +40,6 @@
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
-  <VisualActor>
-    <Actor>special/greek_stoa.xml</Actor>
-    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="28" depth="12.0"/>
-    <Height>10.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="26.0" depth="10.5"/>
   </Obstruction>
@@ -51,4 +47,8 @@
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
+  <VisualActor>
+    <Actor>special/greek_stoa.xml</Actor>
+    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: other/celt_longhouse.xml
===================================================================
--- other/celt_longhouse.xml	(revision 9928)
+++ other/celt_longhouse.xml	(working copy)
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Identity>
-    <Civ>celt</Civ>
-    <SpecificName>Longhouse</SpecificName>
-    <History>Later Celts constructed larger dwellings, called long houses, which could house more than one family.</History>
-	<Tooltip>Add +10 to Population Cap.</Tooltip>
-  </Identity>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>300</BuildTime>
@@ -16,13 +10,19 @@
       <metal>0</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Footprint>
     <Square width="12" depth="16.0"/>
     <Height>10.0</Height>
   </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <SpecificName>Longhouse</SpecificName>
+    <History>Later Celts constructed larger dwellings, called long houses, which could house more than one family.</History>
+	<Tooltip>Add +10 to Population Cap.</Tooltip>
+  </Identity>
   <Obstruction>
     <Static width="10.0" depth="14.0"/>
   </Obstruction>
Index: other/palisades_rocks_curve.xml
===================================================================
--- other/palisades_rocks_curve.xml	(revision 9928)
+++ other/palisades_rocks_curve.xml	(working copy)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Palisade Curve</SpecificName>
-    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
-    <Icon>gaia/special_palisade.png</Icon>
-  </Identity>
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Footprint>
     <Square width="3.5" depth="8.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Palisade Curve</SpecificName>
+    <History>A cheap, quick defensive structure constructed with sharpened tree trunks</History>
+    <Icon>gaia/special_palisade.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="3.0" depth="8.0"/>
   </Obstruction>
Index: other/column_doric.xml
===================================================================
--- other/column_doric.xml	(revision 9928)
+++ other/column_doric.xml	(working copy)
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <BuildRestrictions>
+    <Category>Fence</Category>
+  </BuildRestrictions>
+  <Footprint>
+    <Square width="2.5" depth="2.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Column</GenericName>
@@ -7,17 +22,6 @@
     <History>A column of the understated Greek Doric Order.</History>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
-  <BuildRestrictions>
-    <Category>Fence</Category>
-  </BuildRestrictions>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
   <Loot>
     <xp>1</xp>
     <food>0</food>
@@ -25,21 +29,17 @@
     <stone>20</stone>
     <metal>0</metal>
   </Loot>
-  <VisualActor>
-    <Actor>props/special/eyecandy/column_doric.xml</Actor>
-  </VisualActor>
+  <Obstruction>
+    <Static width="2.0" depth="2.0"/>
+  </Obstruction>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Square width="2.5" depth="2.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="2.0" depth="2.0"/>
-  </Obstruction>
   <Vision>
     <Range>4</Range>
     <RetainInFog>true</RetainInFog>
   </Vision>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric.xml</Actor>
+  </VisualActor>
 </Entity>
Index: other/generic_field.xml
===================================================================
--- other/generic_field.xml	(revision 9928)
+++ other/generic_field.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_field">
+  <Footprint>
+    <Square width="30.0" depth="30.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Wheat Field</SpecificName>
@@ -9,8 +13,4 @@
     <Actor>structures/plot_field_new.xml</Actor>
     <FoundationActor>structures/plot_field_new.xml</FoundationActor>
   </VisualActor>
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>5.0</Height>
-  </Footprint>
 </Entity>
Index: template_unit_infantry.xml
===================================================================
--- template_unit_infantry.xml	(revision 9928)
+++ template_unit_infantry.xml	(working copy)
@@ -1,13 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Identity>
-    <GenericName>Infantry</GenericName>
-    <Classes datatype="tokens">Infantry CitizenSoldier Organic</Classes>
-    <Rank>Basic</Rank>
-  </Identity>
-  <Promotion>
-    <RequiredXp>100</RequiredXp>
-  </Promotion>
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>1.0</Pierce>
+    <Crush>9.0</Crush>
+  </Armour>
+  <Builder>
+    <Rate>1.0</Rate>
+    <Entities datatype="tokens">
+      structures/{civ}_house
+      structures/{civ}_mill
+      structures/{civ}_farmstead
+      structures/{civ}_field
+      structures/{civ}_corral
+      structures/{civ}_temple
+      structures/{civ}_market
+      structures/{civ}_civil_centre
+      structures/{civ}_barracks
+      structures/{civ}_dock
+      structures/{civ}_scout_tower
+      structures/{civ}_wall
+      structures/{civ}_wall_tower
+      structures/{civ}_wall_gate
+      structures/{civ}_fortress
+    </Entities>
+  </Builder>
   <Cost>
     <BuildTime>9</BuildTime>
     <Resources>
@@ -17,6 +34,15 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Health>
+    <Max>100</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Infantry</GenericName>
+    <Classes datatype="tokens">Infantry CitizenSoldier Organic</Classes>
+    <Rank>Basic</Rank>
+  </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
@@ -25,6 +51,9 @@
     <metal>0</metal>
   </Loot>
   <Looter/>
+  <Promotion>
+    <RequiredXp>100</RequiredXp>
+  </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -40,48 +69,6 @@
       <metal.ore>1</metal.ore>
     </Rates>
   </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-    <RegenRate>0.2</RegenRate>
-  </Health>
-  <Stamina>
-    <Max>1000</Max>
-  </Stamina>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-    <Crush>9.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
-    <Run>
-      <Speed>17.5</Speed>
-    </Run>
-    <CostClass>infantry</CostClass>
-  </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-  <Builder>
-    <Rate>1.0</Rate>
-    <Entities datatype="tokens">
-      structures/{civ}_house
-      structures/{civ}_mill
-      structures/{civ}_farmstead
-      structures/{civ}_field
-      structures/{civ}_corral
-      structures/{civ}_temple
-      structures/{civ}_market
-      structures/{civ}_civil_centre
-      structures/{civ}_barracks
-      structures/{civ}_dock
-      structures/{civ}_scout_tower
-      structures/{civ}_wall
-      structures/{civ}_wall_tower
-      structures/{civ}_wall_gate
-      structures/{civ}_fortress
-    </Entities>
-  </Builder>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -102,4 +89,17 @@
       <trained>actor/singlesteps/steps_gravel.xml</trained>
     </SoundGroups>
   </Sound>
+  <Stamina>
+    <Max>1000</Max>
+  </Stamina>
+  <UnitMotion>
+    <WalkSpeed>7.5</WalkSpeed>
+    <Run>
+      <Speed>17.5</Speed>
+    </Run>
+    <CostClass>infantry</CostClass>
+  </UnitMotion>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
 </Entity>
Index: template_unit_mechanical_ship_bireme.xml
===================================================================
--- template_unit_mechanical_ship_bireme.xml	(revision 9928)
+++ template_unit_mechanical_ship_bireme.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
-  <Identity>
-    <GenericName>Light Warship</GenericName>
-    <Tooltip>Light Warship.</Tooltip>
-	<Classes datatype="tokens">Warship</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>300</Max>
-  </Health>
-  <UnitMotion>
-    <WalkSpeed>12.5</WalkSpeed>
-  </UnitMotion>
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <ResourceGatherer disable=""/>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -36,20 +17,39 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <BuildTime>30</BuildTime>
+    <Resources>
+      <wood>100</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
   <GarrisonHolder>
     <Max>20</Max>
 	<EjectHealth>0.1</EjectHealth>
 	<List datatype="tokens">Support Infantry Cavalry</List>
 	<BuffHeal>1</BuffHeal>
   </GarrisonHolder>
+  <Health>
+    <Max>300</Max>
+  </Health>
+  <Identity>
+    <GenericName>Light Warship</GenericName>
+    <Tooltip>Light Warship.</Tooltip>
+	<Classes datatype="tokens">Warship</Classes>
+  </Identity>
+  <ResourceGatherer disable=""/>
+  <Sound>
+    <SoundGroups>
+      <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
+    </SoundGroups>
+  </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Sound>
-    <SoundGroups>
-      <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
-    </SoundGroups>
-  </Sound>
+  <UnitMotion>
+    <WalkSpeed>12.5</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_mechanical_siege_onager.xml
===================================================================
--- template_unit_mechanical_siege_onager.xml	(revision 9928)
+++ template_unit_mechanical_siege_onager.xml	(working copy)
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
-  <Identity>
-    <GenericName>Siege Onager</GenericName>
-    <Tooltip>Bonused vs. Structures and Massed Infantry.</Tooltip>
-  </Identity>
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>15.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>50.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>100.0</Crush>
+      <MaxRange>80</MaxRange>
+      <MinRange>12.0</MinRange>
+      <ProjectileSpeed>30.0</ProjectileSpeed>
+      <PrepareTime>5000</PrepareTime>
+      <RepeatTime>5000</RepeatTime>
+    </Ranged>
+  </Attack>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
@@ -11,6 +24,13 @@
       <stone>100</stone>
     </Resources>
   </Cost>
+  <Health>
+    <Max>300</Max>
+  </Health>
+  <Identity>
+    <GenericName>Siege Onager</GenericName>
+    <Tooltip>Bonused vs. Structures and Massed Infantry.</Tooltip>
+  </Identity>
   <Loot>
     <xp>300</xp>
     <food>0</food>
@@ -18,38 +38,18 @@
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
-  <Health>
-    <Max>300</Max>
-  </Health>
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>15.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Sound>
+    <SoundGroups>
+      <select>attack/siege/siege_select.xml</select>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed>5.5</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>50.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>100.0</Crush>
-      <MaxRange>80</MaxRange>
-      <MinRange>12.0</MinRange>
-      <ProjectileSpeed>30.0</ProjectileSpeed>
-      <PrepareTime>5000</PrepareTime>
-      <RepeatTime>5000</RepeatTime>
-    </Ranged>
-  </Attack>
   <Vision>
     <Range>90</Range>
   </Vision>
-  <Sound>
-    <SoundGroups>
-      <select>attack/siege/siege_select.xml</select>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: template_gaia_geo_rock_slabs.xml
===================================================================
--- template_gaia_geo_rock_slabs.xml	(revision 9928)
+++ template_gaia_geo_rock_slabs.xml	(working copy)
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo_rock">
+  <Footprint>
+    <Circle radius="10.0"/>
+    <Height>3.5</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="13.0" depth="13.0"/>
+  </Obstruction>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
@@ -11,11 +18,4 @@
     <BarHeight>0.6</BarHeight>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
-  <Footprint>
-    <Circle radius="10.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="13.0" depth="13.0"/>
-  </Obstruction>
 </Entity>
Index: template_unit_mechanical_siege_ram.xml
===================================================================
--- template_unit_mechanical_siege_ram.xml	(revision 9928)
+++ template_unit_mechanical_siege_ram.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
-  <Identity>
-    <GenericName>Siege Ram</GenericName>
-    <Tooltip>Bonused vs. Wall Gates.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <wood>260</wood>
-      <metal>60</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>200</Max>
-  </Health>
   <Armour>
     <Hack>5.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>3.5</WalkSpeed>
-    <Run>
-      <Speed>8.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>0.0</Hack>
@@ -40,9 +21,19 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
-  <Vision>
-    <Range>48</Range>
-  </Vision>
+  <Cost>
+    <Resources>
+      <wood>260</wood>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Siege Ram</GenericName>
+    <Tooltip>Bonused vs. Wall Gates.</Tooltip>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
@@ -51,4 +42,13 @@
 	  <trained>attack/siege/ram_move.xml</trained>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>3.5</WalkSpeed>
+    <Run>
+      <Speed>8.0</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>48</Range>
+  </Vision>
 </Entity>
Index: template_structure_special.xml
===================================================================
--- template_structure_special.xml	(revision 9928)
+++ template_structure_special.xml	(working copy)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <Identity>
-    <GenericName>Special Building</GenericName>
-    <Tooltip>This is a special building unique to a particular civilisation.</Tooltip>
-    <Classes datatype="tokens">City</Classes>
-    <Icon>.png</Icon>
-  </Identity>
   <BuildRestrictions>
     <Category>Special</Category>
   </BuildRestrictions>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <VisualActor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="24.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Special Building</GenericName>
+    <Tooltip>This is a special building unique to a particular civilisation.</Tooltip>
+    <Classes datatype="tokens">City</Classes>
+    <Icon>.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
+  <VisualActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_infantry_melee.xml
===================================================================
--- template_unit_infantry_melee.xml	(revision 9928)
+++ template_unit_infantry_melee.xml	(working copy)
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
-  <Identity>
-    <GenericName>Melee Infantry</GenericName>
-    <Classes datatype="tokens">Melee</Classes>
-  </Identity>
-  <Health>
-    <Max>100</Max>
-    <RegenRate>0.2</RegenRate>
-  </Health>
-  <Cost>
-    <BuildTime>10</BuildTime>
-  </Cost>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
@@ -27,4 +16,15 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <BuildTime>10</BuildTime>
+  </Cost>
+  <Health>
+    <Max>100</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Melee Infantry</GenericName>
+    <Classes datatype="tokens">Melee</Classes>
+  </Identity>
 </Entity>
Index: template_structure_military_fortress.xml
===================================================================
--- template_structure_military_fortress.xml	(revision 9928)
+++ template_structure_military_fortress.xml	(working copy)
@@ -1,50 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <Identity>
-    <GenericName>Fortress</GenericName>
-    <Tooltip>Train Heroes, Champion, and Siege Units.</Tooltip>
-    <Classes datatype="tokens">City Defensive</Classes>
-    <Icon>structures/fortress.png</Icon>
-  </Identity>
-  <BuildRestrictions>
-    <Category>Fortress</Category>
-  </BuildRestrictions>
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>420</BuildTime>
-    <Resources>
-      <wood>0</wood>
-      <stone>500</stone>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>4200</Max>
-  </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
-  <Footprint>
-    <Square width="24.0" depth="24.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_fortress.xml</select>
-      <constructed>interface/complete/building/complete_fortress.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -61,10 +21,50 @@
     <DefaultArrowCount>1</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
+  <BuildRestrictions>
+    <Category>Fortress</Category>
+  </BuildRestrictions>
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>420</BuildTime>
+    <Resources>
+      <wood>0</wood>
+      <stone>500</stone>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="24.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
 	<EjectHealth>0.1</EjectHealth>
 	<List datatype="tokens">Support Infantry Cavalry Siege</List>
 	<BuffHeal>1</BuffHeal>
   </GarrisonHolder>
+  <Health>
+    <Max>4200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Fortress</GenericName>
+    <Tooltip>Train Heroes, Champion, and Siege Units.</Tooltip>
+    <Classes datatype="tokens">City Defensive</Classes>
+    <Icon>structures/fortress.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="24.0" depth="24.0"/>
+  </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_fortress.xml</select>
+      <constructed>interface/complete/building/complete_fortress.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_gaia.xml
===================================================================
--- template_gaia.xml	(revision 9928)
+++ template_gaia.xml	(working copy)
@@ -4,17 +4,6 @@
     <Civ>gaia</Civ>
     <GenericName>Gaia</GenericName>
   </Identity>
-  <Vision>
-    <Range>0</Range>
-    <RetainInFog>true</RetainInFog>
-    <AlwaysVisible>false</AlwaysVisible>
-  </Vision>
-  <StatusBars>
-    <BarWidth>2.0</BarWidth>
-    <BarHeight>0.333</BarHeight>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <OverlayRenderer/>
   <Obstruction>
     <Active>true</Active>
     <BlockMovement>true</BlockMovement>
@@ -24,6 +13,17 @@
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
   </Obstruction>
+  <OverlayRenderer/>
+  <StatusBars>
+    <BarWidth>2.0</BarWidth>
+    <BarHeight>0.333</BarHeight>
+    <HeightOffset>5.0</HeightOffset>
+  </StatusBars>
+  <Vision>
+    <Range>0</Range>
+    <RetainInFog>true</RetainInFog>
+    <AlwaysVisible>false</AlwaysVisible>
+  </Vision>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
Index: template_unit_cavalry_ranged_archer.xml
===================================================================
--- template_unit_cavalry_ranged_archer.xml	(revision 9928)
+++ template_unit_cavalry_ranged_archer.xml	(working copy)
@@ -1,31 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
-  <Identity>
-    <GenericName>Cavalry Archer</GenericName>
-    <Rollover>A very rare unit in Part 1. It was used by the Persians, but it didn't gain much traction until the Parthians, Huns, Mongols, and other people of the nomadic steeps introduced them to western Europe. This was the most effective unit on the battlefield for several hundred years until the well armoured knight came along. Therefore, this unit will gain much more prominence in Part 2.</Rollover>
-    <Tooltip>Bonused vs. Infantry Spearman and Infantry Swordsman.</Tooltip>
-  </Identity>
-  <Cost>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>85</wood>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>150</Max>
-  </Health>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
-    <Run>
-      <Speed>22.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -38,4 +17,25 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <food>100</food>
+      <wood>85</wood>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <GenericName>Cavalry Archer</GenericName>
+    <Rollover>A very rare unit in Part 1. It was used by the Persians, but it didn't gain much traction until the Parthians, Huns, Mongols, and other people of the nomadic steeps introduced them to western Europe. This was the most effective unit on the battlefield for several hundred years until the well armoured knight came along. Therefore, this unit will gain much more prominence in Part 2.</Rollover>
+    <Tooltip>Bonused vs. Infantry Spearman and Infantry Swordsman.</Tooltip>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>8.5</WalkSpeed>
+    <Run>
+      <Speed>22.0</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_gaia_flora_bush.xml
===================================================================
--- template_gaia_flora_bush.xml	(revision 9928)
+++ template_gaia_flora_bush.xml	(working copy)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora">
-  <Identity>
-    <GenericName>Bush</GenericName>
-  </Identity>
   <Footprint>
     <Circle radius="1.0"/>
     <Height>1.0</Height>
   </Footprint>
+  <Identity>
+    <GenericName>Bush</GenericName>
+  </Identity>
   <Obstruction>
     <Unit radius="1.0"/>
     <BlockMovement>false</BlockMovement>
Index: template_unit_hero_infantry.xml
===================================================================
--- template_unit_hero_infantry.xml	(revision 9928)
+++ template_unit_hero_infantry.xml	(working copy)
@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
-  <Identity>
-    <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Hero Infantry</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>25.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>50.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+    </Charge>
+  </Attack>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
@@ -14,6 +27,14 @@
       <metal>200</metal>
     </Resources>
   </Cost>
+  <Health>
+    <Max>400</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry</Classes>
+  </Identity>
   <Loot>
     <xp>400</xp>
     <food>5</food>
@@ -21,18 +42,18 @@
     <stone>0</stone>
     <metal>20</metal>
   </Loot>
-  <Health>
-    <Max>400</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/weapon/sword.xml</attack>
+      <death>actor/human/death/death.xml</death>
+    </SoundGroups>
+  </Sound>
   <Stamina>
     <Max>1500</Max>
   </Stamina>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>12.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>6.1</WalkSpeed>
     <Run>
@@ -41,28 +62,7 @@
       <RangeMin>8.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>25.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>50.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-    </Charge>
-  </Attack>
   <Vision>
     <Range>80</Range>
   </Vision>
-  <Sound>
-    <SoundGroups>
-      <attack>attack/weapon/sword.xml</attack>
-      <death>actor/human/death/death.xml</death>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: template_unit_cavalry_ranged_javelinist.xml
===================================================================
--- template_unit_cavalry_ranged_javelinist.xml	(revision 9928)
+++ template_unit_cavalry_ranged_javelinist.xml	(working copy)
@@ -1,31 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
-  <Identity>
-    <GenericName>Cavalry Javelinist</GenericName>
-    <Rollover>The javelins thrown from a horse's back were probably 3 at most. The idea was to quickly advance with 3 in hand, then throw them all. After you had done that it was time to switch to your secondary weapon which was usually a spear or a sword. However, in the game - these units will only have ranged attack.</Rollover>
-    <Tooltip>Bonused vs. Infantry Archer and Cavalry Swordsman.</Tooltip>
-  </Identity>
-  <Cost>
-    <BuildTime>12</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>120</Max>
-  </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>3.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>11.3</WalkSpeed>
-    <Run>
-      <Speed>32.4</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -38,4 +17,25 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <food>100</food>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <GenericName>Cavalry Javelinist</GenericName>
+    <Rollover>The javelins thrown from a horse's back were probably 3 at most. The idea was to quickly advance with 3 in hand, then throw them all. After you had done that it was time to switch to your secondary weapon which was usually a spear or a sword. However, in the game - these units will only have ranged attack.</Rollover>
+    <Tooltip>Bonused vs. Infantry Archer and Cavalry Swordsman.</Tooltip>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>11.3</WalkSpeed>
+    <Run>
+      <Speed>32.4</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_structure_defense_wall_gate.xml
===================================================================
--- template_structure_defense_wall_gate.xml	(revision 9928)
+++ template_structure_defense_wall_gate.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>Gate</GenericName>
-    <Tooltip>Allow units access through a City Wall. Currently not a working feature.</Tooltip>
-    <Classes datatype="tokens">Village</Classes>
-    <Icon>structures/gate.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>15.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Wall</Category>
   </BuildRestrictions>
@@ -15,21 +14,19 @@
       <stone>200</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>3000</Max>
-  </Health>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>3000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Gate</GenericName>
+    <Tooltip>Allow units access through a City Wall. Currently not a working feature.</Tooltip>
+    <Classes datatype="tokens">Village</Classes>
+    <Icon>structures/gate.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
@@ -40,4 +37,7 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <VisualActor>
+    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_support_female_citizen.xml
===================================================================
--- template_unit_support_female_citizen.xml	(revision 9928)
+++ template_unit_support_female_citizen.xml	(working copy)
@@ -1,38 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
-  <Identity>
-    <GenericName>Female Citizen</GenericName>
-    <History>Women in the ancient world took on a variety of roles - from leadership (Celts) to servant (Greeks). Women are hard workers, the economic backbone of any civilisation. In history, it was typical when all the males (capable of fighting) were killed for the females, children, and elderly to be sold as slaves.</History>
-    <Tooltip>Gather resources, build civic structures, and inspire nearby males to work faster.</Tooltip>
-    <Classes datatype="tokens">Worker</Classes>
-  </Identity>
-  <Cost>
-    <Resources>
-      <food>50</food>
-    </Resources>
-  </Cost>
-  <ResourceGatherer>
-    <MaxDistance>2.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
-    <Rates>
-      <food.fish>1</food.fish>
-      <food.fruit>2</food.fruit>
-      <food.grain>1</food.grain>
-      <food.meat>1</food.meat>
-      <wood.tree>0.75</wood.tree>
-      <wood.ruins>5</wood.ruins>
-      <stone.rock>0.75</stone.rock>
-      <stone.ruins>5</stone.ruins>
-      <metal.ore>0.75</metal.ore>
-    </Rates>
-  </ResourceGatherer>
-  <Health>
-    <Max>75</Max>
-    <RegenRate>0.3</RegenRate>
-  </Health>
-  <Stamina>
-    <Max>500</Max>
-  </Stamina>
   <Armour>
     <Hack>1.0</Hack>
     <Pierce>1.0</Pierce>
@@ -47,17 +14,15 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
-  <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
-    <Run>
-      <Speed>8.0</Speed>
-      <Range>150.0</Range>
-      <RangeMin>0.0</RangeMin>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
+  <Auras>
+    <Allure>
+      <Radius>25</Radius>
+    </Allure>
+    <Infidelity>
+      <Radius>10</Radius>
+      <Time>10</Time>
+    </Infidelity>
+  </Auras>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
@@ -71,15 +36,36 @@
       structures/{civ}_civil_centre
     </Entities>
   </Builder>
-  <Auras>
-    <Allure>
-      <Radius>25</Radius>
-    </Allure>
-    <Infidelity>
-      <Radius>10</Radius>
-      <Time>10</Time>
-    </Infidelity>
-  </Auras>
+  <Cost>
+    <Resources>
+      <food>50</food>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>75</Max>
+    <RegenRate>0.3</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Female Citizen</GenericName>
+    <History>Women in the ancient world took on a variety of roles - from leadership (Celts) to servant (Greeks). Women are hard workers, the economic backbone of any civilisation. In history, it was typical when all the males (capable of fighting) were killed for the females, children, and elderly to be sold as slaves.</History>
+    <Tooltip>Gather resources, build civic structures, and inspire nearby males to work faster.</Tooltip>
+    <Classes datatype="tokens">Worker</Classes>
+  </Identity>
+  <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <food.fish>1</food.fish>
+      <food.fruit>2</food.fruit>
+      <food.grain>1</food.grain>
+      <food.meat>1</food.meat>
+      <wood.tree>0.75</wood.tree>
+      <wood.ruins>5</wood.ruins>
+      <stone.rock>0.75</stone.rock>
+      <stone.ruins>5</stone.ruins>
+      <metal.ore>0.75</metal.ore>
+    </Rates>
+  </ResourceGatherer>
   <Sound>
     <SoundGroups>
 	  <select>voice/hellenes/civ/civ_female_select.xml</select>
@@ -97,4 +83,18 @@
       <gather_ore>resource/mining/mining.xml</gather_ore>
     </SoundGroups>
   </Sound>
+  <Stamina>
+    <Max>500</Max>
+  </Stamina>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+    <Run>
+      <Speed>8.0</Speed>
+      <Range>150.0</Range>
+      <RangeMin>0.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
 </Entity>
Index: template_unit_hero_ranged.xml
===================================================================
--- template_unit_hero_ranged.xml	(revision 9928)
+++ template_unit_hero_ranged.xml	(working copy)
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_ranged">
-  <Identity>
-    <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Hero Infantry Ranged</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>50.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>56.0</MaxRange>
+      <ProjectileSpeed>25.0</ProjectileSpeed>
+      <PrepareTime>1200</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
@@ -14,6 +23,14 @@
       <wood>500</wood>
     </Resources>
   </Cost>
+  <Health>
+    <Max>200</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry Ranged</Classes>
+  </Identity>
   <Loot>
     <xp>200</xp>
     <food>10</food>
@@ -21,30 +38,13 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
-  <Health>
-    <Max>200</Max>
-    <RegenRate>0.2</RegenRate>
-  </Health>
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>16.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>50.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>56.0</MaxRange>
-      <ProjectileSpeed>25.0</ProjectileSpeed>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
 </Entity>
Index: template_unit_hero_cavalry.xml
===================================================================
--- template_unit_hero_cavalry.xml	(revision 9928)
+++ template_unit_hero_cavalry.xml	(working copy)
@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
-  <Identity>
-    <GenericName>Hero Cavalry</GenericName>
-    <Classes datatype="tokens">Hero Cavalry</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
+  <Armour>
+    <Hack>11.0</Hack>
+    <Pierce>13.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>25.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>75.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
   <Cost>
     <Population>2</Population>
     <BuildTime>50</BuildTime>
@@ -17,6 +30,14 @@
       <metal>250</metal>
     </Resources>
   </Cost>
+  <Health>
+    <Max>500</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero Cavalry</GenericName>
+    <Classes datatype="tokens">Hero Cavalry</Classes>
+  </Identity>
   <Loot>
     <xp>500</xp>
     <food>10</food>
@@ -24,18 +45,18 @@
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
-  <Health>
-    <Max>500</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/weapon/sword.xml</attack>
+      <death>actor/fauna/death/death_horse.xml</death>
+    </SoundGroups>
+  </Sound>
   <Stamina>
     <Max>2500</Max>
   </Stamina>
-  <Armour>
-    <Hack>11.0</Hack>
-    <Pierce>13.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>8.9</WalkSpeed>
     <Run>
@@ -47,25 +68,4 @@
   <Vision>
     <Range>100</Range>
   </Vision>
-  <Attack>
-    <Melee>
-      <Hack>25.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>75.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
-  </Attack>
-  <Sound>
-    <SoundGroups>
-      <attack>attack/weapon/sword.xml</attack>
-      <death>actor/fauna/death/death_horse.xml</death>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: template_unit_champion_cavalry.xml
===================================================================
--- template_unit_champion_cavalry.xml	(revision 9928)
+++ template_unit_champion_cavalry.xml	(working copy)
@@ -1,41 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
-  <Identity>
-    <GenericName>Champion Cavalry</GenericName>
-    <Classes datatype="tokens">Cavalry</Classes>
-  </Identity>
-  <Cost>
-    <Population>2</Population>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>150</Max>
-  </Health>
-  <Stamina>
-    <Max>2500</Max>
-  </Stamina>
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
-    <Run>
-      <Speed>24.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
   <Attack>
     <Melee>
       <Hack>35.0</Hack>
@@ -52,10 +21,27 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <Population>2</Population>
+    <BuildTime>15</BuildTime>
+    <Resources>
+      <food>100</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
   <Footprint>
     <Circle radius="2.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Cavalry</GenericName>
+    <Classes datatype="tokens">Cavalry</Classes>
+  </Identity>
   <Obstruction>
     <Unit radius="1.0"/>
   </Obstruction>
@@ -72,4 +58,18 @@
       <trained>interface/alarm/alarm_create_cav.xml</trained>
 	</SoundGroups>
   </Sound>
+  <Stamina>
+    <Max>2500</Max>
+  </Stamina>
+  <UnitMotion>
+    <WalkSpeed>8.5</WalkSpeed>
+    <Run>
+      <Speed>24.0</Speed>
+      <Range>1000.0</Range>
+      <RangeMin>10.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
 </Entity>
Index: template_unit_cavalry_ranged.xml
===================================================================
--- template_unit_cavalry_ranged.xml	(revision 9928)
+++ template_unit_cavalry_ranged.xml	(working copy)
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
-  <Identity>
-    <GenericName>Ranged Cavalry</GenericName>
-	<Classes datatype="tokens">Ranged</Classes>
-  </Identity>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -16,6 +12,10 @@
       <RepeatTime>1500</RepeatTime>
     </Ranged>
   </Attack>
+  <Identity>
+    <GenericName>Ranged Cavalry</GenericName>
+	<Classes datatype="tokens">Ranged</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
Index: template_structure_civic_house.xml
===================================================================
--- template_structure_civic_house.xml	(revision 9928)
+++ template_structure_civic_house.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>House</GenericName>
-    <Tooltip>Increase the population limit. Train Female Citizens.</Tooltip>
-    <Classes datatype="tokens">Village</Classes>
-    <Icon>structures/house.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>House</Category>
   </BuildRestrictions>
@@ -16,32 +15,22 @@
       <wood>100</wood>
     </Resources>
   </Cost>
-  <Health>
-    <Max>800</Max>
-  </Health>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>5.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="16.0" depth="16.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <Health>
+    <Max>800</Max>
+  </Health>
+  <Identity>
+    <GenericName>House</GenericName>
+    <Tooltip>Increase the population limit. Train Female Citizens.</Tooltip>
+    <Classes datatype="tokens">Village</Classes>
+    <Icon>structures/house.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <Vision>
-    <Range>28</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_house.xml</select>
@@ -49,13 +38,24 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <TerritoryInfluence>
+    <Radius>64</Radius>
+    <Weight>65536</Weight>
+  </TerritoryInfluence>
   <TrainingQueue>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen
     </Entities>
   </TrainingQueue>
-  <TerritoryInfluence>
-    <Radius>64</Radius>
-    <Weight>65536</Weight>
-  </TerritoryInfluence>
+  <Vision>
+    <Range>28</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_gaia_ruins.xml
===================================================================
--- template_gaia_ruins.xml	(revision 9928)
+++ template_gaia_ruins.xml	(working copy)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
+  <Footprint>
+    <Circle radius="4.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <GenericName>Generic Ruins</GenericName>
     <SpecificName>Ruins</SpecificName>
     <Tooltip>These ruins that can be mined for resources.</Tooltip>
     <Icon>gaia/geology_stone_1.png</Icon>
   </Identity>
-    <Minimap>
+  <Minimap>
     <Type>stone</Type>
     <Colour r="128" g="128" b="128"/>
   </Minimap>
-  <Footprint>
-    <Circle radius="4.0"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
-  <Selectable/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>500</Amount>
     <Type>stone.rock</Type>
   </ResourceSupply>
+  <Selectable/>
 </Entity>
Index: template_structure_civic_temple.xml
===================================================================
--- template_structure_civic_temple.xml	(revision 9928)
+++ template_structure_civic_temple.xml	(working copy)
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>Temple</GenericName>
-    <Tooltip>Train physicians. (Currently a useless structure)</Tooltip>
-    <Classes datatype="tokens">Town</Classes>
-    <Icon>structures/temple.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <Auras>
+    <Heal>
+      <Radius>40</Radius>
+      <Speed>1000</Speed>
+    </Heal>
+  </Auras>
   <BuildRestrictions>
     <Category>Temple</Category>
   </BuildRestrictions>
@@ -16,27 +21,28 @@
       <stone>300</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_3x6.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="19.0" depth="31.5"/>
     <Height>12.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>15</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry Cavalry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Temple</GenericName>
+    <Tooltip>Train physicians. (Currently a useless structure)</Tooltip>
+    <Classes datatype="tokens">Town</Classes>
+    <Icon>structures/temple.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
@@ -49,16 +55,10 @@
       units/{civ}_support_healer
     </Entities>
   </TrainingQueue>
-  <Auras>
-    <Heal>
-      <Radius>40</Radius>
-      <Speed>1000</Speed>
-    </Heal>
-  </Auras>
-   <GarrisonHolder>
-    <Max>15</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry Cavalry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_3x6.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_mechanical.xml
===================================================================
--- template_unit_mechanical.xml	(revision 9928)
+++ template_unit_mechanical.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Decay>
+    <Inactive/>
+    <DelayTime>0.0</DelayTime>
+    <SinkRate>0.0</SinkRate>
+    <SinkAccel>2.0</SinkAccel>
+  </Decay>
+  <Health>
+    <Healable>false</Healable>
+    <Repairable>true</Repairable>
+  </Health>
   <Identity>
     <GenericName>Mechanical</GenericName>
     <Classes datatype="tokens">Mechanical</Classes>
@@ -11,14 +21,4 @@
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
-  <Health>
-    <Healable>false</Healable>
-    <Repairable>true</Repairable>
-  </Health>
-  <Decay>
-    <Inactive/>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>0.0</SinkRate>
-    <SinkAccel>2.0</SinkAccel>
-  </Decay>
 </Entity>
Index: template_gaia_flora.xml
===================================================================
--- template_gaia_flora.xml	(revision 9928)
+++ template_gaia_flora.xml	(working copy)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
-  <Identity>
-    <GenericName>Generic Flora</GenericName>
-  </Identity>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>10.0</Height>
   </Footprint>
+  <Identity>
+    <GenericName>Generic Flora</GenericName>
+  </Identity>
   <Obstruction>
     <Unit radius="1.5"/>
   </Obstruction>
Index: template_unit_infantry_melee_spearman.xml
===================================================================
--- template_unit_infantry_melee_spearman.xml	(revision 9928)
+++ template_unit_infantry_melee_spearman.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
-  <Identity>
-    <GenericName>Infantry Spearman</GenericName>
-    <Rollover>Probably one of the most primitive units in the game. Fighting with a sharp object at the end of the pole didn't require a lot of technology to develop. It also allowed the human to distance themselves from their attacker. As time passed the spears got longer and longer. Started with a fighting style similar to using a quarterstaff, then to using them in numbers as a 'pin cushion' vs. humans (sarissa in a phalanx). Later it was developed to combat cavalry. During the medieval period it evolved to the pike. These units tended to be armoured as heavily as possible.</Rollover>
-    <Tooltip>Bonused vs. Cavalry Swordsmen and Cavalry Spearmen.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Loot>
-    <wood>5</wood>
-  </Loot>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
-    <Run>
-      <Speed>18.0</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>5.0</Hack>
@@ -34,4 +15,23 @@
       <Pierce>30.0</Pierce>
     </Charge>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Infantry Spearman</GenericName>
+    <Rollover>Probably one of the most primitive units in the game. Fighting with a sharp object at the end of the pole didn't require a lot of technology to develop. It also allowed the human to distance themselves from their attacker. As time passed the spears got longer and longer. Started with a fighting style similar to using a quarterstaff, then to using them in numbers as a 'pin cushion' vs. humans (sarissa in a phalanx). Later it was developed to combat cavalry. During the medieval period it evolved to the pike. These units tended to be armoured as heavily as possible.</Rollover>
+    <Tooltip>Bonused vs. Cavalry Swordsmen and Cavalry Spearmen.</Tooltip>
+  </Identity>
+  <Loot>
+    <wood>5</wood>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+    <Run>
+      <Speed>18.0</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_mechanical_ship_quinquereme.xml
===================================================================
--- template_unit_mechanical_ship_quinquereme.xml	(revision 9928)
+++ template_unit_mechanical_ship_quinquereme.xml	(working copy)
@@ -1,32 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
-  <Identity>
-    <GenericName>Heavy Warship</GenericName>
-    <Tooltip>Heavy Warship.</Tooltip>
-	<Classes datatype="tokens">Warship</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>50</BuildTime>
-    <Resources>
-      <wood>250</wood>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>500</Max>
-  </Health>
   <Armour>
     <Hack>25.0</Hack>
     <Pierce>30.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>14.5</WalkSpeed>
-  </UnitMotion>
-  <Vision>
-    <Range>140</Range>
-  </Vision>
-  <ResourceGatherer disable=""/>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -39,15 +17,37 @@
       <RepeatTime>4000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <BuildTime>50</BuildTime>
+    <Resources>
+      <wood>250</wood>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
   <GarrisonHolder>
     <Max>50</Max>
 	<EjectHealth>0.1</EjectHealth>
 	<List datatype="tokens">Support Infantry Cavalry Siege</List>
 	<BuffHeal>1</BuffHeal>
   </GarrisonHolder>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Heavy Warship</GenericName>
+    <Tooltip>Heavy Warship.</Tooltip>
+	<Classes datatype="tokens">Warship</Classes>
+  </Identity>
+  <ResourceGatherer disable=""/>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed>14.5</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>140</Range>
+  </Vision>
 </Entity>
Index: template_unit_mechanical_ship_merchant.xml
===================================================================
--- template_unit_mechanical_ship_merchant.xml	(revision 9928)
+++ template_unit_mechanical_ship_merchant.xml	(working copy)
@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
-  <Identity>
-    <GenericName>Merchantman</GenericName>
-    <Tooltip>Gather profitable aquatic treasures.</Tooltip>
-  </Identity>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>15.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
   <Cost>
     <Resources>
       <wood>0</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
+  <GarrisonHolder>
+    <Max>15</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry Cavalry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
   <Health>
     <Max>200</Max>
   </Health>
+  <Identity>
+    <GenericName>Merchantman</GenericName>
+    <Tooltip>Gather profitable aquatic treasures.</Tooltip>
+  </Identity>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
     <Capacities>
@@ -22,23 +33,12 @@
       <metal>50</metal>
     </Capacities>
   </ResourceGatherer>
-  <UnitMotion>
-    <WalkSpeed>10.5</WalkSpeed>
-  </UnitMotion>
-  <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>15.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <GarrisonHolder>
-    <Max>15</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry Cavalry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
+  <UnitMotion>
+    <WalkSpeed>10.5</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_structure_defense_wall_tower.xml
===================================================================
--- template_structure_defense_wall_tower.xml	(revision 9928)
+++ template_structure_defense_wall_tower.xml	(working copy)
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>Tower</GenericName>
-    <Tooltip>Garrison to defend a city wall against attackers.</Tooltip>
-    <Classes datatype="tokens">Village Defensive</Classes>
-    <Icon>structures/tower.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>15.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>25.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>40.0</MaxRange>
+      <MinRange>12.0</MinRange>
+      <ProjectileSpeed>60.0</ProjectileSpeed>
+      <PrepareTime>1200</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
+  <BuildingAI>
+    <DefaultArrowCount>1</DefaultArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+  </BuildingAI>
   <BuildRestrictions>
     <Category>Wall</Category>
   </BuildRestrictions>
@@ -15,30 +30,28 @@
       <stone>125</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2500</Max>
-  </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>15.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-  <StatusBars>
-    <HeightOffset>20.0</HeightOffset>
-  </StatusBars>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
+  <Health>
+    <Max>2500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Tower</GenericName>
+    <Tooltip>Garrison to defend a city wall against attackers.</Tooltip>
+    <Classes datatype="tokens">Village Defensive</Classes>
+    <Icon>structures/tower.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
-  <Vision>
-    <Range>64</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_wall.xml</select>
@@ -46,26 +59,13 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <GarrisonHolder>
-    <Max>5</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support Infantry</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>25.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>40.0</MaxRange>
-      <MinRange>12.0</MinRange>
-      <ProjectileSpeed>60.0</ProjectileSpeed>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-  </BuildingAI>
+  <StatusBars>
+    <HeightOffset>20.0</HeightOffset>
+  </StatusBars>
+  <Vision>
+    <Range>64</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_fauna.xml
===================================================================
--- template_unit_fauna.xml	(revision 9928)
+++ template_unit_fauna.xml	(working copy)
@@ -1,30 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Cost>
+    <Population>0</Population>
+  </Cost>
+  <Footprint>
+    <Circle radius="1.5"/>
+    <Height>2.25</Height>
+  </Footprint>
   <Identity>
     <GenericName>Fauna</GenericName>
 	<Classes datatype="tokens">Animal Organic -ConquestCritical</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <Minimap>
     <Type>food</Type>
     <Colour r="205" g="115" b="16"/>
   </Minimap>
-  <Cost>
-    <Population>0</Population>
-  </Cost>
-  <Loot>
-    <xp>10</xp>
-  </Loot>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.25</Height>
-  </Footprint>
-  <UnitMotion>
-    <WalkSpeed>5.0</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-    </Run>
-  </UnitMotion>
   <UnitAI>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>32.0</FleeDistance>
@@ -33,6 +27,12 @@
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+    <Run>
+      <Speed>15.0</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
   </VisualActor>
Index: template_gaia_geo.xml
===================================================================
--- template_gaia_geo.xml	(revision 9928)
+++ template_gaia_geo.xml	(working copy)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
-  <Identity>
-    <GenericName>Generic Geology</GenericName>
-  </Identity>
   <Footprint>
     <Circle radius="5.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Identity>
+    <GenericName>Generic Geology</GenericName>
+  </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
Index: template_unit_hero.xml
===================================================================
--- template_unit_hero.xml	(revision 9928)
+++ template_unit_hero.xml	(working copy)
@@ -1,41 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Identity>
-    <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Hero Organic</Classes>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
-  <Cost>
-    <BuildTime>60</BuildTime>
-    <Resources>
-      <food>100</food>
-      <metal>250</metal>
-    </Resources>
-  </Cost>
-  <Loot>
-    <xp>400</xp>
-    <food>10</food>
-    <wood>0</wood>
-    <stone>0</stone>
-    <metal>25</metal>
-  </Loot>
-  <Health>
-    <Max>400</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
-    <Run>
-      <Speed>16.5</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>40.0</Hack>
@@ -52,13 +21,44 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <food>100</food>
+      <metal>250</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>400</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Organic</Classes>
+  </Identity>
+  <Loot>
+    <xp>400</xp>
+    <food>10</food>
+    <wood>0</wood>
+    <stone>0</stone>
+    <metal>25</metal>
+  </Loot>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/sword.xml</attack>
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+    <Run>
+      <Speed>16.5</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
 </Entity>
Index: template_unit_infantry_ranged_slinger.xml
===================================================================
--- template_unit_infantry_ranged_slinger.xml	(revision 9928)
+++ template_unit_infantry_ranged_slinger.xml	(working copy)
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Identity>
-    <GenericName>Infantry Slinger</GenericName>
-    <Rollover>They were amazing shots with their slings. They used choice rocks, and often specifically created 'shot' made from lead. They could pierce armour at close distances. They were lightly armoured because they needed the mobility in their arm regions. However, in the game we are making a gameplay consideration to have slingers act as 'mini-organic-onagers' that may cause damage to structures.</Rollover>
-    <Tooltip>General Bonus vs. Infantry.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <stone>30</stone>
-    </Resources>
-  </Cost>
-  <Loot>
-    <xp>75</xp>
-    <stone>4</stone>
-  </Loot>
   <Armour>
     <Hack>2.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>8.1</WalkSpeed>
-    <Run>
-      <Speed>22.8</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -37,4 +17,24 @@
       <RepeatTime>1500</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <Resources>
+      <stone>30</stone>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Infantry Slinger</GenericName>
+    <Rollover>They were amazing shots with their slings. They used choice rocks, and often specifically created 'shot' made from lead. They could pierce armour at close distances. They were lightly armoured because they needed the mobility in their arm regions. However, in the game we are making a gameplay consideration to have slingers act as 'mini-organic-onagers' that may cause damage to structures.</Rollover>
+    <Tooltip>General Bonus vs. Infantry.</Tooltip>
+  </Identity>
+  <Loot>
+    <xp>75</xp>
+    <stone>4</stone>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed>8.1</WalkSpeed>
+    <Run>
+      <Speed>22.8</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_infantry_ranged_archer.xml
===================================================================
--- template_unit_infantry_ranged_archer.xml	(revision 9928)
+++ template_unit_infantry_ranged_archer.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Identity>
-    <GenericName>Infantry Archer</GenericName>
-    <Rollover>They tended to be lightly armoured. They usually only participated in the first stage of a battle, sending a volley of arrows raining down the enemy. Of course they would have to stop shooting once the melee units closed in. This means their job was largely over once the 'true battle' was underway. They spent hours training with a bow, but if you were hit by an arrow it was more likely an act of random chance than being specifically targeted by an archer.</Rollover>
-    <Tooltip>Bonused vs. Infantry Swordsmen and Cavalry Spearmen.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <wood>40</wood>
-    </Resources>
-  </Cost>
-  <Loot>
-    <wood>4</wood>
-  </Loot>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>2.0</Pierce>
     <Crush>3.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.7</WalkSpeed>
-    <Run>
-      <Speed>21.6</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -36,9 +17,28 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Infantry Archer</GenericName>
+    <Rollover>They tended to be lightly armoured. They usually only participated in the first stage of a battle, sending a volley of arrows raining down the enemy. Of course they would have to stop shooting once the melee units closed in. This means their job was largely over once the 'true battle' was underway. They spent hours training with a bow, but if you were hit by an arrow it was more likely an act of random chance than being specifically targeted by an archer.</Rollover>
+    <Tooltip>Bonused vs. Infantry Swordsmen and Cavalry Spearmen.</Tooltip>
+  </Identity>
+  <Loot>
+    <wood>4</wood>
+  </Loot>
   <Sound>
     <SoundGroups>
       <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>7.7</WalkSpeed>
+    <Run>
+      <Speed>21.6</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_mechanical_ship_trireme.xml
===================================================================
--- template_unit_mechanical_ship_trireme.xml	(revision 9928)
+++ template_unit_mechanical_ship_trireme.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
-  <Identity>
-    <GenericName>Medium Warship</GenericName>
-    <Tooltip>Medium Warship.</Tooltip>
-	<Classes datatype="tokens">Warship</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>200</wood>
-      <metal>150</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>400</Max>
-  </Health>
-  <UnitMotion>
-    <WalkSpeed>14.5</WalkSpeed>
-  </UnitMotion>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>25.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
-  <ResourceGatherer disable=""/>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -36,20 +17,39 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <BuildTime>40</BuildTime>
+    <Resources>
+      <wood>200</wood>
+      <metal>150</metal>
+    </Resources>
+  </Cost>
   <GarrisonHolder>
     <Max>30</Max>
 	<EjectHealth>0.1</EjectHealth>
 	<List datatype="tokens">Support Infantry Cavalry Siege</List>
 	<BuffHeal>1</BuffHeal>
   </GarrisonHolder>
+  <Health>
+    <Max>400</Max>
+  </Health>
+  <Identity>
+    <GenericName>Medium Warship</GenericName>
+    <Tooltip>Medium Warship.</Tooltip>
+	<Classes datatype="tokens">Warship</Classes>
+  </Identity>
+  <ResourceGatherer disable=""/>
+  <Sound>
+    <SoundGroups>
+      <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
+    </SoundGroups>
+  </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
-  <Sound>
-    <SoundGroups>
-      <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
-    </SoundGroups>
-  </Sound>
+  <UnitMotion>
+    <WalkSpeed>14.5</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_champion_infantry_spearman.xml
===================================================================
--- template_unit_champion_infantry_spearman.xml	(revision 9928)
+++ template_unit_champion_infantry_spearman.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
-  <Identity>
-    <GenericName>Champion Infantry Spearman</GenericName>
-    <Classes datatype="tokens">Melee</Classes>
-  </Identity>
-  <Cost>
-    <Resources>
-      <food>50</food>
-      <wood>75</wood>
-    </Resources>
-  </Cost>
   <Armour>
     <Hack>8.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.7</WalkSpeed>
-    <Run>
-      <Speed>15.6</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>8.0</Hack>
@@ -39,6 +21,16 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <wood>75</wood>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Champion Infantry Spearman</GenericName>
+    <Classes datatype="tokens">Melee</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -52,4 +44,12 @@
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>5.7</WalkSpeed>
+    <Run>
+      <Speed>15.6</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_champion.xml
===================================================================
--- template_unit_champion.xml	(revision 9928)
+++ template_unit_champion.xml	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Health>
+    <RegenRate>0.4</RegenRate>
+  </Health>
   <Identity>
     <GenericName>Champion Unit</GenericName>
 	<Classes datatype="tokens">Super Organic</Classes>
@@ -11,7 +14,4 @@
     <stone>5</stone>
     <metal>10</metal>
   </Loot>
-  <Health>
-    <RegenRate>0.4</RegenRate>
-  </Health>
 </Entity>
Index: template_unit_mechanical_siege.xml
===================================================================
--- template_unit_mechanical_siege.xml	(revision 9928)
+++ template_unit_mechanical_siege.xml	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical">
+  <Cost>
+    <Population>3</Population>
+  </Cost>
   <Identity>
     <GenericName>Siege</GenericName>
 	<Classes datatype="tokens">Siege</Classes>
@@ -7,9 +10,6 @@
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
-  <Cost>
-    <Population>3</Population>
-  </Cost>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
Index: template_unit_cavalry.xml
===================================================================
--- template_unit_cavalry.xml	(revision 9928)
+++ template_unit_cavalry.xml	(working copy)
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Identity>
-    <GenericName>Cavalry</GenericName>
-    <Classes datatype="tokens">Cavalry CitizenSoldier Organic</Classes>
-    <Rank>Basic</Rank>
-  </Identity>
-  <Promotion>
-    <RequiredXp>200</RequiredXp>
-  </Promotion>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
+  <Armour>
+    <Hack>0.0</Hack>
+    <Pierce>0.0</Pierce>
+    <Crush>2.0</Crush>
+  </Armour>
   <Cost>
     <Population>2</Population>
     <BuildTime>13</BuildTime>
@@ -18,6 +12,19 @@
       <food>100</food>
     </Resources>
   </Cost>
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>7.5</Height>
+  </Footprint>
+  <Health>
+    <Max>130</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Identity>
+    <GenericName>Cavalry</GenericName>
+    <Classes datatype="tokens">Cavalry CitizenSoldier Organic</Classes>
+    <Rank>Basic</Rank>
+  </Identity>
   <Loot>
     <xp>130</xp>
     <food>10</food>
@@ -25,6 +32,15 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
+  <Obstruction>
+    <Unit radius="1.0"/>
+  </Obstruction>
+  <Position>
+    <Anchor>pitch</Anchor>
+  </Position>
+  <Promotion>
+    <RequiredXp>200</RequiredXp>
+  </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -38,18 +54,22 @@
       <metal>30</metal>
     </Capacities>
   </ResourceGatherer>
-  <Health>
-    <Max>130</Max>
-    <RegenRate>0.2</RegenRate>
-  </Health>
+  <Sound>
+    <SoundGroups>
+      <select>voice/hellenes/civ/civ_male_select.xml</select>
+      <order_walk>voice/hellenes/civ/civ_male_ack.xml</order_walk>
+      <order_attack>voice/hellenes/civ/civ_male_attack.xml</order_attack>
+      <order_gather>voice/hellenes/civ/civ_male_ack.xml</order_gather>
+      <walk>actor/mounted/movement/walk.xml</walk>
+      <run>actor/mounted/movement/walk.xml</run>
+      <attack>attack/weapon/sword.xml</attack>
+      <death>actor/fauna/death/death_horse.xml</death>
+      <trained>interface/alarm/alarm_create_cav.xml</trained>
+    </SoundGroups>
+  </Sound>
   <Stamina>
     <Max>2000</Max>
   </Stamina>
-  <Armour>
-    <Hack>0.0</Hack>
-    <Pierce>0.0</Pierce>
-    <Crush>2.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>9.3</WalkSpeed>
     <Run>
@@ -58,27 +78,7 @@
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
-  <Footprint>
-    <Circle radius="2.0"/>
-    <Height>7.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="1.0"/>
-  </Obstruction>
   <Vision>
     <Range>100</Range>
   </Vision>
-  <Sound>
-    <SoundGroups>
-      <select>voice/hellenes/civ/civ_male_select.xml</select>
-      <order_walk>voice/hellenes/civ/civ_male_ack.xml</order_walk>
-      <order_attack>voice/hellenes/civ/civ_male_attack.xml</order_attack>
-      <order_gather>voice/hellenes/civ/civ_male_ack.xml</order_gather>
-      <walk>actor/mounted/movement/walk.xml</walk>
-      <run>actor/mounted/movement/walk.xml</run>
-      <attack>attack/weapon/sword.xml</attack>
-      <death>actor/fauna/death/death_horse.xml</death>
-      <trained>interface/alarm/alarm_create_cav.xml</trained>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: template_unit_infantry_ranged_javelinist.xml
===================================================================
--- template_unit_infantry_ranged_javelinist.xml	(revision 9928)
+++ template_unit_infantry_ranged_javelinist.xml	(working copy)
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Identity>
-    <GenericName>Infantry Javelinist</GenericName>
-    <Rollover>These were the skirmishers. These lightly armoured units would advance quickly, throw a hail of javelins and then retreat back to their ranks. Grab another spear and repeat. They would do well against any unit that wasn't wearing proper armour, but more poorly if they fought hand to hand vs a well armoured unit. They didn't always have to throw their spears either. They used these light small spears in hand to hand similar to a quarterstaff. Also note that the development of the pilum was a key transition. The pilum was a weapon with a long steel shaft that would sink into a shield and was nearly impossible to remove. This rendered the shield useless. They also weighted and balanced them to make them accurately hit with a punch.</Rollover>
-    <Tooltip>Bonused vs. Infantry Spearmen and Cavalry Archers.</Tooltip>
-  </Identity>
-  <Cost>
-    <Resources>
-      <wood>45</wood>
-    </Resources>
-  </Cost>
-  <Loot>
-    <wood>5</wood>
-  </Loot>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>3.0</Pierce>
     <Crush>3.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.7</WalkSpeed>
-    <Run>
-      <Speed>21.6</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
@@ -36,4 +17,23 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>45</wood>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Infantry Javelinist</GenericName>
+    <Rollover>These were the skirmishers. These lightly armoured units would advance quickly, throw a hail of javelins and then retreat back to their ranks. Grab another spear and repeat. They would do well against any unit that wasn't wearing proper armour, but more poorly if they fought hand to hand vs a well armoured unit. They didn't always have to throw their spears either. They used these light small spears in hand to hand similar to a quarterstaff. Also note that the development of the pilum was a key transition. The pilum was a weapon with a long steel shaft that would sink into a shield and was nearly impossible to remove. This rendered the shield useless. They also weighted and balanced them to make them accurately hit with a punch.</Rollover>
+    <Tooltip>Bonused vs. Infantry Spearmen and Cavalry Archers.</Tooltip>
+  </Identity>
+  <Loot>
+    <wood>5</wood>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed>7.7</WalkSpeed>
+    <Run>
+      <Speed>21.6</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_fauna_fish.xml
===================================================================
--- template_unit_fauna_fish.xml	(revision 9928)
+++ template_unit_fauna_fish.xml	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
-  <Identity>
-    <GenericName>Fish</GenericName>
-  </Identity>
-  <Health disable=""/>
   <Footprint>
     <Circle radius="5.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health disable=""/>
+  <Identity>
+    <GenericName>Fish</GenericName>
+  </Identity>
   <Obstruction>
     <Unit radius="0.1"/>
     <BlockMovement>false</BlockMovement>
@@ -17,11 +17,11 @@
     <Altitude>-4.0</Altitude>
     <Floating>true</Floating>
   </Position>
-  <UnitMotion disable=""/>
-  <UnitAI disable=""/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>food.fish</Type>
   </ResourceSupply>
+  <UnitAI disable=""/>
+  <UnitMotion disable=""/>
 </Entity>
Index: template_unit_champion_infantry_swordsman.xml
===================================================================
--- template_unit_champion_infantry_swordsman.xml	(revision 9928)
+++ template_unit_champion_infantry_swordsman.xml	(working copy)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
-  <Identity>
-    <GenericName>Champion Infantry Swordsman</GenericName>
-    <Classes datatype="tokens">Melee</Classes>
-  </Identity>
-  <Cost>
-    <Resources>
-      <food>50</food>
-      <metal>80</metal>
-    </Resources>
-  </Cost>
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.1</WalkSpeed>
-    <Run>
-      <Speed>16.8</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>23.0</Hack>
@@ -39,6 +21,16 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <metal>80</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Champion Infantry Swordsman</GenericName>
+    <Classes datatype="tokens">Melee</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -52,4 +44,12 @@
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed>6.1</WalkSpeed>
+    <Run>
+      <Speed>16.8</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
 </Entity>
Index: template_unit_champion_infantry.xml
===================================================================
--- template_unit_champion_infantry.xml	(revision 9928)
+++ template_unit_champion_infantry.xml	(working copy)
@@ -1,37 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
-  <Identity>
-    <GenericName>Champion Infantry</GenericName>
-    <Classes datatype="tokens">Infantry</Classes>
-  </Identity>
-  <Cost>
-    <BuildTime>13</BuildTime>
-    <Resources>
-      <food>50</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>130</Max>
-  </Health>
-  <Stamina>
-    <Max>1500</Max>
-  </Stamina>
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.7</WalkSpeed>
-    <Run>
-      <Speed>15.6</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Melee>
       <Hack>23.0</Hack>
@@ -48,9 +21,22 @@
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
+  <Cost>
+    <BuildTime>13</BuildTime>
+    <Resources>
+      <food>50</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>130</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Infantry</GenericName>
+    <Classes datatype="tokens">Infantry</Classes>
+  </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
@@ -64,4 +50,18 @@
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
+  <Stamina>
+    <Max>1500</Max>
+  </Stamina>
+  <UnitMotion>
+    <WalkSpeed>5.7</WalkSpeed>
+    <Run>
+      <Speed>15.6</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
 </Entity>
Index: template_structure_defense_wall.xml
===================================================================
--- template_structure_defense_wall.xml	(revision 9928)
+++ template_structure_defense_wall.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Identity>
-    <GenericName>Wall</GenericName>
-    <Tooltip>Protect a town, close off choke points, and defend resource sites.</Tooltip>
-    <Classes datatype="tokens">Village</Classes>
-    <Icon>structures/wall.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>20.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>15.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Wall</Category>
   </BuildRestrictions>
@@ -15,21 +14,19 @@
       <stone>50</stone>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>15.0</Crush>
-  </Armour>
-  <VisualActor>
-    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="6.0" depth="6.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Wall</GenericName>
+    <Tooltip>Protect a town, close off choke points, and defend resource sites.</Tooltip>
+    <Classes datatype="tokens">Village</Classes>
+    <Icon>structures/wall.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
@@ -40,4 +37,7 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <VisualActor>
+    <FoundationActor>structures/fndn_wall.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_unit_champion_siege.xml
===================================================================
--- template_unit_champion_siege.xml	(revision 9928)
+++ template_unit_champion_siege.xml	(working copy)
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super">
+  <Armour>
+    <Hack>550.0</Hack>
+    <Pierce>600.0</Pierce>
+    <Crush>200.0</Crush>
+  </Armour>
+  <Attack>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>500</wood>
+      <metal>400</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <GenericName>Super Siege</GenericName>
     <Classes datatype="tokens">Mechanical Siege</Classes>
@@ -7,17 +20,4 @@
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
-  <Cost>
-    <Resources>
-      <wood>500</wood>
-      <metal>400</metal>
-    </Resources>
-  </Cost>
-  <Armour>
-    <Hack>550.0</Hack>
-    <Pierce>600.0</Pierce>
-    <Crush>200.0</Crush>
-  </Armour>
-  <Attack>
-  </Attack>
 </Entity>
Index: template_structure_military_dock.xml
===================================================================
--- template_structure_military_dock.xml	(revision 9928)
+++ template_structure_military_dock.xml	(working copy)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <Identity>
-    <GenericName>Dock</GenericName>
-    <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade.</Tooltip>
-    <Classes datatype="tokens">Town</Classes>
-    <Icon>structures/dock.png</Icon>
-  </Identity>
+  <Armour>
+    <Hack>15.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>20.0</Crush>
+  </Armour>
   <BuildRestrictions>
     <Category>Dock</Category>
   </BuildRestrictions>
@@ -16,39 +15,28 @@
       <wood>300</wood>
     </Resources>
   </Cost>
-  <Health>
-    <Max>2500</Max>
-  </Health>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>20.0</Crush>
-  </Armour>
-  <Position>
-	<Floating>true</Floating>
-  </Position>
-  <VisualActor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <Health>
+    <Max>2500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Dock</GenericName>
+    <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade.</Tooltip>
+    <Classes datatype="tokens">Town</Classes>
+    <Icon>structures/dock.png</Icon>
+  </Identity>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
-  <TrainingQueue>
-    <Entities datatype="tokens">
-      units/{civ}_ship_fishing
-      units/{civ}_ship_merchant
-    </Entities>
-  </TrainingQueue>
+  <Position>
+	<Floating>true</Floating>
+  </Position>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
   </ResourceDropsite>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_dock.xml</select>
@@ -56,4 +44,16 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/{civ}_ship_fishing
+      units/{civ}_ship_merchant
+    </Entities>
+  </TrainingQueue>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: template_gaia_treasure.xml
===================================================================
--- template_gaia_treasure.xml	(revision 9928)
+++ template_gaia_treasure.xml	(working copy)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
+  <Footprint replace="">
+    <Square width="2.0" depth="2.0"/>
+    <Height>12.0</Height>
+  </Footprint>
   <Identity>
     <GenericName>Generic Treasure</GenericName>
     <SpecificName>Treasure</SpecificName>
     <Tooltip>A treasure that can be quickly gathered.</Tooltip>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
-    <Minimap>
+  <Minimap>
     <Type>metal</Type>
     <Colour r="192" g="192" b="0"/>
   </Minimap>
-  <Footprint replace="">
-    <Square width="2.0" depth="2.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Obstruction>
     <Static width="1.5" depth="1.5"/>
   </Obstruction>
-  <Selectable/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>300</Amount>
     <Type>treasure.metal</Type>
   </ResourceSupply>
+  <Selectable/>
 </Entity>
Index: template_unit_support.xml
===================================================================
--- template_unit_support.xml	(revision 9928)
+++ template_unit_support.xml	(working copy)
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Cost>
+    <BuildTime>15</BuildTime>
+  </Cost>
+  <Health>
+    <RegenRate>0.2</RegenRate>
+  </Health>
   <Identity>
     <GenericName>Support</GenericName>
     <Classes datatype="tokens">Support Organic</Classes>
   </Identity>
-  <Minimap>
-    <Type>support</Type>
-  </Minimap>
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
-  <Cost>
-    <BuildTime>15</BuildTime>
-  </Cost>
   <Loot>
     <xp>10</xp>
     <food>1</food>
@@ -20,12 +17,15 @@
     <stone>1</stone>
     <metal>1</metal>
   </Loot>
-  <Health>
-    <RegenRate>0.2</RegenRate>
-  </Health>
+  <Minimap>
+    <Type>support</Type>
+  </Minimap>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_worker.xml</trained>
     </SoundGroups>
   </Sound>
+  <UnitAI>
+    <DefaultStance>passive</DefaultStance>
+  </UnitAI>
 </Entity>
Index: template_unit.xml
===================================================================
--- template_unit.xml	(revision 9928)
+++ template_unit.xml	(working copy)
@@ -1,5 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_entity_full">
+  <Armour>
+    <Hack>1.0</Hack>
+    <Pierce>1.0</Pierce>
+    <Crush>1.0</Crush>
+  </Armour>
+  <Cost>
+    <Population>1</Population>
+    <PopulationBonus>0</PopulationBonus>
+    <BuildTime>1</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Decay>
+    <Inactive/>
+    <DelayTime>80.0</DelayTime>
+    <SinkRate>0.01</SinkRate>
+    <SinkAccel>0.0</SinkAccel>
+  </Decay>
+  <Footprint>
+    <Circle radius="1.0"/>
+    <Height>2.5</Height>
+  </Footprint>
+  <Health>
+    <DeathType>corpse</DeathType>
+    <Max>100</Max>
+    <RegenRate>0</RegenRate>
+    <Healable>true</Healable>
+    <Repairable>false</Repairable>
+  </Health>
   <Identity>
     <GenericName>Unit</GenericName>
     <Classes datatype="tokens">Unit ConquestCritical</Classes>
@@ -19,43 +52,21 @@
       Formation12
     </Formations>
   </Identity>
+  <Looter/>
   <Minimap>
     <Type>unit</Type>
   </Minimap>
-  <UnitAI>
-    <DefaultStance>aggressive</DefaultStance>
-    <FleeDistance>12.0</FleeDistance>
-    <FormationController>false</FormationController>
-  </UnitAI>
-  <Cost>
-    <Population>1</Population>
-    <PopulationBonus>0</PopulationBonus>
-    <BuildTime>1</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <DeathType>corpse</DeathType>
-    <Max>100</Max>
-    <RegenRate>0</RegenRate>
-    <Healable>true</Healable>
-    <Repairable>false</Repairable>
-  </Health>
-  <Decay>
-    <Inactive/>
-    <DelayTime>80.0</DelayTime>
-    <SinkRate>0.01</SinkRate>
-    <SinkAccel>0.0</SinkAccel>
-  </Decay>
-  <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-    <Crush>1.0</Crush>
-  </Armour>
+  <Obstruction>
+    <Unit radius="0.8"/>
+    <Active>true</Active>
+    <BlockMovement>true</BlockMovement>
+    <BlockPathfinding>false</BlockPathfinding>
+    <BlockFoundation>false</BlockFoundation>
+    <BlockConstruction>true</BlockConstruction>
+    <DisableBlockMovement>false</DisableBlockMovement>
+    <DisableBlockPathfinding>false</DisableBlockPathfinding>
+  </Obstruction>
+  <OverlayRenderer/>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -69,6 +80,16 @@
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
+  <StatusBars>
+    <BarWidth>2.0</BarWidth>
+    <BarHeight>0.333</BarHeight>
+    <HeightOffset>5.0</HeightOffset>
+  </StatusBars>
+  <UnitAI>
+    <DefaultStance>aggressive</DefaultStance>
+    <FleeDistance>12.0</FleeDistance>
+    <FormationController>false</FormationController>
+  </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
     <WalkSpeed>7.5</WalkSpeed>
@@ -82,32 +103,11 @@
     <PassabilityClass>default</PassabilityClass>
     <CostClass>default</CostClass>
   </UnitMotion>
-  <StatusBars>
-    <BarWidth>2.0</BarWidth>
-    <BarHeight>0.333</BarHeight>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <OverlayRenderer/>
-  <Footprint>
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="0.8"/>
-    <Active>true</Active>
-    <BlockMovement>true</BlockMovement>
-    <BlockPathfinding>false</BlockPathfinding>
-    <BlockFoundation>false</BlockFoundation>
-    <BlockConstruction>true</BlockConstruction>
-    <DisableBlockMovement>false</DisableBlockMovement>
-    <DisableBlockPathfinding>false</DisableBlockPathfinding>
-  </Obstruction>
   <Vision>
     <Range>24</Range>
     <RetainInFog>false</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
   </Vision>
-  <Looter/>
   <VisualActor>
     <SilhouetteDisplay>true</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
