Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml	(revision 27125)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
   <Attack>
     <Melee>
       <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
       </Damage>
       <MaxRange>2.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
   <Health>
     <Max>40</Max>
   </Health>
   <Identity>
     <GenericName>Wolfhound</GenericName>
     <SpecificName>Canis lupus familiaris</SpecificName>
-    <Icon>units/brit_wolfhound.png</Icon>
+    <Icon>units/brit/wolfhound.png</Icon>
   </Identity>
   <Loot>
     <xp>8</xp>
   </Loot>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>units/britons/wolfhound.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml	(revision 27125)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_cavalry_javelinist.png</Icon>
+    <Icon>units/athen/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
     <general>units/{civ}/cavalry_javelineer_b</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>units/athenians/cavalry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml	(revision 27125)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_infantry_spearman.png</Icon>
+    <Icon>units/athen/infantry_spearman.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
     <general>units/{civ}/infantry_spearman_b</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>units/athenians/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml	(revision 27125)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_infantry_slinger.png</Icon>
+    <Icon>units/rome/infantry_javelinist.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
     <general>units/{civ}/infantry_javelineer_b</general>
   </SkirmishReplacer>
   <VisualActor>
-    <Actor>units/athenians/infantry_slinger_b.xml</Actor>
+    <Actor>units/romans/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml	(revision 27125)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/athen_ship_trireme.png</Icon>
+    <Icon>units/athen/ship_trireme.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/ship_trireme</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>structures/athenians/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_siege_ram.xml	(revision 27125)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="8.0" depth="15.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/spart_siege_ram.png</Icon>
+    <Icon>units/spart/siege_ram.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/siege_ram</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>structures/spartans/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_female_citizen.xml	(revision 27125)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/hele_support_female_citizen.png</Icon>
+    <Icon>units/hele/support_female_citizen.png</Icon>
   </Identity>
   <SkirmishReplacer>
     <general>units/{civ}/support_female_citizen</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>units/athenians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml	(revision 27124)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/special_starting_unit.xml	(revision 27125)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Footprint>
     <Circle radius="4.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
-    <Icon>units/maur_support_elephant.png</Icon>
+    <Icon>units/maur/support_elephant.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer/>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
   <VisualActor>
     <Actor>units/mauryas/support_elephant.xml</Actor>
   </VisualActor>
 </Entity>