Index: binaries/data/mods/public/maps/scenarios/campaign_test_map.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/campaign_test_map.xml
+++ binaries/data/mods/public/maps/scenarios/campaign_test_map.xml
@@ -213,85 +213,85 @@
 			<Orientation y="-2.85074"/>
 		</Entity>
 		<Entity uid="3773">
-			<Template>campaigns/campaign_religious_test</Template>
+			<Template>structures/athen_campaign_sanctuary</Template>
 			<Player>8</Player>
 			<Position x="565.35334" z="845.06672"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3774">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>7</Player>
 			<Position x="838.39472" z="574.6595"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3775">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>1</Player>
 			<Position x="1405.72437" z="1097.27991"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3776">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>1</Player>
 			<Position x="615.62269" z="650.77857"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3777">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>2</Player>
 			<Position x="1196.19727" z="1306.68702"/>
 			<Orientation y="-2.14263"/>
 		</Entity>
 		<Entity uid="3778">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>4</Player>
 			<Position x="457.57532" z="1016.19471"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3779">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>3</Player>
 			<Position x="836.60657" z="1850.45936"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3780">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>4</Player>
 			<Position x="694.16407" z="1406.73816"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3783">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>5</Player>
 			<Position x="1014.633" z="1007.20698"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3785">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>5</Player>
 			<Position x="242.49624" z="1745.07642"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3786">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>6</Player>
 			<Position x="958.49256" z="877.71631"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3787">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>6</Player>
 			<Position x="657.85651" z="1202.84925"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3790">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>3</Player>
 			<Position x="725.07166" z="994.40564"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3792">
-			<Template>campaigns/campaign_religious_test</Template>
+			<Template>structures/athen_campaign_sanctuary</Template>
 			<Player>8</Player>
 			<Position x="992.78193" z="1279.3423"/>
 			<Orientation y="2.15792"/>
@@ -392,37 +392,37 @@
 			<Orientation y="-1.20614"/>
 		</Entity>
 		<Entity uid="3815">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>7</Player>
 			<Position x="1232.0387" z="1115.79822"/>
 			<Orientation y="0.44076"/>
 		</Entity>
 		<Entity uid="3816">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>4</Player>
 			<Position x="1303.53492" z="944.46064"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3817">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>7</Player>
 			<Position x="1689.91126" z="1130.94263"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3818">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>1</Player>
 			<Position x="1719.14722" z="436.9788"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3819">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>1</Player>
 			<Position x="1815.44874" z="565.60816"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3820">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>2</Player>
 			<Position x="1872.69178" z="994.48975"/>
 			<Orientation y="2.35621"/>
@@ -1993,19 +1993,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4162">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>4</Player>
 			<Position x="832.70624" z="873.18024"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4163">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>4</Player>
 			<Position x="63.96409" z="1165.53443"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4164">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>1</Player>
 			<Position x="1033.17945" z="1409.69751"/>
 			<Orientation y="2.35621"/>
@@ -2094,19 +2094,19 @@
 			<Orientation y="-2.07192"/>
 		</Entity>
 		<Entity uid="4218">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>6</Player>
 			<Position x="1403.30103" z="1370.62952"/>
 			<Orientation y="-3.11638"/>
 		</Entity>
 		<Entity uid="4219">
-			<Template>campaigns/campaign_city_minor_test</Template>
+			<Template>structures/athen_campaign_city_minor</Template>
 			<Player>5</Player>
 			<Position x="1496.97876" z="1350.83521"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4220">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>5</Player>
 			<Position x="1208.38465" z="1644.76539"/>
 			<Orientation y="2.35621"/>
@@ -4892,25 +4892,25 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4780">
-			<Template>campaigns/army_mace_hero_alexander</Template>
+			<Template>structures/mace_campaign_army_alexander</Template>
 			<Player>1</Player>
 			<Position x="1369.92347" z="1071.5586"/>
 			<Orientation y="-2.26302"/>
 		</Entity>
 		<Entity uid="4782">
-			<Template>campaigns/army_mace_hero_alexander</Template>
+			<Template>structures/mace_campaign_army_alexander</Template>
 			<Player>2</Player>
 			<Position x="1300.54175" z="1229.41016"/>
 			<Orientation y="1.96847"/>
 		</Entity>
 		<Entity uid="4783">
-			<Template>campaigns/army_mace_hero_alexander</Template>
+			<Template>structures/mace_campaign_army_alexander</Template>
 			<Player>6</Player>
 			<Position x="1377.38404" z="1349.23951"/>
 			<Orientation y="2.93734"/>
 		</Entity>
 		<Entity uid="4784">
-			<Template>campaigns/army_mace_hero_alexander</Template>
+			<Template>structures/mace_campaign_army_alexander</Template>
 			<Player>5</Player>
 			<Position x="1497.719" z="1351.01868"/>
 			<Orientation y="-1.67331"/>
@@ -4922,19 +4922,19 @@
 			<Orientation y="-2.56182"/>
 		</Entity>
 		<Entity uid="4790">
-			<Template>campaigns/army_mace_standard</Template>
+			<Template>structures/mace_campaign_army</Template>
 			<Player>1</Player>
 			<Position x="1361.87671" z="1106.17261"/>
 			<Orientation y="-1.18554"/>
 		</Entity>
 		<Entity uid="4792">
-			<Template>campaigns/army_mace_standard</Template>
+			<Template>structures/mace_campaign_army</Template>
 			<Player>2</Player>
 			<Position x="1272.71009" z="1227.99317"/>
 			<Orientation y="-2.99202"/>
 		</Entity>
 		<Entity uid="4794">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>1</Player>
 			<Position x="294.29731" z="1373.97327"/>
 			<Orientation y="2.35621"/>
@@ -4976,13 +4976,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4801">
-			<Template>campaigns/army_spart_hero_leonidas</Template>
+			<Template>structures/spart_campaign_army_leonidas</Template>
 			<Player>7</Player>
 			<Position x="1212.80884" z="1082.39856"/>
 			<Orientation y="1.24247"/>
 		</Entity>
 		<Entity uid="4802">
-			<Template>campaigns/army_spart_hero_leonidas</Template>
+			<Template>structures/spart_campaign_army_leonidas</Template>
 			<Player>7</Player>
 			<Position x="1258.53748" z="1134.68152"/>
 			<Orientation y="3.0964"/>
@@ -5303,7 +5303,7 @@
 			<Orientation y="-0.10967"/>
 		</Entity>
 		<Entity uid="4866">
-			<Template>campaigns/army_spart_hero_leonidas</Template>
+			<Template>structures/spart_campaign_army_leonidas</Template>
 			<Player>7</Player>
 			<Position x="805.37201" z="616.08802"/>
 			<Orientation y="-1.89518"/>
Index: binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml
+++ binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml
@@ -86,7 +86,7 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>campaigns/campaign_city_test</Template>
+			<Template>structures/athen_campaign_city</Template>
 			<Player>1</Player>
 			<Position x="2807.89771" z="1248.93531"/>
 			<Orientation y="2.35621"/>
@@ -4842,7 +4842,7 @@
 			<Orientation y="1.67873"/>
 		</Entity>
 		<Entity uid="962">
-			<Template>campaigns/army_mace_hero_alexander</Template>
+			<Template>units/mace_army_alexander</Template>
 			<Player>1</Player>
 			<Position x="2773.61207" z="1278.06959"/>
 			<Orientation y="-1.92721"/>
Index: binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Armour>
-    <Crush>20</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <metal>300</metal>
-    </Resources>
-  </Cost>
-  <Decay>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>3.0</SinkRate>
-    <SinkAccel>9.8</SinkAccel>
-  </Decay>
-  <Footprint>
-    <Circle radius="12.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>mace</Civ>
-    <GenericName>Army of Alexander the Great.</GenericName>
-    <SpecificName>Army of Alexander the Great</SpecificName>
-    <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
-    <Icon>units/mace_hero_alexander.png</Icon>
-  </Identity>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>12.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-  </UnitMotion>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>campaigns/units/army_mace_hero_alexander.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Attack>
-    <Melee>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-  </Attack>
-  <Decay>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>3.0</SinkRate>
-    <SinkAccel>9.8</SinkAccel>
-  </Decay>
-  <Footprint>
-    <Circle radius="8.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>mace</Civ>
-    <GenericName>Army of Macedonia</GenericName>
-    <SpecificName>Army of Macedon</SpecificName>
-    <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
-    <Icon>units/mace_hero_demetrius.png</Icon>
-  </Identity>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>12.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-  </UnitMotion>
-  <Vision>
-    <Range>50</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>campaigns/units/army_mace_soldier.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Armour>
-    <Crush>20</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <metal>300</metal>
-    </Resources>
-  </Cost>
-  <Decay>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>3.0</SinkRate>
-    <SinkAccel>9.8</SinkAccel>
-  </Decay>
-  <Footprint>
-    <Circle radius="12.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>spart</Civ>
-    <GenericName>Army of Leonidas I.</GenericName>
-    <SpecificName>Army of Leonidas I</SpecificName>
-    <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
-    <Icon>units/spart_hero_leonidas.png</Icon>
-  </Identity>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>12.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-  </UnitMotion>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>campaigns/units/army_spart_hero_leonidas.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>25.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>50.0</MaxRange>
-      <MinRange>1.0</MinRange>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <FriendlyFire>false</FriendlyFire>
-      </Projectile>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>3</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0.5</GarrisonArrowMultiplier>
-  </BuildingAI>
-  <Footprint replace="">
-    <Circle radius="26.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>athen</Civ>
-    <VisibleClasses datatype="tokens">Market</VisibleClasses>
-    <GenericName>Settlement</GenericName>
-    <SpecificName>Minor Greek Polis</SpecificName>
-    <Tooltip>This is a minor Greek city.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Static width="48.0" depth="48.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -units/{civ}_support_female_citizen
-      campaigns/army_mace_hero_alexander
-      campaigns/army_mace_standard
-    </Entities>
-  </ProductionQueue>
-  <TerritoryInfluence>
-    <Root>true</Root>
-    <Radius>150</Radius>
-    <Weight>35000</Weight>
-  </TerritoryInfluence>
-  <VisualActor>
-    <Actor>campaigns/structures/hellenes/settlement_curtainwall.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>25.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>50.0</MaxRange>
-      <MinRange>1.0</MinRange>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <FriendlyFire>false</FriendlyFire>
-      </Projectile>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>5</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0.5</GarrisonArrowMultiplier>
-  </BuildingAI>
-  <Footprint replace="">
-    <Circle radius="26.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>athen</Civ>
-    <VisibleClasses datatype="tokens">Market</VisibleClasses>
-    <GenericName>Settlement</GenericName>
-    <SpecificName>Greek Polis</SpecificName>
-    <Tooltip>This is a major Greek city.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Static width="48.0" depth="48.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -units/{civ}_support_female_citizen
-      campaigns/army_mace_hero_alexander
-      campaigns/army_mace_standard
-      units/{civ}_support_trader
-    </Entities>
-  </ProductionQueue>
-  <TerritoryInfluence>
-    <Root>true</Root>
-    <Radius>300</Radius>
-    <Weight>35000</Weight>
-  </TerritoryInfluence>
-  <VisualActor>
-    <Actor>campaigns/structures/hellenes/settlement_curtainwall.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_religious_test.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_temple">
-  <Footprint>
-    <Square width="19.0" depth="31.5"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <Max>2200</Max>
-  </Health>
-  <Identity>
-    <Civ>athen</Civ>
-    <GenericName>Religious Sanctuary</GenericName>
-    <SpecificName>Greek Religious Sanctuary</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="17.5" depth="30.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <TerritoryInfluence>
-    <Root>true</Root>
-    <Radius>100</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <VisualActor>
-    <Actor>structures/hellenes/temple.xml</Actor>
-  </VisualActor>
-</Entity>