Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>athen</Civ>
   </Identity>
@@ -15,6 +11,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_range.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_range">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Budinadon</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/britons/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_range.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_range">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Budinadon</SpecificName>
@@ -16,6 +12,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/gauls/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="22.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>iber</Civ>
   </Identity>
@@ -15,6 +11,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_range.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="28.0" depth="26.0"/>
-    <Height>12.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>mace</Civ>
   </Identity>
@@ -15,6 +11,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_range.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_range">
   <Identity>
     <Civ>maur</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/mauryas/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_range.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_range">
   <Identity>
     <Civ>pers</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/persians/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="27.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>ptol</Civ>
   </Identity>
@@ -15,6 +11,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/ptolemies/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>rome</Civ>
   </Identity>
@@ -15,6 +11,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/romans/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_range.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="26.5" depth="26.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>sele</Civ>
   </Identity>
@@ -15,6 +11,5 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/seleucids/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_range.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_range">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Stratēgeîon</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/spartans/range.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
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,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
-  <GarrisonHolder>
-    <List datatype="tokens">-Cavalry</List>
-  </GarrisonHolder>
-  <Identity>
-    <Classes datatype="tokens">Archery</Classes>
-    <GenericName>Archery Range</GenericName>
-    <Icon>structures/range.png</Icon>
-    <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
-  </Identity>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
-      units/{civ}_infantry_javelinist_b
-      units/{civ}_infantry_slinger_b
-      units/{civ}_infantry_archer_b
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <constructed>interface/complete/building/complete_range.xml</constructed>
-    </SoundGroups>
-  </Sound>
-</Entity>
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
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military">
+  <Cost>
+    <BuildTime>150</BuildTime>
+    <Resources>
+      <wood>300</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="25.0" depth="25.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+    <List datatype="tokens">Infantry</List>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Practice Range</GenericName>
+    <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
+    <VisibleClasses datatype="tokens">Village Range</VisibleClasses>
+    <Icon>structures/range.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <wood>30</wood>
+    <stone>10</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="24.0" depth="24.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.8</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_infantry_javelinist_b
+      units/{civ}_infantry_slinger_b
+      units/{civ}_infantry_archer_b
+    </Entities>
+    <Technologies datatype="tokens">
+      heal_barracks
+      training_conscription
+    </Technologies>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <constructed>interface/complete/building/complete_range.xml</constructed>
+      <select>interface/select/building/sel_barracks.xml</select>
+    </SoundGroups>
+  </Sound>
+  <Vision>
+    <Range>32</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>