diff --git a/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_a.xml
index 17b839e6f5..b21151db47 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_a.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_a.xml
@@ -6,28 +6,8 @@
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="100"/>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="97"/>
-        <animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.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_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_long.dae</mesh>
@@ -44,112 +24,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.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 actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <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 actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_archer.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/mauryans/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_b.xml
index cea09f78ef..68928d8273 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_b.xml
@@ -6,28 +6,8 @@
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="100"/>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="97"/>
-        <animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.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_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_long.dae</mesh>
@@ -44,112 +24,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.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 actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <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 actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_archer.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/mauryans/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_e.xml
index 7a94485b41..31a20ced22 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_archer_e.xml
@@ -6,28 +6,8 @@
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="100"/>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="97"/>
-        <animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.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_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_long.dae</mesh>
@@ -44,112 +24,23 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.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 actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <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 actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_ruins">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_archer.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/mauryans/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_a.xml
index 2ec200bf10..9e0f955132 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_a.xml
@@ -14,28 +14,6 @@
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="130"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>
-        <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_spear_shield_atk_b.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="attack_slaughter" speed="100"/>
-        <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_long.dae</mesh>
@@ -52,115 +30,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_spearman.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_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_b.xml
index 1c6c3ba060..167927990c 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_b.xml
@@ -14,28 +14,6 @@
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="130"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>
-        <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_spear_shield_atk_b.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="attack_slaughter" speed="100"/>
-        <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_long.dae</mesh>
@@ -52,115 +30,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_spearman.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_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_e.xml
index 546553b952..df911de639 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_spearman_e.xml
@@ -14,28 +14,6 @@
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="130"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>
-        <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_spear_shield_atk_b.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="attack_slaughter" speed="100"/>
-        <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_long.dae</mesh>
@@ -52,115 +30,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_spearman.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_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_a.xml
index f182d71ba1..3b093444bc 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_a.xml
@@ -8,40 +8,9 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
         <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="95"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <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_spear_shield_atk_a.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="111"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="105"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="95"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="90"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="25"/>
         <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 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="110"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
-        <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="220"/>
-        <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_a.pmd</mesh>
@@ -58,115 +27,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_swordsman.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/mauryans/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_b.xml
index cf32f1f74d..831c7db78b 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_b.xml
@@ -8,40 +8,9 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
         <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="95"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <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_spear_shield_atk_a.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="111"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="105"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="95"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="90"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="25"/>
         <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 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="110"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
-        <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="220"/>
-        <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_a.pmd</mesh>
@@ -58,115 +27,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_swordsman.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/mauryans/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_e.xml
index 14018de660..f70bf0cac5 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/infantry_swordsman_e.xml
@@ -8,40 +8,9 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
         <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="95"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <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_spear_shield_atk_a.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="111"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="105"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="95"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_melee" speed="90"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="25"/>
         <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 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="110"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
-        <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="220"/>
-        <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_a.pmd</mesh>
@@ -58,115 +27,23 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <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 name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_swordsman.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/variants/biped/infantry_death.xml b/binaries/data/mods/public/art/variants/biped/infantry_death.xml
index 445d9a893d..180b1fd3bf 100644
--- a/binaries/data/mods/public/art/variants/biped/infantry_death.xml
+++ b/binaries/data/mods/public/art/variants/biped/infantry_death.xml
@@ -6,4 +6,7 @@
 	<animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
 	<animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
   </animations>
+  <props>
+    <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+  </props>
 </variant>