Index: binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
@@ -18,7 +18,7 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_infantry_marine_archer_b
-      units/{civ}_champion_marine
+      units/{civ}_infantry_marine_champion
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
@@ -36,8 +36,8 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry
-      units/{civ}_champion_ranged
+      units/{civ}_infantry_spearman_champion
+      units/{civ}_infantry_archer_champion
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -19,8 +19,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_infantry_swordsman_champion_barracks
+      units/{civ}_chariot_javelinist_champion_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -23,8 +23,8 @@
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
+      units/{civ}_infantry_swordsman_champion
+      units/{civ}_chariot_javelinist_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
@@ -17,7 +17,7 @@
       units/{civ}_hero_hamilcar
       units/{civ}_hero_hannibal
       units/{civ}_hero_maharbal
-      units/{civ}_champion_elephant
+      units/{civ}_elephant_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -19,8 +19,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_infantry_swordsman_champion_barracks
+      units/{civ}_cavalry_spearman_champion_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -13,8 +13,8 @@
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
+      units/{civ}_infantry_swordsman_champion
+      units/{civ}_cavalry_spearman_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
@@ -33,7 +33,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_champion_fanatic
+      units/{civ}_infantry_fanatic_champion
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -12,8 +12,8 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_infantry_swordsman_champion_barracks
+      units/{civ}_cavalry_javelinist_champion_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -22,8 +22,8 @@
       units/{civ}_hero_caros
       units/{civ}_hero_indibil
       units/{civ}_hero_viriato
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
+      units/{civ}_infantry_swordsman_champion
+      units/{civ}_cavalry_javelinist_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
@@ -13,12 +13,12 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
       units/{civ}_hero_nastasen
       units/{civ}_hero_amanirenas
       units/{civ}_hero_arakamani
+      units/{civ}_infantry_archer_champion
+      units/{civ}_cavalry_spearman_champion
+      units/{civ}_elephant_champion
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
@@ -30,7 +30,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_amun
+      units/{civ}_infantry_swordsman_champion
     </Entities>
     <Technologies datatype="tokens">
       kushites/upgrade_rank_elite_healer
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
@@ -17,7 +17,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_apedemak
+      units/{civ}_infantry_axeman_champion
     </Entities>
     <Technologies datatype="tokens"/>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
@@ -22,8 +22,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_a_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_infantry_spearman_champion_barracks
+      units/{civ}_cavalry_spearman_champion_barracks
     </Entities>
     <Technologies datatype="tokens">
       upgrade_rank_advanced_mercenary
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -17,8 +17,8 @@
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
       units/{civ}_hero_demetrius
-      units/{civ}_champion_infantry_a
-      units/{civ}_champion_cavalry
+      units/{civ}_infantry_spearman_champion
+      units/{civ}_cavalry_spearman_champion
       -units/{civ}_mechanical_siege_ballista_packed
       -units/{civ}_mechanical_siege_scorpio_packed
       -units/{civ}_mechanical_siege_oxybeles_packed
Index: binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -13,8 +13,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_maiden_barracks
+      units/{civ}_infantry_maceman_champion_barracks
+      units/{civ}_infantry_swordsman_champion_barracks
     </Entities>
     <Technologies datatype="tokens">
       mauryans/special_archery_tradition
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -10,9 +10,9 @@
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
-      units/{civ}_champion_infantry
-      units/{civ}_champion_maiden
-      units/{civ}_champion_chariot
+      units/{civ}_infantry_maceman_champion
+      units/{civ}_infantry_swordsman_champion
+      units/{civ}_chariot_archer_champion
       -units/{civ}_mechanical_siege_ballista_packed
       -units/{civ}_mechanical_siege_scorpio_packed
       -units/{civ}_mechanical_siege_oxybeles_packed
Index: binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
@@ -24,7 +24,7 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen
-      units/{civ}_champion_maiden_archer
+      units/{civ}_infantry_archer_champion
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
Index: binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -46,7 +46,7 @@
       units/{civ}_hero_cyrus
       units/{civ}_hero_darius
       units/{civ}_hero_xerxes
-      units/{civ}_champion_infantry
+      units/{civ}_infantry_immortal_champion
     </Entities>
     <Technologies datatype="tokens">
       persians/immortals
Index: binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
@@ -7,7 +7,7 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_cavalry
+      units/{civ}_cavalry_spearman_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -41,9 +41,9 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_kardakes_hoplite
-      units/{civ}_kardakes_skirmisher
-      units/{civ}_champion_elephant
+      units/{civ}_infantry_spearman_champion
+      units/{civ}_infantry_javelinist_champion
+      units/{civ}_elephant_champion
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_dock.xml
@@ -14,7 +14,7 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_ship_quinquereme
-      units/{civ}_champion_juggernaut
+      units/{civ}_ship_juggernaut
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -13,9 +13,9 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
+      units/{civ}_infantry_pikeman_champion
+      units/{civ}_cavalry_spearman_champion
+      units/{civ}_elephant_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -22,8 +22,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_infantry_swordsman_champion_barracks
+      units/{civ}_cavalry_swordsman_champion_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -9,8 +9,8 @@
       units/{civ}_hero_marcellus
       units/{civ}_hero_maximus
       units/{civ}_hero_scipio
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
+      units/{civ}_infantry_swordsman_champion
+      units/{civ}_cavalry_swordsman_champion
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -14,11 +14,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_chariot
-      units/{civ}_champion_infantry_swordsman
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
+      units/{civ}_infantry_pikeman_champion
+      units/{civ}_infantry_swordsman_champion
+      units/{civ}_cavalry_spearman_champion
+      units/{civ}_chariot_archer_champion
+      units/{civ}_elephant_champion
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
Index: binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
@@ -20,11 +20,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_sword
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/spartans/barracks.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
@@ -41,7 +41,7 @@
       units/{civ}_hero_leonidas
       units/{civ}_hero_brasidas
       units/{civ}_hero_agis
-      units/{civ}_champion_infantry_spear
+      units/{civ}_infantry_spearman_champion
     </Entities>
     <Technologies datatype="tokens">
       hellenes/spartans_agoge
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
@@ -49,8 +49,8 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_black_cloak
-      units/{civ}_thureophoros
-      units/{civ}_thorakites
+      units/{civ}_infantry_javelinist_champion
+      units/{civ}_infantry_swordsman_champion
     </Entities>
   </ProductionQueue>
   <TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -48,7 +48,7 @@
     <Entities datatype="tokens">
       units/{civ}_support_elephant
       units/{civ}_elephant_archer_b
-      units/{civ}_champion_elephant
+      units/{civ}_elephant_champion
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>City Guard</GenericName>
-    <SpecificName>Epílektos</SpecificName>
-    <Icon>units/athen_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/infantry_spearman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Athenian Marine</GenericName>
-    <SpecificName>Epibátēs Athēnaîos</SpecificName>
-    <Icon>units/athen_champion_marine.png</Icon>
-    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Scythian Archer</GenericName>
-    <SpecificName>Toxótēs Skythikós</SpecificName>
-    <Icon>units/athen_champion_ranged.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
@@ -10,7 +10,7 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/athen_infantry_marine_archer_b
-      units/athen_champion_marine
+      units/athen_infantry_marine_champion
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
Index: binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>athen</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_javelinist">
-  <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>brit</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <GenericName>Celtic Chariot</GenericName>
-    <SpecificName>Carbanto</SpecificName>
-    <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
-    <Icon>units/brit_champion_chariot.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/britons/chariot_javelinist_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>brit</Civ>
-    <GenericName>Brythonic Longswordsman</GenericName>
-    <SpecificName>Delamokludda</SpecificName>
-    <SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
-    <Icon>units/brit_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/britons/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_chariot_javelinist_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_chariot_javelinist_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_chariot_javelinist_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/brit_chariot_javelinist_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/brit_infantry_swordsman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_infantry_swordsman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_infantry_swordsman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/brit_infantry_swordsman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>Sacred Band Cavalry</GenericName>
-    <SpecificName>Sacred Band of Astarte</SpecificName>
-    <Icon>units/cart_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>North African War Elephant</GenericName>
-    <SpecificName>Pil Malḥamit</SpecificName>
-    <Icon>units/cart_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/elephantry_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>Sacred Band Infantry</GenericName>
-    <SpecificName>Sacred Band of Ba'al</SpecificName>
-    <Icon>units/cart_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/infantry_spearman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>Sacred Band Pikeman</GenericName>
-    <SpecificName>Mašal</SpecificName>
-    <Icon>units/cart_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/infantry_pikeman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_cavalry_spearman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_cavalry_spearman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_cavalry_spearman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/gaul_cavalry_spearman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Gallic Noble Cavalry</GenericName>
-    <SpecificName>Gallic Brihent</SpecificName>
-    <SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
-    <Icon>units/gaul_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/gauls/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Armour>
-    <Hack op="add">-3</Hack>
-    <Pierce op="add">-3</Pierce>
-  </Armour>
-  <Cost>
-    <BuildTime op="mul">0.75</BuildTime>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Naked Fanatic</GenericName>
-    <SpecificName>Gaesata</SpecificName>
-    <Icon>units/celt_fanatic.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.4</WalkSpeed>
-    <Run>
-      <Speed op="mul">1.4</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/gauls/infantry_spearman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Heavy Swordsman</GenericName>
-    <SpecificName>Solduros</SpecificName>
-    <SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
-    <Icon>units/gaul_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/gauls/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/gaul_infantry_swordsman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/iber_cavalry_javelinist_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_javelinist">
-  <Attack>
-    <Ranged>
-      <Pierce>5</Pierce>
-      <Crush>15</Crush>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Leial Zalduneria</SpecificName>
-    <Icon>units/iber_champion_cavalry.png</Icon>
-    <SelectionGroupName>units/iber_champion_cavalry</SelectionGroupName>
-    <Tooltip>Special: Flaming javelins. Good vs. Buildings.</Tooltip>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/cavalry_javelinist_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Leial Ezpatari</SpecificName>
-    <Icon>units/iber_champion_infantry.png</Icon>
-    <SelectionGroupName>units/iber_champion_infantry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/iber_infantry_swordsman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Noble Cavalry</GenericName>
-    <SpecificName>Htr Ms’ n mh-ib</SpecificName>
-    <Icon>units/kush_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/kushites/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Meroitic War Elephant</GenericName>
-    <SpecificName>Abore ‘h3</SpecificName>
-    <Icon>units/kush_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/kushites/elephantry_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Noble Archer</GenericName>
-    <SpecificName>Hry pdty</SpecificName>
-    <Icon>units/kush_champion_archer.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/kushites/infantry_archer_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Napatan Temple Guard</GenericName>
-    <SpecificName>rs ‘Imn</SpecificName>
-    <Classes datatype="tokens">AmunGuard</Classes>
-    <Icon>units/kush_champion_amun.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/kushites/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Meroitic Temple Guard</GenericName>
-    <SpecificName>rs ‘Iprmk</SpecificName>
-    <VisibleClasses datatype="tokens">Axe</VisibleClasses>
-    <Classes datatype="tokens">ApedemakGuard</Classes>
-    <Icon>units/kush_champion_apedemak.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/kushites/infantry_axeman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_champion_cavalry">
+<Entity parent="units/mace_cavalry_spearman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Companion Cavalry</GenericName>
-    <SpecificName>Hetaîros</SpecificName>
-    <Icon>units/mace_champion_cavalry.png</Icon>
-    <SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_e">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_crossbowman_champion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_crossbowman_champion.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_crossbowman_champion.xml
@@ -15,10 +15,10 @@
     </Ranged>
   </Attack>
   <Identity>
-    <Civ>athen</Civ>
+    <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Greek Gastraphetes</GenericName>
-    <SpecificName>Toxótēs Skythikós</SpecificName>
+    <SpecificName>Toxótēs Gastraphétēs</SpecificName>
     <Icon>units/athen_champion_ranged.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion.xml
@@ -9,7 +9,7 @@
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
   </Identity>
   <Promotion>
-    <Entity>units/mace_champion_infantry_e</Entity>
+    <Entity>units/mace_infantry_spearman_champion_e</Entity>
     <RequiredXp>2000</RequiredXp>
   </Promotion>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_barracks.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_a">
+<Entity parent="units/mace_infantry_spearman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/mace_champion_infantry_e_barracks</Entity>
+    <Entity>units/mace_infantry_spearman_champion_e_barracks</Entity>
   </Promotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_e.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_a">
+<Entity parent="units/mace_infantry_spearman_champion">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">1</Pierce>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_e_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_e_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_champion_e_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/mace_infantry_spearman_champion_e">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thorakites">
-  <Identity>
-    <Civ>mace</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>mace</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Footprint replace="">
-    <Square width="5.5" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <GenericName>War Chariot</GenericName>
-    <SpecificName>Rath</SpecificName>
-    <SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
-    <Icon>units/maur_champion_chariot.png</Icon>
-    <Tooltip>Deals Trample Damage.</Tooltip>
-  </Identity>
-  <ResourceGatherer>
-    <MaxDistance>5.0</MaxDistance>
-    <Capacities>
-      <food>50</food>
-    </Capacities>
-  </ResourceGatherer>
-  <VisualActor>
-    <Actor>units/mauryans/chariot_archer_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>maur</Civ>
-    <GenericName>Indian War Elephant</GenericName>
-    <SpecificName>Gajendra</SpecificName>
-    <Icon>units/maur_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/elephantry_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_maceman">
-  <Identity>
-    <Civ>maur</Civ>
-    <GenericName>Warrior</GenericName>
-    <SpecificName>Yōddha</SpecificName>
-    <SelectionGroupName>units/maur_champion_infantry</SelectionGroupName>
-    <Icon>units/maur_champion_maceman.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/infantry_maceman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/maur_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>maur</Civ>
-    <Gender>female</Gender>
-    <GenericName>Maiden Guard</GenericName>
-    <SpecificName>Visha Kanya</SpecificName>
-    <SelectionGroupName>units/maur_champion_maiden</SelectionGroupName>
-    <Icon>units/maur_champion_maiden.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>maur</Civ>
-    <Gender>female</Gender>
-    <GenericName>Maiden Guard Archer</GenericName>
-    <SpecificName>Visha Kanya</SpecificName>
-    <Icon>units/maur_champion_maiden_archer.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/infantry_archer_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/maur_champion_maiden">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
@@ -9,7 +9,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/maur_champion_maiden_archer
+      units/maur_infantry_archer_champion
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
Index: binaries/data/mods/public/simulation/templates/units/maur_infantry_maceman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_infantry_maceman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_infantry_maceman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_champion_infantry">
+<Entity parent="units/maur_infantry_maceman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/maur_infantry_swordsman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Bactrian Heavy Lancer</GenericName>
-    <SpecificName>Bakhtrish Asabara</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Bactrian Heavy Cavalry Archer</GenericName>
-    <SpecificName>Bakhtrish Asabara</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/cavalry_archer_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Indian War Elephant</GenericName>
-    <SpecificName>Hinduya Pila</SpecificName>
-    <Icon>units/pers_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/elephantry_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Persian Immortal</GenericName>
-    <SpecificName>Anusiya</SpecificName>
-    <Classes datatype="tokens">Immortal</Classes>
-    <Icon>units/pers_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/infantry_spearman_c2.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
@@ -12,7 +12,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers_champion_infantry
+      units/pers_infantry_immortal_champion
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
Index: binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Cardaces Hoplite</GenericName>
-    <SpecificName>Hoplites Kardakes</SpecificName>
-    <Icon>units/pers_kardakes.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/infantry_spearman_c3.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelinist">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Cardaces Skirmisher</GenericName>
-    <SpecificName>Peltastes Kardakes</SpecificName>
-    <Icon>units/pers_kardakes_skirmisher.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/infantry_javelinist_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Royal Guard Cavalry</GenericName>
-    <SpecificName>Ágēma Basiléōs</SpecificName>
-    <Icon>units/ptol_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Towered War Elephant</GenericName>
-    <SpecificName>Polémou Eléphantos</SpecificName>
-    <Icon>units/ptol_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/elephantry_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>ptol</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Royal Guard Infantry</GenericName>
-    <SpecificName>Phalangitès Agema</SpecificName>
-    <Icon>units/ptol_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_pikeman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
-  <Cost>
-    <Population>5</Population>
-    <BuildTime>60</BuildTime>
-    <Resources>
-      <wood>400</wood>
-      <metal>300</metal>
-      <stone>350</stone>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <Max>100</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>4000</Max>
-  </Health>
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Juggernaut</GenericName>
-    <SpecificName>Tessarakonterēs</SpecificName>
-    <Classes datatype="tokens">Juggernaut</Classes>
-    <Icon>units/rome_ship_quinquereme.png</Icon>
-  </Identity>
-  <Loot>
-    <xp>200</xp>
-    <wood>50</wood>
-    <metal>50</metal>
-  </Loot>
-  <TrainingRestrictions>
-    <Category>Juggernaut</Category>
-  </TrainingRestrictions>
-  <VisualActor>
-    <Actor>structures/romans/quinquereme.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_cavalry_swordsman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_cavalry_swordsman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_cavalry_swordsman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_cavalry">
+<Entity parent="units/rome_cavalry_swordsman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_swordsman">
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <SpecificName>Eques Consularis</SpecificName>
-    <GenericName>Consular Bodyguard</GenericName>
-    <Icon>units/rome_champion_cavalry.png</Icon>
-    <SelectionGroupName>units/rome_champion_cavalry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/romans/cavalry_swordsman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <GenericName>Italic Heavy Infantry</GenericName>
-    <SpecificName>Extraordinarius</SpecificName>
-    <SelectionGroupName>units/rome_champion_infantry</SelectionGroupName>
-    <Icon>units/rome_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_champion_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_champion_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_champion_barracks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
+<Entity parent="units/rome_infantry_swordsman_champion">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Seleucid Cataphract</GenericName>
-    <SpecificName>Seleukidón Kataphraktos</SpecificName>
-    <Icon>units/sele_champion_cavalry.png</Icon>
-    <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Footprint replace="">
-    <Square width="7.5" depth="15.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <GenericName>Scythed Chariot</GenericName>
-    <SpecificName>Drepanèphoros</SpecificName>
-    <Icon>units/sele_champion_chariot.png</Icon>
-    <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
-  </Identity>
-  <ResourceGatherer>
-    <MaxDistance>5.0</MaxDistance>
-    <Capacities>
-      <food>50</food>
-    </Capacities>
-  </ResourceGatherer>
-  <VisualActor>
-    <Actor>units/seleucids/chariot_archer_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Armored War Elephant</GenericName>
-    <SpecificName>Thorakisménos Eléphantos</SpecificName>
-    <Icon>units/maur_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/elephantry_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Silver Shield Pikeman</GenericName>
-    <SpecificName>Phalangitès Argyraspis</SpecificName>
-    <Icon>units/sele_champion_pikeman.png</Icon>
-    <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_pikeman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Romanized Heavy Swordsman</GenericName>
-    <SpecificName>Thorakitès Rhomaïkós</SpecificName>
-    <Icon>units/sele_champion_swordsman.png</Icon>
-    <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Spartan Pikeman</GenericName>
-    <SpecificName>Phalangites Spartiatis</SpecificName>
-    <Icon>units/spart_champion_infantry_pike.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/spartans/infantry_pikeman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Spartan Hoplite</GenericName>
-    <SpecificName>Spartiátēs</SpecificName>
-    <Icon>units/spart_champion_infantry_spear.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/spartans/infantry_spearman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/spart_syssiton
-      structures/spart_theatron
-      structures/spart_royal_stoa
-      -structures/{civ}_wallset_stone
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-10.0</food>
-      <metal op="add">+20.0</metal>
-    </Resources>
-    <BuildTime op="add">+5</BuildTime>
-  </Cost>
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Skiritai Commando</GenericName>
-    <SpecificName>Ékdromos Skirítēs</SpecificName>
-    <Rank>Elite</Rank>
-    <Icon>units/spart_champion_infantry_sword.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/spartans/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thorakites">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>