Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>150</wood>
-      <stone>150</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
@@ -17,10 +11,6 @@
     <Civ>athen</Civ>
     <SpecificName>Stratopedon</SpecificName>
   </Identity>
-  <Loot>
-    <wood>30</wood>
-    <stone>30</stone>
-  </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -4,6 +4,7 @@
     <PopulationBonus>4</PopulationBonus>
     <Resources>
       <wood>300</wood>
+      <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
@@ -19,6 +20,7 @@
   </Identity>
   <Loot>
     <wood>60</wood>
+    <stone>0</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
+  <Cost>
+    <Resources>
+      <wood>250</wood>
+      <stone>0</stone>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Eposton</SpecificName>
   </Identity>
+  <Loot>
+    <wood>50</wood>
+    <stone>0</stone>
+  </Loot>
   <VisualActor>
     <Actor>structures/britons/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>150</wood>
-      <stone>150</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="24.0" depth="25.0"/>
     <Height>15.0</Height>
@@ -16,12 +10,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Maḥanēt</SpecificName>
-    <Tooltip>Train North African citizen-soldiers. Research improvements for North African units.</Tooltip>
   </Identity>
-  <Loot>
-    <wood>30</wood>
-    <stone>30</stone>
-  </Loot>
   <Obstruction>
     <Static width="22.0" depth="23.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -4,6 +4,7 @@
     <PopulationBonus>4</PopulationBonus>
     <Resources>
       <wood>300</wood>
+      <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
@@ -19,6 +20,7 @@
   </Identity>
   <Loot>
     <wood>60</wood>
+    <stone>0</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
+  <Cost>
+    <Resources>
+      <wood>250</wood>
+      <stone>0</stone>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Eposton</SpecificName>
   </Identity>
+  <Loot>
+    <wood>50</wood>
+    <stone>0</stone>
+  </Loot>
   <VisualActor>
     <Actor>structures/gauls/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <stone>200</stone>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Kaserna</SpecificName>
   </Identity>
-  <Loot>
-    <wood>20</wood>
-    <stone>40</stone>
-  </Loot>
   <VisualActor>
     <Actor>structures/iberians/barracks.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>150</wood>
-      <stone>150</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
@@ -14,10 +8,6 @@
     <Civ>kush</Civ>
     <SpecificName>pr-msʿyw</SpecificName>
   </Identity>
-  <Loot>
-    <wood>30</wood>
-    <stone>30</stone>
-  </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>150</wood>
-      <stone>150</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
@@ -17,10 +11,6 @@
     <Civ>mace</Civ>
     <SpecificName>Stratopedon</SpecificName>
   </Identity>
-  <Loot>
-    <wood>30</wood>
-    <stone>30</stone>
-  </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -3,6 +3,7 @@
   <Cost>
     <Resources>
       <wood>300</wood>
+      <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
@@ -15,6 +16,7 @@
   </Identity>
   <Loot>
     <wood>60</wood>
+    <stone>0</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
+  <Cost>
+    <Resources>
+      <wood>250</wood>
+      <stone>0</stone>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>maur</Civ>
   </Identity>
+  <Loot>
+    <wood>50</wood>
+    <stone>0</stone>
+  </Loot>
   <VisualActor>
     <Actor>structures/mauryas/stable.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
@@ -12,6 +12,7 @@
     <BuildTime>300</BuildTime>
     <Resources>
       <wood>100</wood>
+      <stone>0</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
@@ -34,6 +35,7 @@
   </Identity>
   <Loot>
     <wood>20</wood>
+    <stone>0</stone>
     <metal>20</metal>
   </Loot>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>300</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Padgan</SpecificName>
-    <Tooltip>Levy citizen-soldier infantry.</Tooltip>
+    <Tooltip>Train Infantry.</Tooltip>
     <Icon>structures/pers_barracks.png</Icon>
   </Identity>
-  <Loot>
-    <wood>60</wood>
-  </Loot>
   <ProductionQueue>
     <Entities datatype="tokens">
       -units/{civ}_cavalry_swordsman_b
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Cost>
-    <Resources>
-      <wood>0</wood>
-      <stone>200</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="22.0" depth="20.0"/>
     <Height>5.0</Height>
@@ -14,10 +8,6 @@
     <Civ>pers</Civ>
     <SpecificName>Paraspa</SpecificName>
   </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>40</stone>
-  </Loot>
   <Obstruction>
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <stone>200</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="23" depth="23"/>
   </Footprint>
@@ -15,12 +9,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Stratopedon</SpecificName>
-    <Tooltip>Train Egyptian and Middle-Eastern citizen-soldiers. Research training improvements.</Tooltip>
   </Identity>
-  <Loot>
-    <wood>20</wood>
-    <stone>40</stone>
-  </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
@@ -34,6 +34,7 @@
   </Identity>
   <Loot>
     <wood>20</wood>
+    <stone>0</stone>
     <metal>20</metal>
   </Loot>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <stone>200</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="22.0" depth="22.0"/>
     <Height>5.0</Height>
@@ -17,10 +11,6 @@
     <Civ>rome</Civ>
     <SpecificName>Castrum</SpecificName>
   </Identity>
-  <Loot>
-    <wood>20</wood>
-    <stone>40</stone>
-  </Loot>
   <Obstruction>
     <Static width="22.0" depth="22.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>150</wood>
-      <stone>150</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
@@ -17,10 +11,6 @@
     <Civ>sele</Civ>
     <SpecificName>Stratopedon</SpecificName>
   </Identity>
-  <Loot>
-    <wood>30</wood>
-    <stone>30</stone>
-  </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>150</wood>
-      <stone>150</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
@@ -17,10 +11,6 @@
     <Civ>spart</Civ>
     <SpecificName>Stratopedon</SpecificName>
   </Identity>
-  <Loot>
-    <wood>30</wood>
-    <stone>30</stone>
-  </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
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
@@ -20,8 +20,8 @@
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Identity>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Military Structure</GenericName>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Military</VisibleClasses>
   </Identity>
   <TerritoryInfluence>
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
@@ -5,6 +5,10 @@
   </Auras>
   <Cost>
     <BuildTime>150</BuildTime>
+    <Resources>
+      <wood>200</wood>
+      <stone>100</stone>
+    </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
@@ -26,6 +30,10 @@
     <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
+  <Loot>
+    <wood>40</wood>
+    <stone>20</stone>
+  </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
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,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
-    <BuildTime>200</BuildTime>
+    <BuildTime>120</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
@@ -19,13 +19,13 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <GenericName>Blacksmith</GenericName>
     <SelectionGroupName>template_structure_military_blacksmith</SelectionGroupName>
+    <Tooltip>Research attack and armor technologies.</Tooltip>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Town Blacksmith</VisibleClasses>
     <Icon>structures/blacksmith.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <Tooltip>Research weapons and armor improvements.</Tooltip>
-    <VisibleClasses datatype="tokens">Town Blacksmith</VisibleClasses>
   </Identity>
   <Loot>
     <wood>40</wood>
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,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
-    <BuildTime>300</BuildTime>
+    <BuildTime>240</BuildTime>
     <Resources>
+      <wood>200</wood>
       <stone>200</stone>
-      <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
@@ -23,14 +23,14 @@
   <Identity>
     <GenericName>Elephant Stables</GenericName>
     <SelectionGroupName>template_structure_military_elephant_stables</SelectionGroupName>
+    <Tooltip>Train Elephants and research Elephant technologies.</Tooltip>
+    <VisibleClasses datatype="tokens">City ElephantStable</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/stable_elephant.png</Icon>
-    <Tooltip>Train elephant units.</Tooltip>
-    <VisibleClasses datatype="tokens">City ElephantStable</VisibleClasses>
   </Identity>
   <Loot>
+    <wood>40</wood>
     <stone>40</stone>
-    <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="29" depth="27"/>
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
@@ -28,9 +28,9 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Town Embassy</VisibleClasses>
     <GenericName>Embassy</GenericName>
     <SelectionGroupName>template_structure_military_embassy</SelectionGroupName>
+    <VisibleClasses datatype="tokens">Town Embassy</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
-    <BuildTime>150</BuildTime>
+    <BuildTime>120</BuildTime>
     <Resources>
-      <wood>300</wood>
+      <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
@@ -21,13 +21,13 @@
   <Identity>
     <GenericName>Practice Range</GenericName>
     <SelectionGroupName>template_structure_military_range</SelectionGroupName>
-    <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
+    <Tooltip>Train Ranged Infantry and research technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Range</VisibleClasses>
     <Icon>structures/range.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
-    <wood>60</wood>
+    <wood>40</wood>
   </Loot>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
-    <BuildTime>150</BuildTime>
+    <BuildTime>120</BuildTime>
     <Resources>
-      <wood>300</wood>
+      <wood>200</wood>
+      <stone>50</stone>
     </Resources>
   </Cost>
   <Footprint>
@@ -21,13 +22,14 @@
   <Identity>
     <GenericName>Stable</GenericName>
     <SelectionGroupName>template_structure_military_stable</SelectionGroupName>
-    <Icon>structures/pers_stable.png</Icon>
-    <RequiredTechnology>phase_village</RequiredTechnology>
     <Tooltip>Train Cavalry and research Cavalry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Stable</VisibleClasses>
+    <Icon>structures/pers_stable.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
-    <wood>60</wood>
+    <wood>40</wood>
+    <stone>10</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
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
@@ -4,7 +4,7 @@
     structures/workshop_repair
   </Auras>
   <Cost>
-    <BuildTime>200</BuildTime>
+    <BuildTime>180</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
@@ -24,10 +24,10 @@
   <Identity>
     <GenericName>Siege Workshop</GenericName>
     <SelectionGroupName>template_structure_military_workshop</SelectionGroupName>
-    <Icon>structures/siege_workshop.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
     <Tooltip>Construct Siege Engines and research Siege Engine technologies.</Tooltip>
     <VisibleClasses datatype="tokens">City Workshop</VisibleClasses>
+    <Icon>structures/siege_workshop.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>60</wood>