Index: binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
@@ -6,8 +6,6 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Amoridas</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>structures/britons/blacksmith.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
@@ -6,8 +6,6 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Amoridas</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/blacksmith.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -16,10 +16,11 @@
     <Max>85</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
-    <Tooltip>Heal units.</Tooltip>
     <Rank>Basic</Rank>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Tooltip>Heal units.</Tooltip>
+    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
   </Identity>
   <Promotion>
     <RequiredXp>200</RequiredXp>
Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
@@ -8,12 +8,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
+    <Classes datatype="tokens">Italian</Classes>
     <GenericName>Italic Cavalry</GenericName>
+    <Icon>units/cart_cavalry_spearman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
-    <Classes datatype="tokens">Italian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_spearman_ital_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
@@ -8,12 +8,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
+    <Classes datatype="tokens">Celt</Classes>
     <GenericName>Gallic Mercenary Cavalry</GenericName>
+    <Icon>units/cart_cavalry_swordsman_2.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
-    <Classes datatype="tokens">Celt</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_cavalry_swordsman_2.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_swordsman_gaul_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
@@ -8,12 +8,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
+    <Classes datatype="tokens">Iberian</Classes>
     <GenericName>Iberian Heavy Cavalry</GenericName>
+    <Icon>units/cart_cavalry_swordsman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
-    <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_cavalry_swordsman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_swordsman_iber_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
+    <Classes datatype="tokens">Iberian</Classes>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
+    <Icon>units/cart_infantry_javelinist.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
-    <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_javelinist_iber_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
+    <Classes datatype="tokens">Iberian</Classes>
     <GenericName>Balearic Slinger</GenericName>
+    <Icon>units/cart_infantry_slinger.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
-    <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_slinger_iber_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
+    <Classes datatype="tokens">Celt</Classes>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
+    <Icon>units/cart_infantry_swordsman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
-    <Classes datatype="tokens">Celt</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_swordsman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_swordsman_gaul_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
+    <Classes datatype="tokens">Italian</Classes>
     <GenericName>Samnite Swordsman</GenericName>
+    <Icon>units/cart_infantry_swordsman_2.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
-    <Classes datatype="tokens">Italian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_swordsman_2.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_swordsman_ital_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
@@ -7,7 +7,6 @@
     <SpecificName>Hypaspistḗs</SpecificName>
     <Icon>units/macedonian_hypaspist.png</Icon>
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace_champion_infantry_e</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -5,7 +5,6 @@
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Gajendra</SpecificName>
     <Icon>units/maur_champion_elephant.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/mauryans/elephant_siege.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -29,11 +29,12 @@
   </Health>
   <Identity>
     <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Elephant -Cavalry</VisibleClasses>
-    <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <GenericName>Elephant Archer</GenericName>
-    <SpecificName>Vachii Gaja</SpecificName>
     <Icon>units/maur_cavalry_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
+    <SpecificName>Vachii Gaja</SpecificName>
+    <VisibleClasses datatype="tokens">Elephant -Cavalry</VisibleClasses>
   </Identity>
   <Loot>
     <xp>260</xp>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
@@ -6,7 +6,6 @@
     <GenericName>Armored War Elephant</GenericName>
     <SpecificName>Thorakisménos Eléphantos</SpecificName>
     <Icon>units/maur_champion_elephant.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/champion_elephant.xml</Actor>