diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_a.xml
index 4f182bf94d..c11cfd7c89 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_a.xml
@@ -5,32 +5,10 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
-        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
-        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_long.dae</mesh>
@@ -39,6 +17,7 @@
         <prop actor="props/units/shields/spart_pelta_adv.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
         <prop actor="props/units/cape_hd_pelt.xml" attachpoint="shoulders"/>
       </props>
       <textures><texture file="skeletal/mace_ijv_b.png" name="baseTex"/></textures>
@@ -46,125 +25,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_tree">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_rock">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint=""/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint=""/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="carry_food">
-      <props>
-        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_wood">
-      <props>
-        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_stone">
-      <props>
-        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_metal">
-      <props>
-        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_javelinist.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/infantry_death.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_b.xml
index af843ea656..afaa112766 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_b.xml
@@ -5,32 +5,10 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
-        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
-        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -38,6 +16,7 @@
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/shields/spart_pelta_basic.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
         <prop actor="props/units/cape_hd_pelt.xml" attachpoint="shoulders"/>
       </props>
@@ -46,116 +25,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_tree">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_rock">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="carry_food">
-      <props>
-        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_wood">
-      <props>
-        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_stone">
-      <props>
-        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_metal">
-      <props>
-        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_javelinist.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/infantry_death.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_e.xml
index 9ec8a20e8f..14448a22be 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_javelinist_e.xml
@@ -5,32 +5,10 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
-        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
-        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_long.dae</mesh>
@@ -40,6 +18,7 @@
         <prop actor="props/units/shields/spart_pelta_elite.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
         <prop actor="props/units/cape_hd_pelt.xml" attachpoint="shoulders"/>
       </props>
       <textures><texture file="skeletal/mace_ijv_b.png" name="baseTex"/></textures>
@@ -47,125 +26,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_tree">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_rock">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint=""/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint=""/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="carry_food">
-      <props>
-        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_wood">
-      <props>
-        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_stone">
-      <props>
-        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_metal">
-      <props>
-        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_javelinist.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/infantry_death.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml
index fb8d259b6f..8fdc331d10 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml
@@ -7,27 +7,6 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_slaughter" speed="200"/>
-        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
-        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -64,133 +43,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_tree">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_rock">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_food">
-      <props>
-        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_wood">
-      <props>
-        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_stone">
-      <props>
-        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_metal">
-      <props>
-        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_hoplite.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/infantry_death.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml
index efe6b905e1..11f03b1c64 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml
@@ -7,27 +7,6 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_slaughter" speed="200"/>
-        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
-        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -52,120 +31,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant name="attack_melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_tree">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_rock">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="carry_food">
-      <props>
-        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_wood">
-      <props>
-        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_stone">
-      <props>
-        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="carry_metal">
-      <props>
-        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_hoplite.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/infantry_death.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml
index d2900b04a9..cd5afb657e 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml
@@ -7,27 +7,6 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_slaughter" speed="200"/>
-        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
-        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
-        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -61,134 +40,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant name="attack_melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_tree">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_rock">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="shield"/>
-        <prop attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-        <prop attachpoint=""/>
-      </props>
-    </variant>
-    <variant name="carry_food">
-      <props>
-        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_wood">
-      <props>
-        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_stone">
-      <props>
-        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="carry_metal">
-      <props>
-        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_hoplite.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/infantry_death.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>