Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
@@ -10,8 +10,22 @@
       <Crush>1</Crush>
     </Foundation>
   </Armour>
+  <BuildRestrictions>
+    <Category>Military</Category>
+  </BuildRestrictions>
+  <GarrisonHolder>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
   <Identity>
     <GenericName>Military Structure</GenericName>
     <VisibleClasses datatype="tokens">Military</VisibleClasses>
   </Identity>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>50</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
@@ -15,11 +12,7 @@
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Infantry Cavalry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
@@ -64,11 +57,6 @@
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
     </SoundGroups>
   </Sound>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>50</Radius>
-    <Weight>40000</Weight>
-  </TerritoryInfluence>
   <Vision>
     <Range>32</Range>
   </Vision>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <GarrisonHolder>
-    <List datatype="tokens">Infantry -Cavalry</List>
+    <List datatype="tokens">-Cavalry</List>
   </GarrisonHolder>
   <Identity>
     <Classes datatype="tokens">Archery</Classes>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <GarrisonHolder>
-    <List datatype="tokens">Cavalry -Infantry</List>
+    <List datatype="tokens">-Infantry</List>
   </GarrisonHolder>
   <Identity>
     <GenericName>Stables</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
@@ -15,11 +12,7 @@
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Infantry Healer</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
@@ -65,7 +58,6 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>38</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
@@ -16,6 +16,7 @@
     <Square width="18.0" depth="18.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder disable=""/>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
@@ -73,6 +74,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
+  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>40</Range>
   </Vision>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
@@ -18,11 +15,8 @@
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Elephant</List>
     <BuffHeal>1</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
@@ -58,9 +52,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>38</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -27,11 +27,8 @@
   </Footprint>
   <GarrisonHolder>
     <Max>6</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>1</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
@@ -61,9 +58,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>25</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>24</Range>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -56,9 +56,7 @@
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.075</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
-    <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
@@ -103,9 +101,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>100</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
@@ -27,11 +27,8 @@
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Dog</List>
     <BuffHeal>1</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>500</Max>
@@ -67,7 +64,6 @@
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>20</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -3,9 +3,6 @@
   <Auras datatype="tokens">
     structures/workshop_repair
   </Auras>
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
@@ -18,11 +15,7 @@
   </Footprint>
   <GarrisonHolder>
     <Max>2</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Siege</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
@@ -67,9 +60,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>38</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>