diff --git a/binaries/data/mods/public/art/variants/biped/attack_capture.xml b/binaries/data/mods/public/art/variants/biped/attack_capture.xml
index 7bcb3ffc9e..955da9651e 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_capture.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_capture.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_capture">
   <animations>
-	<animation file="biped/new/capturing_a.dae" name="attack_capture" speed="100"/>
+    <animation file="biped/infantry/capturing_a.dae" name="attack_capture" speed="100"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_melee_female.xml b/binaries/data/mods/public/art/variants/biped/attack_melee_female.xml
index fe1457838d..56f8d524fc 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_melee_female.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_melee_female.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_melee">
   <animations>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" speed="100"/>
   </animations>
   <props>
     <prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_melee_hoplite.xml b/binaries/data/mods/public/art/variants/biped/attack_melee_hoplite.xml
index e5659ee9ca..18bf97eeba 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_melee_hoplite.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_melee_hoplite.xml
@@ -1,5 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_melee">
   <animations>
-	<animation event="0.5" file="biped/new/hoplite_attack_a.dae" name="Attack_melee" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_b.dae" name="Attack_melee" id="attack2" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_c.dae" name="Attack_melee" id="attack3" speed="30"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_melee_swordsman_shieldarm.xml b/binaries/data/mods/public/art/variants/biped/attack_melee_swordsman_shieldarm.xml
index 7e1a1f3d83..78f391afc7 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_melee_swordsman_shieldarm.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_melee_swordsman_shieldarm.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_melee">
   <animations>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_a.dae" name="attack_melee" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_b.dae" name="attack_melee" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_c.dae" name="attack_melee" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="100"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer.xml
index 15c312bae7..c079bfb0e1 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.35" file="biped/new/bow_attack_a.dae" load="0.75" name="attack_ranged" speed="200"/>
+    <animation event="0.35" file="biped/infantry/archer/attack_ranged.dae" load="0.75" name="attack_ranged" speed="200"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_fire.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_fire.xml
index 2701787082..9f455f927c 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_fire.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_fire.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.35" file="biped/new/bow_attack_a.dae" load="0.75" name="attack_ranged" speed="200"/>
+    <animation event="0.35" file="biped/infantry/archer/attack_ranged.dae" load="0.75" name="attack_ranged" speed="200"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip.xml
index 6f100f7f96..c77de2ccbb 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.35" file="biped/new/bow_hip_attack_a.dae" load="0.75" name="attack_ranged" speed="200"/>
+    <animation event="0.35" file="biped/infantry/archer/attack_ranged_hip.dae" load="0.75" name="attack_ranged" speed="200"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip_fire.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip_fire.xml
index 624b1f132c..13d7a8d991 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip_fire.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_archer_hip_fire.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.35" file="biped/new/bow_hip_attack_a.dae" load="0.75" name="attack_ranged" speed="200"/>
+    <animation event="0.35" file="biped/infantry/archer/attack_ranged_hip.dae" load="0.75" name="attack_ranged" speed="200"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_gastraphetes_fire.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_gastraphetes_fire.xml
index b97a00baaa..b52db7b8c5 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_gastraphetes_fire.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_gastraphetes_fire.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.92" file="biped/new/gastraphetes_attack.dae" load="0.55" name="attack_ranged" speed="100"/>
+    <animation event="0.92" file="biped/infantry/gastraphetes/attack_ranged.dae" load="0.55" name="attack_ranged" speed="100"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist.xml
index f9c0bf5514..7f5df39e48 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.50" file="biped/new/javelin_attack_a.dae" load="0.75" name="attack_ranged" speed="100"/>
+    <animation event="0.50" file="biped/infantry/javelinist/attack_ranged.dae" load="0.75" name="attack_ranged" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_fire.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_fire.xml
index 1993fcc7ca..484f808ebd 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_fire.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_fire.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.50" file="biped/new/javelin_attack_a.dae" load="0.75" name="attack_ranged" speed="100"/>
+    <animation event="0.50" file="biped/infantry/javelinist/attack_ranged.dae" load="0.75" name="attack_ranged" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_heavy.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_heavy.xml
index 91a6f10f24..f3aa8a8fb5 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_heavy.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_heavy.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.50" file="biped/new/javelin_attack_a.dae" load="0.75" name="attack_ranged" speed="100"/>
+    <animation event="0.50" file="biped/infantry/javelinist/attack_ranged.dae" load="0.75" name="attack_ranged" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_shieldarm.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_shieldarm.xml
new file mode 100644
index 0000000000..aa765bc33d
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist_shieldarm.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="attack_ranged">
+  <animations>
+    <animation event="0.50" file="biped/infantry/javelinist/attack_ranged_shieldarm.dae" load="0.75" name="attack_ranged" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-weapon_R"/>
+    <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_a.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_a.xml
index e776a3a61a..acc24216b2 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_a.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_a.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.58" file="biped/new/kart_ballista_attack_a.dae" name="attack_ranged" speed="100"/>
+    <animation event="0.58" file="biped/infantry/siege_operators/kart_ballista_attack_a.dae" name="attack_ranged" speed="100"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_b.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_b.xml
index 9bc37b85a7..580a1bcc4e 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_b.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_kart_ballista_fire_b.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.58" file="biped/new/kart_ballista_attack_b.dae" load="0.26" name="attack_ranged" speed="100"/>
+    <animation event="0.58" file="biped/infantry/siege_operators/kart_ballista_attack_b.dae" load="0.26" name="attack_ranged" speed="100"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_a.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_a.xml
index 94c0d0d121..45930156d6 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_a.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_a.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event=".61" file="biped/new/lithobolos_attack_a.dae" name="attack_ranged" speed="250"/>
+    <animation event="0.61" file="biped/infantry/siege_operators/lithobolos_attack_a.dae" name="attack_ranged" speed="250"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_b.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_b.xml
index 1c7315cbd0..22621b530f 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_b.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_lithobolos_fire_b.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event=".61" file="biped/new/lithobolos_attack_b.dae" load="0.24" name="attack_ranged" speed="250"/>
+    <animation event="0.61" file="biped/infantry/siege_operators/lithobolos_attack_b.dae" load="0.24" name="attack_ranged" speed="250"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_a.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_a.xml
index 062cfac43d..64ce1fad20 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_a.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_a.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.66" file="biped/new/oxybeles_attack_a.dae" name="attack_ranged" speed="250"/>
+    <animation event="0.66" file="biped/infantry/siege_operators/oxybeles_attack_a.dae" name="attack_ranged" speed="250"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_b.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_b.xml
index 3717d48e6c..372202890f 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_b.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_oxybeles_fire_b.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.66" file="biped/new/oxybeles_attack_b.dae" load="0.32" name="attack_ranged" speed="250"/>
+    <animation event="0.66" file="biped/infantry/siege_operators/oxybeles_attack_b.dae" load="0.32" name="attack_ranged" speed="250"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_a.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_a.xml
index facac6ee41..e0a288e128 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_a.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_a.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event=".6" file="biped/new/polybolos_attack_a.dae" name="attack_ranged" speed="250"/>
+    <animation event="0.6" file="biped/infantry/siege_operators/polybolos_attack_a.dae" name="attack_ranged" speed="250"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_b.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_b.xml
index decb1da014..4fb99de23f 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_b.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_polybolos_fire_b.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event=".6" file="biped/new/polybolos_attack_b.dae" load=".0" name="attack_ranged" speed="250"/>
+    <animation event="0.6" file="biped/infantry/siege_operators/polybolos_attack_b.dae" load="0.0" name="attack_ranged" speed="250"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_a.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_a.xml
index 4359bf90a8..7cc1e1e61a 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_a.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_a.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.75" file="biped/new/rome_ballista_attack_a.dae" name="attack_ranged" speed="150"/>
+    <animation event="0.75" file="biped/infantry/siege_operators/rome_ballista_attack_a.dae" name="attack_ranged" speed="150"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_b.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_b.xml
index a4164524cf..3bf9eced38 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_b.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_rome_ballista_fire_b.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.75" file="biped/new/rome_ballista_attack_b.dae" load="0.24" name="attack_ranged" speed="150"/>
+    <animation event="0.75" file="biped/infantry/siege_operators/rome_ballista_attack_b.dae" load="0.24" name="attack_ranged" speed="150"/>
   </animations>
   <props>
     <prop actor="" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_scorpio_fire.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_scorpio_fire.xml
index bf2c018702..bf04552170 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_scorpio_fire.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_scorpio_fire.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event=".68" file="biped/new/scorpio_attack.dae" name="attack_ranged" speed="250"/>
+    <animation event="0.68" file="biped/infantry/siege_operators/scorpio_attack.dae" name="attack_ranged" speed="250"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_ranged_slinger.xml b/binaries/data/mods/public/art/variants/biped/attack_ranged_slinger.xml
index 31087b5d90..90982dc330 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_ranged_slinger.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_ranged_slinger.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_ranged">
   <animations>
-    <animation event="0.50" file="biped/new/slinger_attack_a.dae" load="0.75" name="Attack_ranged" speed="100"/>
+    <animation event="0.50" file="biped/infantry/slinger/attack_ranged.dae" load="0.75" name="Attack_ranged" speed="100"/>
   </animations>
   <props>
     <prop actor="props/units/weapons/sling_attack.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml b/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml
index 0780ba0bc0..688019e2a5 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="attack_slaughter">
-  <animations>
-	<animation event="0.5" file="biped/new/slaughter.dae" name="attack_slaughter" speed="100"/>
-  </animations>
-  <props>
-	<prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
-	<prop attachpoint="weapon_L"/>
-	<prop attachpoint="shield"/>
-	<prop attachpoint="shield_arm"/>
-  </props>
+	<animations>
+		<animation event="0.5" file="biped/gatherer/slaughter.dae" name="attack_slaughter" speed="100"/>
+	</animations>
+	<props>
+		<prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
+		<prop attachpoint="weapon_L"/>
+		<prop attachpoint="shield"/>
+		<prop attachpoint="shield_arm"/>
+	</props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_archer_chariot_ready.xml b/binaries/data/mods/public/art/variants/biped/base_archer_chariot_ready.xml
index b17ef6f7f1..892168209e 100644
--- a/binaries/data/mods/public/art/variants/biped/base_archer_chariot_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_archer_chariot_ready.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/bow_idle_ready.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Walk" id="walk2" speed="18"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Run" id="run3" speed="6"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Walk" id="walk2" speed="18"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_archer_gastraphetes_relax.xml b/binaries/data/mods/public/art/variants/biped/base_archer_gastraphetes_relax.xml
index 9f5a249b61..8c11e6c556 100644
--- a/binaries/data/mods/public/art/variants/biped/base_archer_gastraphetes_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_archer_gastraphetes_relax.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/gastraphetes_idle.dae" name="Idle" id="idle1" speed="40"/>
-    <animation file="biped/new/gastraphetes_idle.dae" name="Idle" id="idle2" speed="41"/>
-    <animation file="biped/new/gastraphetes_idle.dae" name="Idle" id="idle3" speed="42"/>
-    <animation file="biped/new/gastraphetes_walk_relax.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/gastraphetes_walk_relax.dae" name="Walk" id="walk2" speed="18"/>
-    <animation file="biped/new/gastraphetes_jog.dae" name="Run" id="run1" speed="6"/>
-    <animation file="biped/new/gastraphetes_jog.dae" name="Run" id="run2" speed="7"/>
-    <animation file="biped/new/gastraphetes_jog.dae" name="Run" id="run3" speed="8"/>
-    <animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/gastraphetes/idle.dae" name="Idle" id="idle1" speed="40"/>
+    <animation file="biped/infantry/gastraphetes/idle.dae" name="Idle" id="idle2" speed="41"/>
+    <animation file="biped/infantry/gastraphetes/idle.dae" name="Idle" id="idle3" speed="42"/>
+    <animation file="biped/infantry/gastraphetes/walk_relax.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/infantry/gastraphetes/walk_relax.dae" name="Walk" id="walk2" speed="18"/>
+    <animation file="biped/infantry/gastraphetes/jog.dae" name="Run" id="run1" speed="6"/>
+    <animation file="biped/infantry/gastraphetes/jog.dae" name="Run" id="run2" speed="7"/>
+    <animation file="biped/infantry/gastraphetes/jog.dae" name="Run" id="run3" speed="8"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_archer_ready.xml b/binaries/data/mods/public/art/variants/biped/base_archer_ready.xml
index 80714a9bf0..458c8f2a41 100644
--- a/binaries/data/mods/public/art/variants/biped/base_archer_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_archer_ready.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/bow_idle_ready.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/bow_idle_ready.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/bow_jog_ready.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/bow_jog_ready.dae" name="Walk" id="walk2" speed="18"/>
-    <animation file="biped/new/bow_run_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/bow_run_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/bow_run_ready.dae" name="Run" id="run3" speed="6"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/archer/idle_ready.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/archer/jog_ready.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/infantry/archer/jog_ready.dae" name="Walk" id="walk2" speed="18"/>
+    <animation file="biped/infantry/archer/run_ready.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/archer/run_ready.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/archer/run_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_archer_relax_fem.xml b/binaries/data/mods/public/art/variants/biped/base_archer_relax_fem.xml
index e1a95e78be..7fb4ae929c 100644
--- a/binaries/data/mods/public/art/variants/biped/base_archer_relax_fem.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_archer_relax_fem.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/bow_idle_relax.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/bow_idle_relax.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/bow_idle_relax.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/fem_walk_relax.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/fem_walk_relax.dae" name="Walk" id="walk2" speed="18"/>
-    <animation file="biped/new/bow_jog_relax.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/bow_jog_relax.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/bow_jog_relax.dae" name="Run" id="run3" speed="6"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/archer/idle_relax.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/archer/idle_relax.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/archer/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/citizen/walk_relax_f.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/citizen/walk_relax_f.dae" name="Walk" id="walk2" speed="18"/>
+    <animation file="biped/infantry/archer/jog_relax.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/archer/jog_relax.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/archer/jog_relax.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_driver_chariot.xml b/binaries/data/mods/public/art/variants/biped/base_driver_chariot.xml
index 6c201e4c7d..89dc5a41ed 100644
--- a/binaries/data/mods/public/art/variants/biped/base_driver_chariot.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_driver_chariot.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/chariot_rider_idle.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/chariot_rider_idle.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/chariot_rider_idle.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/chariot_rider_walk.dae" name="Walk" id="walk1" speed="10"/>
-    <animation file="biped/new/chariot_rider_walk.dae" name="Walk" id="walk2" speed="5"/>
-    <animation file="biped/new/chariot_rider_walk.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/chariot_rider_walk.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/chariot_rider_walk.dae" name="Run" id="run3" speed="6"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/chariot/idle.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/chariot/idle.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/chariot/idle.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/chariot/walk.dae" name="Walk" id="walk1" speed="10"/>
+    <animation file="biped/chariot/walk.dae" name="Walk" id="walk2" speed="5"/>
+    <animation file="biped/chariot/walk.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/chariot/walk.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/chariot/walk.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_driver_chariot_celt.xml b/binaries/data/mods/public/art/variants/biped/base_driver_chariot_celt.xml
index 29e8fa8c3b..aca3a7d570 100644
--- a/binaries/data/mods/public/art/variants/biped/base_driver_chariot_celt.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_driver_chariot_celt.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/chariot_rider_idle_celt.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/chariot_rider_idle_celt.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/chariot_rider_idle_celt.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/chariot_rider_walk_celt.dae" name="Walk" id="walk1" speed="10"/>
-    <animation file="biped/new/chariot_rider_walk_celt.dae" name="Walk" id="walk2" speed="5"/>
-    <animation file="biped/new/chariot_rider_walk_celt.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/chariot_rider_walk_celt.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/chariot_rider_walk_celt.dae" name="Run" id="run3" speed="6"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/chariot/idle_celt.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/chariot/idle_celt.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/chariot/idle_celt.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/chariot/walk_celt.dae" name="Walk" id="walk1" speed="10"/>
+    <animation file="biped/chariot/walk_celt.dae" name="Walk" id="walk2" speed="5"/>
+    <animation file="biped/chariot/walk_celt.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/chariot/walk_celt.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/chariot/walk_celt.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_healer.xml b/binaries/data/mods/public/art/variants/biped/base_healer.xml
index c6eaddf1bc..db8697f57b 100644
--- a/binaries/data/mods/public/art/variants/biped/base_healer.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_healer.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/healer_jog.dae" name="Run" id="run1" speed="10"/>
-    <animation file="biped/new/healer_jog.dae" name="Run" id="run2" speed="11"/>
-    <animation file="biped/new/healer_jog.dae" name="Run" id="run3" speed="12"/>
-    <animation file="biped/new/healer_heal.dae" name="Heal" id="heal1" speed="100"/>
-    <animation file="biped/new/healer_heal.dae" name="Heal" id="heal2" speed="100"/>
-    <animation file="biped/new/healer_heal.dae" name="attack_capture" speed="100"/>
-    <animation file="biped/new/pray.dae" name="gather_praise" id="praise1" speed="100"/>
-    <animation file="biped/new/pray.dae" name="gather_praise" id="praise2" speed="200"/>
-    <animation file="biped/new/pray.dae" name="gather_praise" id="praise3" speed="50"/>
-    <animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/citizen/jog_h.dae" name="Run" id="run1" speed="10"/>
+    <animation file="biped/citizen/jog_h.dae" name="Run" id="run2" speed="11"/>
+    <animation file="biped/citizen/jog_h.dae" name="Run" id="run3" speed="12"/>
+    <animation file="biped/citizen/healing_m.dae" name="attack_capture" speed="100"/>
+    <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise1" speed="100"/>
+    <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise2" speed="200"/>
+    <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise3" speed="50"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_healer_female.xml b/binaries/data/mods/public/art/variants/biped/base_healer_female.xml
index 2cb68da0a1..9134835435 100644
--- a/binaries/data/mods/public/art/variants/biped/base_healer_female.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_healer_female.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant file="biped/base_healer.xml">
   <animations>
-    <animation file="biped/new/healer_idle_relax_female.dae" name="Idle" id="idle1" speed="60"/>
-    <animation file="biped/new/healer_idle_relax_female.dae" name="Idle" id="idle2" speed="62"/>
-    <animation file="biped/new/healer_idle_relax_female.dae" name="Idle" id="idle3" speed="64"/>
-    <animation file="biped/new/healer_walk_relax_female.dae" name="Walk" id="walk1" speed="25"/>
-    <animation file="biped/new/healer_walk_relax_female.dae" name="Walk" id="walk2" speed="23"/>
+    <animation file="biped/citizen/healing_f.dae" name="Heal" id="heal1" speed="100"/>
+    <animation file="biped/citizen/healing_f.dae" name="Heal" id="heal2" speed="100"/>
+    <animation file="biped/citizen/idle_relax_h_f.dae" name="Idle" id="idle1" speed="60"/>
+    <animation file="biped/citizen/idle_relax_h_f.dae" name="Idle" id="idle2" speed="62"/>
+    <animation file="biped/citizen/idle_relax_h_f.dae" name="Idle" id="idle3" speed="64"/>
+    <animation file="biped/citizen/walk_relax_h_f.dae" name="Walk" id="walk1" speed="25"/>
+    <animation file="biped/citizen/walk_relax_h_f.dae" name="Walk" id="walk2" speed="23"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_healer_male.xml b/binaries/data/mods/public/art/variants/biped/base_healer_male.xml
index 2336c9c5ec..524a27178a 100644
--- a/binaries/data/mods/public/art/variants/biped/base_healer_male.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_healer_male.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant file="biped/base_healer.xml">
   <animations>
-    <animation file="biped/new/healer_idle_relax.dae" name="Idle" id="idle1" speed="60"/>
-    <animation file="biped/new/healer_idle_relax.dae" name="Idle" id="idle2" speed="62"/>
-    <animation file="biped/new/healer_idle_relax.dae" name="Idle" id="idle3" speed="64"/>
-    <animation file="biped/new/healer_walk_relax.dae" name="Walk" id="walk1" speed="25"/>
-    <animation file="biped/new/healer_walk_relax.dae" name="Walk" id="walk2" speed="23"/>
+    <animation file="biped/citizen/healing_m.dae" name="Heal" id="heal1" speed="100"/>
+    <animation file="biped/citizen/healing_m.dae" name="Heal" id="heal2" speed="100"/>
+    <animation file="biped/citizen/idle_relax_h_m.dae" name="Idle" id="idle1" speed="60"/>
+    <animation file="biped/citizen/idle_relax_h_m.dae" name="Idle" id="idle2" speed="62"/>
+    <animation file="biped/citizen/idle_relax_h_m.dae" name="Idle" id="idle3" speed="64"/>
+    <animation file="biped/citizen/walk_relax_h_m.dae" name="Walk" id="walk1" speed="25"/>
+    <animation file="biped/citizen/walk_relax_h_m.dae" name="Walk" id="walk2" speed="23"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_hoplite.xml b/binaries/data/mods/public/art/variants/biped/base_hoplite.xml
index 282197216f..34843a771f 100644
--- a/binaries/data/mods/public/art/variants/biped/base_hoplite.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_hoplite.xml
@@ -1,23 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/hoplite_idle_relax.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/hoplite_idle_relax.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/hoplite_idle_relax.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/hoplite_walk_relax.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/hoplite_walk_relax.dae" name="Walk" id="walk2" speed="32"/>
-    <animation file="biped/new/hoplite_run_relax.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/hoplite_run_relax.dae" name="Run" id="run2" speed="4"/>
-    <animation file="biped/new/hoplite_run_relax.dae" name="Run" id="run3" speed="4"/>
-    <animation file="biped/new/hoplite_idle_ready.dae" name="phalanx_idle" speed="30"/>
-    <animation file="biped/new/hoplite_idle_ready.dae" name="phalanx_back_idle" speed="30"/>
-    <animation file="biped/new/hoplite_walk_ready.dae" name="phalanx_walk" id="phalwalk1" speed="30"/>
-    <animation file="biped/new/hoplite_walk_ready.dae" name="phalanx_walk" id="phalwalk2" speed="31"/>
-    <animation file="biped/new/hoplite_walk_ready.dae" name="phalanx_walk" id="phalwalk3" speed="32"/>
-    <animation file="biped/new/hoplite_run_ready.dae" name="phalanx_run" id="phalrun1" speed="15"/>
-    <animation file="biped/new/hoplite_run_ready.dae" name="phalanx_run" id="phalrun2" speed="16"/>
-    <animation event="0.5" file="biped/new/hoplite_attack_a.dae" name="phalanx_attack" id="phalattack1" speed="30"/>
-    <animation event="0.5" file="biped/new/hoplite_attack_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
-    <animation file="biped/new/capturing_a.dae" name="attack_capture" speed="100"/>
+    <animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/hoplite/walk_relax.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/hoplite/walk_relax.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/infantry/hoplite/run_relax.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/hoplite/run_relax.dae" name="Run" id="run2" speed="4"/>
+    <animation file="biped/infantry/hoplite/run_relax.dae" name="Run" id="run3" speed="4"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_b.dae" name="Attack_melee" id="attack2" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_c.dae" name="Attack_melee" id="attack3" speed="30"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/capturing_a.dae" name="attack_capture" speed="100"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_hoplite_fast.xml b/binaries/data/mods/public/art/variants/biped/base_hoplite_fast.xml
new file mode 100644
index 0000000000..d231ff89aa
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_hoplite_fast.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base" frequency="1">
+  <animations>
+    <animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/hoplite/jog_relax.dae" name="Walk" id="walk1" speed="10"/>
+    <animation file="biped/infantry/hoplite/jog_relax.dae" name="Walk" id="walk2" speed="12"/>
+    <animation file="biped/infantry/hoplite/run_relax.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/hoplite/run_relax.dae" name="Run" id="run2" speed="4"/>
+    <animation file="biped/infantry/hoplite/run_relax.dae" name="Run" id="run3" speed="4"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_a.dae" name="phalanx_attack" id="phalattack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_b.dae" name="Attack_melee" id="attack2" speed="30"/>
+    <animation event="0.5" file="biped/infantry/hoplite/attack_melee_c.dae" name="Attack_melee" id="attack3" speed="30"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/capturing_a.dae" name="attack_capture" speed="100"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_jav_chariot_ready.xml b/binaries/data/mods/public/art/variants/biped/base_jav_chariot_ready.xml
index 7162b56f8c..c81f5a672d 100644
--- a/binaries/data/mods/public/art/variants/biped/base_jav_chariot_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_jav_chariot_ready.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Walk" id="walk2" speed="18"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Run" id="run3" speed="6"/>
-    <animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Walk" id="walk2" speed="18"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield.xml b/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield.xml
index db009ef9c3..6c84084543 100644
--- a/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield.xml
@@ -1,16 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/2h_idle_relax.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/2h_idle_relax.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/2h_idle_relax.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk2" speed="22"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk3" speed="24"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" id="run1" speed="8"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" id="run2" speed="9"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk2" speed="22"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk3" speed="24"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield_fast.xml b/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield_fast.xml
index 195c174230..021a426226 100644
--- a/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_rhomphaia_shield_fast.xml
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/2h_idle_relax.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/2h_idle_relax.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/2h_idle_relax.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" id="walk1" speed="12"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" id="walk2" speed="14"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" id="run1" speed="8"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" id="run2" speed="9"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" id="walk1" speed="12"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" id="walk2" speed="14"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_skirmisher.xml b/binaries/data/mods/public/art/variants/biped/base_skirmisher.xml
index a4242e020c..30126202df 100644
--- a/binaries/data/mods/public/art/variants/biped/base_skirmisher.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_skirmisher.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Idle" id="idle1" speed="70"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Idle" id="idle2" speed="65"/>
-    <animation file="biped/new/javelin_idle_ready.dae" name="Idle" id="idle3" speed="60"/>
-    <animation file="biped/new/javelin_shield_jog_relax.dae" name="Walk" id="walk1" speed="15"/>
-    <animation file="biped/new/javelin_shield_jog_relax.dae" name="Walk" id="walk2" speed="16"/>
-    <animation file="biped/new/javelin_shield_jog_relax.dae" name="Walk" id="walk3" speed="17"/>
-    <animation file="biped/new/javelin_shield_run_relax.dae" name="Run" id="run1" speed="10"/>
-    <animation file="biped/new/javelin_shield_run_relax.dae" name="Run" id="run2" speed="11"/>
-    <animation file="biped/new/javelin_shield_run_relax.dae" name="Run" id="run3" speed="12"/>
-    <animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Idle" id="idle1" speed="70"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Idle" id="idle2" speed="65"/>
+    <animation file="biped/infantry/javelinist/idle_ready.dae" name="Idle" id="idle3" speed="60"/>
+    <animation file="biped/infantry/javelinist/jog_relax_shield.dae" name="Walk" id="walk1" speed="15"/>
+    <animation file="biped/infantry/javelinist/jog_relax_shield.dae" name="Walk" id="walk2" speed="16"/>
+    <animation file="biped/infantry/javelinist/jog_relax_shield.dae" name="Walk" id="walk3" speed="17"/>
+    <animation file="biped/infantry/javelinist/run_relax_shield.dae" name="Run" id="run1" speed="10"/>
+    <animation file="biped/infantry/javelinist/run_relax_shield.dae" name="Run" id="run2" speed="11"/>
+    <animation file="biped/infantry/javelinist/run_relax_shield.dae" name="Run" id="run3" speed="12"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_skirmisher_shieldarm.xml b/binaries/data/mods/public/art/variants/biped/base_skirmisher_shieldarm.xml
new file mode 100644
index 0000000000..56ef0d74ab
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_skirmisher_shieldarm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base" frequency="1">
+  <animations>
+    <animation file="biped/infantry/javelinist/idle_ready_shieldarm.dae" name="Idle" id="idle1" speed="70"/>
+    <animation file="biped/infantry/javelinist/idle_ready_shieldarm.dae" name="Idle" id="idle2" speed="65"/>
+    <animation file="biped/infantry/javelinist/idle_ready_shieldarm.dae" name="Idle" id="idle3" speed="60"/>
+    <animation file="biped/infantry/javelinist/run_relax_shieldarm.dae" name="Walk" id="walk1" speed="07"/>
+    <animation file="biped/infantry/javelinist/run_relax_shieldarm.dae" name="Walk" id="walk2" speed="08"/>
+    <animation file="biped/infantry/javelinist/run_relax_shieldarm.dae" name="Walk" id="walk3" speed="09"/>
+    <animation file="biped/infantry/javelinist/run_ready_shieldarm.dae" name="Run" id="run1" speed="10"/>
+    <animation file="biped/infantry/javelinist/run_ready_shieldarm.dae" name="Run" id="run2" speed="11"/>
+    <animation file="biped/infantry/javelinist/run_ready_shieldarm.dae" name="Run" id="run3" speed="12"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_slave_male.xml b/binaries/data/mods/public/art/variants/biped/base_slave_male.xml
index 59cf735145..ed4bdfcd80 100644
--- a/binaries/data/mods/public/art/variants/biped/base_slave_male.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_slave_male.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/idle_relax_generic.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/idle_relax_generic.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/idle_relax_generic.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/walk_relax_generic.dae" name="Walk" id="walk1" speed="20"/>
-    <animation file="biped/new/walk_relax_generic.dae" name="Walk" id="walk2" speed="18"/>
-    <animation file="biped/new/run_generic.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/run_generic.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/run_generic.dae" name="Run" id="run3" speed="6"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/citizen/idle_relax_m.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/citizen/idle_relax_m.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/citizen/idle_relax_m.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/citizen/walk_relax_m.dae" name="Walk" id="walk1" speed="20"/>
+    <animation file="biped/citizen/walk_relax_m.dae" name="Walk" id="walk2" speed="18"/>
+    <animation file="biped/citizen/run.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/citizen/run.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/citizen/run.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_slinger_ready.xml b/binaries/data/mods/public/art/variants/biped/base_slinger_ready.xml
index cbe7d89d8a..35b2e364da 100644
--- a/binaries/data/mods/public/art/variants/biped/base_slinger_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_slinger_ready.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/slinger_idle_relax.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/slinger_idle_relax.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/slinger_idle_relax.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/slinger_walk_ready.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/slinger_walk_ready.dae" name="Walk" id="walk2" speed="32"/>
-    <animation file="biped/new/slinger_jog_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/slinger_jog_ready.dae" name="Run" id="run2" speed="4"/>
-    <animation file="biped/new/slinger_jog_ready.dae" name="Run" id="run3" speed="4"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/slinger/idle_relax.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/slinger/idle_relax.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/slinger/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/slinger/walk_ready.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/slinger/walk_ready.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/infantry/slinger/jog_ready.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/slinger/jog_ready.dae" name="Run" id="run2" speed="4"/>
+    <animation file="biped/infantry/slinger/jog_ready.dae" name="Run" id="run3" speed="4"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
index 1b21229692..439a08fc95 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/spear_idle_ready.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/spear_idle_ready.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/spear_idle_ready.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/spear_walk_ready.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/spear_walk_ready.dae" name="Walk" id="walk2" speed="32"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run3" speed="6"/>
-	<animation event="0.5" file="biped/new/spear_attack_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="Attack_melee" id="attack2" speed="100"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_ready.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/spearman/idle_ready.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/spearman/idle_ready.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/spearman/walk_ready.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_ready.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
index ae110dd8ce..c3a6c0dee6 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/spear_shieldsmall_idle_ready.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/spear_shieldsmall_idle_ready.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/spear_shieldsmall_idle_ready.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" id="walk1" speed="12"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" id="walk2" speed="13"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run3" speed="6"/>
-	<animation event="0.5" file="biped/new/spear_shieldsmall_attack_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="Attack_melee" id="attack2" speed="100"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" id="walk1" speed="12"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" id="walk2" speed="13"/>
+    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
index 5615fb7958..f23d2f419f 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/spear_shieldsmall_idle_ready.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/spear_shieldsmall_idle_ready.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/spear_shieldsmall_idle_ready.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/spear_shieldsmall_walk_ready.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/spear_shieldsmall_walk_ready.dae" name="Walk" id="walk2" speed="28"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/new/spear_run_ready.dae" name="Run" id="run3" speed="6"/>
-	<animation event="0.5" file="biped/new/spear_shieldsmall_attack_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="Attack_melee" id="attack2" speed="30"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/spearman/walk_ready_shieldsmall.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_ready_shieldsmall.dae" name="Walk" id="walk2" speed="28"/>
+    <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run2" speed="5"/>
+    <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run3" speed="6"/>
+    <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
index 720c460e6b..19785d976f 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/spear_idle_relax.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/spear_idle_relax.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/spear_idle_relax.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk2" speed="32"/>
-    <animation file="biped/new/spear_run_relax.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/new/spear_run_relax.dae" name="Run" id="run2" speed="4"/>
-    <animation file="biped/new/spear_run_relax.dae" name="Run" id="run3" speed="4"/>
-	<animation event="0.5" file="biped/new/spear_attack_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="Attack_melee" id="attack2" speed="100"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/spearman/idle_relax.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/spearman/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/infantry/spearman/run_relax.dae" name="Run" id="run1" speed="4"/>
+    <animation file="biped/infantry/spearman/run_relax.dae" name="Run" id="run2" speed="4"/>
+    <animation file="biped/infantry/spearman/run_relax.dae" name="Run" id="run3" speed="4"/>
+    <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml
index a2d1278275..882da1c2e0 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml
@@ -1,16 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/2h_idle_ready.dae" name="idle" id="idle1" speed="100"/>
-    <animation file="biped/new/2h_idle_ready.dae" name="idle" id="idle2" speed="90"/>
-    <animation file="biped/new/2h_walk_ready.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/2h_walk_ready.dae" name="Walk" id="walk2" speed="30"/>
-    <animation file="biped/new/2h_walk_ready.dae" name="Walk" id="walk3" speed="30"/>
-    <animation file="biped/new/2h_run_ready.dae" name="Run" id="run1" speed="8"/>
-    <animation file="biped/new/2h_run_ready.dae" name="Run" id="run2" speed="9"/>
-    <animation file="biped/new/2h_run_ready.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/new/2h_attack_a.dae" name="attack_melee" id="attack1" speed="100"/>
-    <animation event="0.5" file="biped/new/2h_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/2h_attack_c.dae" name="attack_melee" id="attack3" speed="100"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_2h.dae" name="idle" id="idle1" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_ready_2h.dae" name="idle" id="idle2" speed="90"/>
+    <animation file="biped/infantry/swordsman/walk_ready_2h.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/swordsman/walk_ready_2h.dae" name="Walk" id="walk2" speed="30"/>
+    <animation file="biped/infantry/swordsman/walk_ready_2h.dae" name="Walk" id="walk3" speed="30"/>
+    <animation file="biped/infantry/swordsman/run_ready_2h.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_2h.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_2h.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_a.dae" name="attack_melee" id="attack1" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_c.dae" name="attack_melee" id="attack3" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml
index 18982c0043..cc2d05559d 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml
@@ -1,16 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/2h_idle_relax.dae" name="idle" id="idle1" speed="100"/>
-    <animation file="biped/new/2h_idle_relax.dae" name="idle" id="idle2" speed="90"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk2" speed="29"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk3" speed="28"/>
-    <animation file="biped/new/2h_run_relax.dae" name="Run" id="run1" speed="8"/>
-    <animation file="biped/new/2h_run_relax.dae" name="Run" id="run2" speed="9"/>
-    <animation file="biped/new/2h_run_relax.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/new/2h_attack_a.dae" name="attack_melee" id="attack1" speed="100"/>
-    <animation event="0.5" file="biped/new/2h_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/2h_attack_c.dae" name="attack_melee" id="attack3" speed="100"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="idle" id="idle1" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_relax_2h.dae" name="idle" id="idle2" speed="90"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk2" speed="29"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk3" speed="28"/>
+    <animation file="biped/infantry/swordsman/run_relax_2h.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_relax_2h.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_relax_2h.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_a.dae" name="attack_melee" id="attack1" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_c.dae" name="attack_melee" id="attack3" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
index 38bb466ea6..f23d1d2131 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shield_idle_ready.dae" name="idle" speed="100"/>
-    <animation file="biped/new/sword_shield_idle_ready.dae" name="idle" speed="90"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" speed="12"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" speed="8"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" speed="90"/>
+    <animation file="biped/infantry/swordsman/jog_ready_shield.dae" name="Walk" speed="12"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" speed="8"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
index c2a9918fbb..6daf2226c3 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
@@ -1,14 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shield_idle_relax.dae" name="idle" speed="100"/>
-    <animation file="biped/new/sword_shield_idle_relax.dae" name="idle" speed="90"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" speed="18"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/run_generic.dae" name="Run" speed="8"/>
-    <animation file="biped/new/run_generic.dae" name="Run" speed="9"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="90"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="18"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="20"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" speed="9"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
index c1cbdc1908..c5c428583e 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shield_idle_ready.dae" name="idle" id="idle1" speed="100"/>
-    <animation file="biped/new/sword_shield_idle_ready.dae" name="idle" id="idle2" speed="90"/>
-    <animation file="biped/new/sword_shield_walk_ready.dae" name="Walk" speed="30"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" speed="8"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" id="idle1" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" id="idle2" speed="90"/>
+    <animation file="biped/infantry/swordsman/walk_ready_shield.dae" name="Walk" speed="30"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" speed="8"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
index 81ff7e1b7d..9ded392197 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shield_idle_relax.dae" name="idle" speed="100"/>
-    <animation file="biped/new/sword_shield_idle_relax.dae" name="idle" speed="90"/>
-    <animation file="biped/new/sword_shield_walk_relax.dae" name="Walk" speed="30"/>
-    <animation file="biped/new/sword_shield_run_relax.dae" name="Run" speed="8"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shield_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="90"/>
+    <animation file="biped/infantry/swordsman/walk_relax_shield.dae" name="Walk" speed="30"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" speed="8"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
index 857484bc1a..d6efc1d0cc 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shieldarm_idle_ready.dae" name="idle" speed="100"/>
-    <animation file="biped/new/sword_shieldarm_idle_ready.dae" name="idle" speed="90"/>
-    <animation file="biped/new/sword_shieldarm_walk_ready.dae" name="Walk" speed="30"/>
-    <animation file="biped/new/sword_shieldarm_run_ready.dae" name="Run" speed="8"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="90"/>
+    <animation file="biped/infantry/swordsman/walk_ready_shieldarm.dae" name="Walk" speed="30"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" speed="8"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
index c4105861eb..a3fc0722c9 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shieldarm_idle_ready.dae" name="idle" speed="100"/>
-    <animation file="biped/new/sword_shieldarm_idle_ready.dae" name="idle" speed="90"/>
-    <animation file="biped/new/sword_shieldarm_jog_relax.dae" name="Walk" speed="12"/>
-    <animation file="biped/new/sword_shieldarm_run_ready.dae" name="Run" speed="8"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shieldarm_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="90"/>
+    <animation file="biped/infantry/swordsman/jog_ready_shieldarm.dae" name="Walk" speed="12"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" speed="8"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
index 0f2061f2ce..0edcce14e8 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/sword_shieldsmall_idle_ready.dae" name="idle" id="idle1" speed="100"/>
-    <animation file="biped/new/sword_shieldsmall_idle_ready.dae" name="idle" id="idle2" speed="90"/>
-    <animation file="biped/new/sword_shield_jog_relax.dae" name="Walk" speed="12"/>
-    <animation file="biped/new/sword_shield_run_ready.dae" name="Run" speed="8"/>
-    <animation event="0.5" file="biped/new/sword_shieldsmall_attack_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/new/sword_shieldsmall_attack_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/new/sword_shieldsmall_attack_c.dae" name="attack_melee" id="attack3" speed="80"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shieldsmall.dae" name="idle" id="idle1" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shieldsmall.dae" name="idle" id="idle2" speed="90"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="12"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" speed="8"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_trader.xml b/binaries/data/mods/public/art/variants/biped/base_trader.xml
index f08c90dbec..7795dd7f85 100644
--- a/binaries/data/mods/public/art/variants/biped/base_trader.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_trader.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/healer_idle_relax_female.dae" name="Idle" id="idle1" speed="30"/>
-    <animation file="biped/new/healer_idle_relax_female.dae" name="Idle" id="idle2" speed="31"/>
-    <animation file="biped/new/healer_idle_relax_female.dae" name="Idle" id="idle3" speed="32"/>
-    <animation file="biped/new/trader_walk_relax.dae" name="Walk" id="walk1" speed="25"/>
-    <animation file="biped/new/trader_walk_relax.dae" name="Walk" id="walk2" speed="23"/>
-    <animation file="biped/new/trader_jog_relax.dae" name="Run" id="run1" speed="10"/>
-    <animation file="biped/new/trader_jog_relax.dae" name="Run" id="run2" speed="11"/>
-    <animation file="biped/new/trader_jog_relax.dae" name="Run" id="run3" speed="12"/>
+    <animation file="biped/citizen/idle_relax_h_f.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/citizen/idle_relax_h_f.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/citizen/idle_relax_h_f.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/citizen/walk_relax_t.dae" name="Walk" id="walk1" speed="25"/>
+    <animation file="biped/citizen/walk_relax_t.dae" name="Walk" id="walk2" speed="23"/>
+    <animation file="biped/citizen/jog_t.dae" name="Run" id="run1" speed="10"/>
+    <animation file="biped/citizen/jog_t.dae" name="Run" id="run2" speed="11"/>
+    <animation file="biped/citizen/jog_t.dae" name="Run" id="run3" speed="12"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/build.xml b/binaries/data/mods/public/art/variants/biped/build.xml
index acdfed4d2a..c4c1c0dab2 100644
--- a/binaries/data/mods/public/art/variants/biped/build.xml
+++ b/binaries/data/mods/public/art/variants/biped/build.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Build">
   <animations>
-	<animation event="0.5" file="biped/new/build.dae" name="Build" speed="100"/>
+    <animation event="0.5" file="biped/citizen/build.dae" name="Build" speed="100"/>
   </animations>
   <props>
-	<prop attachpoint="shield"/>
-	<prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
     <prop attachpoint="weapon_L"/>
-	<prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/build_farm.xml b/binaries/data/mods/public/art/variants/biped/build_farm.xml
index 7a00f7ab76..45e1ecde56 100644
--- a/binaries/data/mods/public/art/variants/biped/build_farm.xml
+++ b/binaries/data/mods/public/art/variants/biped/build_farm.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Build_farm">
   <animations>
-	<animation event="0.5" file="biped/new/build.dae" name="Build_farm" speed="100"/>
+    <animation event="0.5" file="biped/citizen/build.dae" name="Build_farm" speed="100"/>
   </animations>
   <props>
-	<prop attachpoint="shield"/>
-	<prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
     <prop attachpoint="weapon_L"/>
-	<prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_food.xml b/binaries/data/mods/public/art/variants/biped/carry_food.xml
index c2c9b16bb2..cf101c6220 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_food.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_food.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_food">
   <animations>
-    <animation file="biped/new/male_carry_grain.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/male_carry_grain_idle.dae" name="Idle" speed="20"/>
-    <animation file="biped/new/male_carry_grain.dae" name="Run" speed="20"/>
+    <animation file="biped/gatherer/idle_carry_grain_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_grain_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_grain_m.dae" name="Run" speed="20"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_meat.xml b/binaries/data/mods/public/art/variants/biped/carry_meat.xml
index 0590cd6545..d82816e339 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_meat.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_meat">
   <animations>
-    <animation file="biped/new/male_carry_meat.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/male_carry_meat_idle.dae" name="Idle" speed="20"/>
-    <animation file="biped/new/male_carry_meat.dae" name="Run" speed="20"/>
+    <animation file="biped/gatherer/idle_carry_meat_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_meat_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_meat_m.dae" name="Run" speed="20"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_metal.xml b/binaries/data/mods/public/art/variants/biped/carry_metal.xml
index aa957fee8c..4a7dded296 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_metal.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_metal.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_metal">
   <animations>
-    <animation file="biped/new/male_carry_ore.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/male_carry_ore_idle.dae" name="Idle" speed="20"/>
-    <animation file="biped/new/male_carry_ore.dae" name="Run" speed="20"/>
+    <animation file="biped/gatherer/idle_carry_ore_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Run" speed="20"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_metal.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_stone.xml b/binaries/data/mods/public/art/variants/biped/carry_stone.xml
index 5528742cba..13f08278b3 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_stone.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_stone.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_stone">
   <animations>
-    <animation file="biped/new/male_carry_ore.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/male_carry_ore_idle.dae" name="Idle" speed="20"/>
-    <animation file="biped/new/male_carry_ore.dae" name="Run" speed="20"/>
+    <animation file="biped/gatherer/idle_carry_ore_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Run" speed="20"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_stone.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_wood.xml b/binaries/data/mods/public/art/variants/biped/carry_wood.xml
index a454b02e7e..7289ac7765 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_wood.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_wood.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_wood">
   <animations>
-    <animation file="biped/new/male_carry_wood.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/male_carry_wood_idle.dae" name="Idle" speed="20"/>
-    <animation file="biped/new/male_carry_wood.dae" name="Run" speed="20"/>
+    <animation file="biped/gatherer/idle_carry_wood_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_wood_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_wood_m.dae" name="Run" speed="20"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_wood.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/death_infantry.xml b/binaries/data/mods/public/art/variants/biped/death_infantry.xml
index b853df342f..f6d67234f4 100644
--- a/binaries/data/mods/public/art/variants/biped/death_infantry.xml
+++ b/binaries/data/mods/public/art/variants/biped/death_infantry.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Death">
   <animations>
-    <animation file="biped/new/death_a.dae" name="Death" id="death1" speed="60"/>
-    <animation file="biped/new/death_b.dae" name="Death" id="death2" speed="60"/>
+    <animation file="biped/infantry/death_a.dae" name="Death" id="death1" speed="60"/>
+    <animation file="biped/infantry/death_b.dae" name="Death" id="death2" speed="60"/>
   </animations>
   <props>
     <prop actor="props/units/blood_01.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_base_walk.xml b/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
index e4a44557da..080db28c59 100644
--- a/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant frequency="1" name="Base">
   <animations>
-    <animation file="biped/new/fem_idle_long.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/fem_idle_short.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/fem_idle_relax.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/fem_idle_relax_b.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/fem_idle_relax_long.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/fem_walk_relax.dae" name="Walk" speed="20"/>
-    <animation file="biped/new/fem_walk_relax.dae" name="Run" speed="15"/>
+    <animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f_short.dae" name="Idle" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f.dae" name="Idle" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f.dae" name="Idle" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" speed="100"/>
+    <animation file="biped/citizen/walk_relax_f.dae" name="Walk" speed="20"/>
+    <animation file="biped/citizen/walk_relax_f.dae" name="Run" speed="15"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_build.xml b/binaries/data/mods/public/art/variants/biped/female_build.xml
index 3687f4b4b3..451108fbaf 100644
--- a/binaries/data/mods/public/art/variants/biped/female_build.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_build.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Build">
   <animations>
-    <animation event="0.75" file="biped/new/build.dae" name="Build" speed="70"/>
+    <animation event="0.75" file="biped/citizen/build.dae" name="Build" speed="70"/>
   </animations>
   <props>
     <prop attachpoint="weapon_L"/>
-	<prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_build_farm.xml b/binaries/data/mods/public/art/variants/biped/female_build_farm.xml
index 708a67e0b3..14162d8878 100644
--- a/binaries/data/mods/public/art/variants/biped/female_build_farm.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_build_farm.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Build_farm">
   <animations>
-    <animation event="0.75" file="biped/new/build.dae" name="Build_farm" speed="70"/>
+    <animation event="0.75" file="biped/citizen/build.dae" name="Build_farm" speed="70"/>
   </animations>
   <props>
     <prop attachpoint="weapon_L"/>
-	<prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_food.xml b/binaries/data/mods/public/art/variants/biped/female_carry_food.xml
index 585044ddf7..8be4a1312e 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_food.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_food.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_food">
   <animations>
-    <animation file="biped/new/fem_carry_grain_idle.dae" name="Idle" speed="25"/>
-    <animation file="biped/new/fem_carry_grain.dae" name="Walk" speed="25"/>
-    <animation file="biped/new/fem_carry_grain.dae" name="Run" speed="25"/>
+    <animation file="biped/gatherer/idle_carry_grain_f.dae" name="Idle" speed="25"/>
+    <animation file="biped/gatherer/carry_grain_f.dae" name="Walk" speed="25"/>
+    <animation file="biped/gatherer/carry_grain_f.dae" name="Run" speed="25"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml b/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml
index 0f13825378..9c265c5f28 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_meat">
   <animations>
-    <animation file="biped/new/fem_carry_meat_idle.dae" name="Idle" speed="25"/>
-    <animation file="biped/new/fem_carry_meat.dae" name="Walk" speed="25"/>
-    <animation file="biped/new/fem_carry_meat.dae" name="Run" speed="25"/>
+    <animation file="biped/gatherer/idle_carry_meat_f.dae" name="Idle" speed="25"/>
+    <animation file="biped/gatherer/carry_meat_f.dae" name="Walk" speed="25"/>
+    <animation file="biped/gatherer/carry_meat_f.dae" name="Run" speed="25"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_meat_female.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml b/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml
index baa5feb74f..3cd110bd48 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_metal">
   <animations>
-    <animation file="biped/new/fem_carry_ore_idle.dae" name="Idle" speed="25"/>
-    <animation file="biped/new/fem_carry_ore.dae" name="Walk" speed="25"/>
-    <animation file="biped/new/fem_carry_ore.dae" name="Run" speed="25"/>
+    <animation file="biped/gatherer/idle_carry_ore_f.dae" name="Idle" speed="25"/>
+    <animation file="biped/gatherer/carry_ore_f.dae" name="Walk" speed="25"/>
+    <animation file="biped/gatherer/carry_ore_f.dae" name="Run" speed="25"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_metal.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml b/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml
index f753d64e21..e5d6d1df39 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_stone">
   <animations>
-    <animation file="biped/new/fem_carry_ore_idle.dae" name="Idle" speed="25"/>
-    <animation file="biped/new/fem_carry_ore.dae" name="Walk" speed="25"/>
-    <animation file="biped/new/fem_carry_ore.dae" name="Run" speed="25"/>
+    <animation file="biped/gatherer/idle_carry_ore_f.dae" name="Idle" speed="25"/>
+    <animation file="biped/gatherer/carry_ore_f.dae" name="Walk" speed="25"/>
+    <animation file="biped/gatherer/carry_ore_f.dae" name="Run" speed="25"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_stone.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml b/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml
index 3c58d09e81..5a5e06764e 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_wood">
   <animations>
-    <animation file="biped/new/fem_carry_wood_idle.dae" name="Idle" speed="25"/>
-    <animation file="biped/new/fem_carry_wood.dae" name="Walk" speed="25"/>
-    <animation file="biped/new/fem_carry_wood.dae" name="Run" speed="25"/>
+    <animation file="biped/gatherer/idle_carry_wood_f.dae" name="Idle" speed="25"/>
+    <animation file="biped/gatherer/carry_wood_f.dae" name="Walk" speed="25"/>
+    <animation file="biped/gatherer/carry_wood_f.dae" name="Run" speed="25"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_wood.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml
index d552603112..3c27cccdf1 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_fruit">
   <animations>
-    <animation file="biped/new/fem_gather_fruit.dae" name="gather_fruit" speed="100"/>
+    <animation file="biped/gatherer/gather_fruit_f.dae" name="gather_fruit" speed="100"/>
   </animations>
   <props>
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml b/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml
index 5407083a48..8dc9897c67 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_grain">
   <animations>
-    <animation file="biped/new/farming.dae" name="gather_grain" speed="100"/>
+    <animation file="biped/gatherer/farming.dae" name="gather_grain" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_L"/>
-	<prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml b/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml
index ae8f795782..c330035c48 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_meat">
   <animations>
-    <animation file="biped/new/gather_meat.dae" name="gather_meat" speed="100"/>
+    <animation file="biped/gatherer/gather_meat.dae" name="gather_meat" speed="100"/>
   </animations>
   <props>
     <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml b/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml
index be6618c870..089f98e76b 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_ore">
   <animations>
-    <animation event="0.4" file="biped/new/gather_mine.dae" name="gather_ore" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ore" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
-	<prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml b/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml
index 01e05ea06f..c201e63bff 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_rock">
   <animations>
-    <animation event="0.4" file="biped/new/gather_mine.dae" name="gather_rock" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_rock" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
-	<prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml b/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml
index 8f0228a3af..ee8a3f8d75 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_ruins">
   <animations>
-    <animation event="0.4" file="biped/new/gather_mine.dae" name="gather_ruins" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ruins" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
-	<prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml b/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml
index 5aa1d771db..8372ff4771 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_tree">
   <animations>
-    <animation event="0.75" file="biped/new/gather_wood.dae" name="gather_tree" speed="100"/>
+    <animation event="0.75" file="biped/gatherer/gather_wood.dae" name="gather_tree" speed="100"/>
   </animations>
   <props>
     <prop attachpoint="weapon_L"/>
-	<prop actor="props/units/tools/axe.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/axe.xml" attachpoint="weapon_R"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml b/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml
index b19f4184b2..e65e3a9521 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="anti_cavalry_back" frequency="0">
   <animations>
-    <animation file="biped/new/anti_cavalry_back_attack.dae" name="Attack" speed="30"/>
-    <animation file="biped/new/anti_cavalry_back_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/formations/anti_cavalry/back_attack.dae" name="Attack" speed="30"/>
+    <animation file="biped/formations/anti_cavalry/back_idle.dae" name="Idle" speed="50"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk2" speed="32"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml b/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml
index 3ed920fa1f..7073c05d70 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="anti_cavalry_front" frequency="0">
   <animations>
-    <animation file="biped/new/anti_cavalry_front_attack.dae" name="Attack" speed="30"/>
-    <animation file="biped/new/anti_cavalry_front_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk1" speed="30"/>
-    <animation file="biped/new/spear_walk_relax.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/formations/anti_cavalry/front_attack.dae" name="Attack" speed="30"/>
+    <animation file="biped/formations/anti_cavalry/front_idle.dae" name="Idle" speed="50"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk2" speed="32"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/phalanx_back.xml b/binaries/data/mods/public/art/variants/biped/formations/phalanx_back.xml
new file mode 100644
index 0000000000..f393b52e72
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/phalanx_back.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="phalanx_back" frequency="0">
+  <animations>
+    <animation file="biped/infantry/hoplite/idle_ready_back.dae" name="Idle" id="phalanxbacktidle" speed="30"/>
+    <animation file="biped/infantry/hoplite/walk_ready.dae" name="Walk" id="phalanxbackwalk" speed="30"/>
+    <animation file="biped/infantry/hoplite/jog_ready.dae" name="Run" id="phalanxbackrun" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/phalanx_front.xml b/binaries/data/mods/public/art/variants/biped/formations/phalanx_front.xml
new file mode 100644
index 0000000000..20d6a12b54
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/phalanx_front.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="phalanx_front" frequency="0">
+  <animations>
+    <animation file="biped/infantry/hoplite/idle_ready_front.dae" name="Idle" id="phalanxfrontidle" speed="30"/>
+    <animation file="biped/infantry/hoplite/walk_ready_front.dae" name="Walk" id="phalanxfrontwalk" speed="30"/>
+    <animation file="biped/infantry/hoplite/run_ready.dae" name="Run" id="phalanxfrontrun" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/phalanx_mid.xml b/binaries/data/mods/public/art/variants/biped/formations/phalanx_mid.xml
new file mode 100644
index 0000000000..bc05878264
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/phalanx_mid.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="phalanx_mid" frequency="0">
+  <animations>
+    <animation file="biped/infantry/hoplite/idle_ready.dae" name="Idle" id="phalanxmididle" speed="30"/>
+    <animation file="biped/infantry/hoplite/walk_ready.dae" name="Walk" id="phalanxmidwalk" speed="30"/>
+    <animation file="biped/infantry/hoplite/run_ready.dae" name="Run" id="phalanxmidrun" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/syntagma_01.xml b/binaries/data/mods/public/art/variants/biped/formations/syntagma_01.xml
new file mode 100644
index 0000000000..a6b1c55fd6
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/syntagma_01.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="syntagma_01" frequency="0">
+  <animations>
+    <animation file="biped/formations/syntagma/idle_ready_01.dae" name="Idle" speed="30"/>
+    <animation file="biped/formations/syntagma/walk_ready_01.dae" name="Walk" id="syntagwalk1" speed="30"/>
+    <animation file="biped/infantry/pikeman/run_ready.dae" name="Run" id="syntagmarun1" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/syntagma_02.xml b/binaries/data/mods/public/art/variants/biped/formations/syntagma_02.xml
new file mode 100644
index 0000000000..43149ba718
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/syntagma_02.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="syntagma_02" frequency="0">
+  <animations>
+    <animation file="biped/formations/syntagma/idle_ready_02.dae" name="Idle" speed="30"/>
+    <animation file="biped/formations/syntagma/walk_ready_02.dae" name="Walk" id="syntagwalk1" speed="30"/>
+    <animation file="biped/infantry/pikeman/run_ready.dae" name="Run" id="syntagmarun1" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/syntagma_03.xml b/binaries/data/mods/public/art/variants/biped/formations/syntagma_03.xml
new file mode 100644
index 0000000000..6fe9c9f7b3
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/syntagma_03.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="syntagma_03" frequency="0">
+  <animations>
+    <animation file="biped/formations/syntagma/idle_ready_03.dae" name="Idle" speed="30"/>
+    <animation file="biped/formations/syntagma/walk_ready_03.dae" name="Walk" id="syntagwalk1" speed="30"/>
+    <animation file="biped/infantry/pikeman/run_ready.dae" name="Run" id="syntagmarun1" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/syntagma_04.xml b/binaries/data/mods/public/art/variants/biped/formations/syntagma_04.xml
new file mode 100644
index 0000000000..2e6fccf6b4
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/syntagma_04.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="syntagma_04" frequency="0">
+  <animations>
+    <animation file="biped/formations/syntagma/idle_ready_04.dae" name="Idle" speed="30"/>
+    <animation file="biped/formations/syntagma/walk_ready_04.dae" name="Walk" id="syntagwalk1" speed="30"/>
+    <animation file="biped/infantry/pikeman/run_ready.dae" name="Run" id="syntagmarun1" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/syntagma_back.xml b/binaries/data/mods/public/art/variants/biped/formations/syntagma_back.xml
new file mode 100644
index 0000000000..1c4b7dabb6
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/syntagma_back.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="syntagma_back" frequency="0">
+  <animations>
+    <animation file="biped/infantry/pikeman/idle_ready.dae" name="idle" id="syntagmaidle" speed="30"/>
+    <animation file="biped/formations/syntagma/walk_relax_back.dae" name="walk" id="syntagmawalk" speed="30"/>
+    <animation file="biped/infantry/pikeman/jog_ready.dae" name="run" id="syntagmarun" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/syntagma_front.xml b/binaries/data/mods/public/art/variants/biped/formations/syntagma_front.xml
new file mode 100644
index 0000000000..fa58cd03c7
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/formations/syntagma_front.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="syntagma_front" frequency="0">
+  <animations>
+    <animation file="biped/formations/syntagma/idle_ready_front.dae" name="Idle" speed="30"/>
+    <animation file="biped/infantry/pikeman/walk_ready.dae" name="Walk" id="syntagwalk1" speed="30"/>
+    <animation file="biped/infantry/pikeman/run_ready.dae" name="Run" id="syntagmarun1" speed="10"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml b/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml
index ec2817fe67..8460c6aa6e 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="testudo_front" frequency="0">
   <animations>
-    <animation file="biped/new/testudo_front_shield_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/testudo_front_shield_walk.dae" name="Walk" id="testwalk1" speed="15"/>
-    <animation file="biped/new/testudo_front_shield_walk.dae" name="Walk" id="testwalk2" speed="16"/>
-    <animation file="biped/new/testudo_front_shield_walk.dae" name="Walk" id="testwalk3" speed="17"/>
+    <animation file="biped/formations/testudo/front_idle.dae" name="Idle" speed="100"/>
+    <animation file="biped/formations/testudo/front_walk.dae" name="Walk" id="testwalk1" speed="15"/>
+    <animation file="biped/formations/testudo/front_walk.dae" name="Walk" id="testwalk2" speed="16"/>
+    <animation file="biped/formations/testudo/front_walk.dae" name="Walk" id="testwalk3" speed="17"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml b/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml
index c7967b623a..e4adb62211 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="testudo_front_left" frequency="0">
   <animations>
-    <animation file="biped/new/testudo_front_left_shield_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/testudo_front_left_shield_walk.dae" name="Walk" id="testwalk1" speed="15"/>
-    <animation file="biped/new/testudo_front_left_shield_walk.dae" name="Walk" id="testwalk2" speed="16"/>
-    <animation file="biped/new/testudo_front_left_shield_walk.dae" name="Walk" id="testwalk3" speed="17"/>
+    <animation file="biped/formations/testudo/front_left_idle.dae" name="Idle" speed="100"/>
+    <animation file="biped/formations/testudo/front_left_walk.dae" name="Walk" id="testwalk1" speed="15"/>
+    <animation file="biped/formations/testudo/front_left_walk.dae" name="Walk" id="testwalk2" speed="16"/>
+    <animation file="biped/formations/testudo/front_left_walk.dae" name="Walk" id="testwalk3" speed="17"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml b/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml
index 973e3d6dda..064c21667a 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="testudo_front_right" frequency="0">
   <animations>
-    <animation file="biped/new/testudo_front_right_shield_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/testudo_front_right_shield_walk.dae" name="Walk" id="testwalk1" speed="15"/>
-    <animation file="biped/new/testudo_front_right_shield_walk.dae" name="Walk" id="testwalk2" speed="16"/>
-    <animation file="biped/new/testudo_front_right_shield_walk.dae" name="Walk" id="testwalk3" speed="17"/>
+    <animation file="biped/formations/testudo/front_right_idle.dae" name="Idle" speed="100"/>
+    <animation file="biped/formations/testudo/front_right_walk.dae" name="Walk" id="testwalk1" speed="15"/>
+    <animation file="biped/formations/testudo/front_right_walk.dae" name="Walk" id="testwalk2" speed="16"/>
+    <animation file="biped/formations/testudo/front_right_walk.dae" name="Walk" id="testwalk3" speed="17"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml b/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml
index dc701e91e4..6238095fd8 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="testudo_left" frequency="0">
   <animations>
-    <animation file="biped/new/testudo_left_shield_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/testudo_left_shield_walk.dae" name="Walk" id="testwalk1" speed="15"/>
-    <animation file="biped/new/testudo_left_shield_walk.dae" name="Walk" id="testwalk2" speed="16"/>
-    <animation file="biped/new/testudo_left_shield_walk.dae" name="Walk" id="testwalk3" speed="17"/>
+    <animation file="biped/formations/testudo/left_idle.dae" name="Idle" speed="100"/>
+    <animation file="biped/formations/testudo/left_walk.dae" name="Walk" id="testwalk1" speed="15"/>
+    <animation file="biped/formations/testudo/left_walk.dae" name="Walk" id="testwalk2" speed="16"/>
+    <animation file="biped/formations/testudo/left_walk.dae" name="Walk" id="testwalk3" speed="17"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml b/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml
index 75718c8883..7ae99f6bef 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="testudo_right" frequency="0">
   <animations>
-    <animation file="biped/new/testudo_right_shield_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/testudo_right_shield_walk.dae" name="Walk" id="testwalk1" speed="15"/>
-    <animation file="biped/new/testudo_right_shield_walk.dae" name="Walk" id="testwalk2" speed="16"/>
-    <animation file="biped/new/testudo_right_shield_walk.dae" name="Walk" id="testwalk3" speed="17"/>
+    <animation file="biped/formations/testudo/right_idle.dae" name="Idle" speed="100"/>
+    <animation file="biped/formations/testudo/right_walk.dae" name="Walk" id="testwalk1" speed="15"/>
+    <animation file="biped/formations/testudo/right_walk.dae" name="Walk" id="testwalk2" speed="16"/>
+    <animation file="biped/formations/testudo/right_walk.dae" name="Walk" id="testwalk3" speed="17"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml b/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml
index 120c7d6183..d244d1b49e 100644
--- a/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml
+++ b/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="testudo_top" frequency="0">
   <animations>
-    <animation file="biped/new/testudo_top_shield_idle.dae" name="Idle" speed="100"/>
-    <animation file="biped/new/testudo_top_shield_walk.dae" name="Walk" id="testwalk1" speed="15"/>
-    <animation file="biped/new/testudo_top_shield_walk.dae" name="Walk" id="testwalk2" speed="16"/>
-    <animation file="biped/new/testudo_top_shield_walk.dae" name="Walk" id="testwalk3" speed="17"/>
+    <animation file="biped/formations/testudo/top_idle.dae" name="Idle" speed="100"/>
+    <animation file="biped/formations/testudo/top_walk.dae" name="Walk" id="testwalk1" speed="15"/>
+    <animation file="biped/formations/testudo/top_walk.dae" name="Walk" id="testwalk2" speed="16"/>
+    <animation file="biped/formations/testudo/top_walk.dae" name="Walk" id="testwalk3" speed="17"/>
   </animations>
+  <props>
+    <prop actor="" attachpoint="weapon_R"/>
+  </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
index 9fa00725bd..689986da3b 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_fruit">
   <animations>
-    <animation file="biped/new/male_gather_fruit.dae" name="gather_fruit" speed="100"/>
+    <animation file="biped/gatherer/gather_fruit_m.dae" name="gather_fruit" speed="100"/>
   </animations>
   <props>
     <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_grain.xml b/binaries/data/mods/public/art/variants/biped/gather_grain.xml
index 744fe56fbc..66c9c6a29d 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_grain.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_grain.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_grain">
   <animations>
-    <animation file="biped/new/farming.dae" name="gather_grain" speed="100"/>
+    <animation file="biped/gatherer/farming.dae" name="gather_grain" speed="100"/>
   </animations>
   <props>
-	<prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
-	<prop attachpoint="ammo"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_meat.xml b/binaries/data/mods/public/art/variants/biped/gather_meat.xml
index 033d2fe67c..a2becdccd4 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_meat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_meat">
   <animations>
-    <animation file="biped/new/gather_meat.dae" name="gather_meat" speed="100"/>
+    <animation file="biped/gatherer/gather_meat.dae" name="gather_meat" speed="100"/>
   </animations>
   <props>
     <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_ore.xml b/binaries/data/mods/public/art/variants/biped/gather_ore.xml
index 7c8fd74e0b..68343fe82f 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_ore.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_ore">
   <animations>
-    <animation event="0.4" file="biped/new/gather_mine.dae" name="gather_ore" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ore" speed="100"/>
   </animations>
   <props>
-	<prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
-	<prop attachpoint="ammo"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_praise.xml b/binaries/data/mods/public/art/variants/biped/gather_praise.xml
index 7141bdf1a1..2a7505b63d 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_praise.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_praise.xml
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_praise">
   <animations>
-	<animation file="biped/new/pray.dae" name="gather_praise" id="praise1" speed="100"/>
-	<animation file="biped/new/pray.dae" name="gather_praise" id="praise2" speed="200"/>
-	<animation file="biped/new/pray.dae" name="gather_praise" id="praise3" speed="50"/>
+    <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise1" speed="100"/>
+    <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise2" speed="200"/>
+    <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise3" speed="50"/>
   </animations>
   <props>
     <prop actor="" attachpoint="shield"/>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_rock.xml b/binaries/data/mods/public/art/variants/biped/gather_rock.xml
index 05172e0f67..8fcb6042d7 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_rock.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_rock">
   <animations>
-    <animation event="0.4" file="biped/new/gather_mine.dae" name="gather_rock" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_rock" speed="100"/>
   </animations>
   <props>
-	<prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
-	<prop attachpoint="ammo"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_ruins.xml b/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
index 83b9141257..73da8e7a3b 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_ruins">
   <animations>
-    <animation event="0.4" file="biped/new/gather_mine.dae" name="gather_ruins" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ruins" speed="100"/>
   </animations>
   <props>
-	<prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
-	<prop attachpoint="ammo"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_tree.xml b/binaries/data/mods/public/art/variants/biped/gather_tree.xml
index 5f72217ab6..6d0aeb355b 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_tree.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_tree.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_tree">
   <animations>
-    <animation event="0.25" file="biped/new/gather_wood.dae" name="gather_tree" speed="120"/>
+    <animation event="0.25" file="biped/gatherer/gather_wood.dae" name="gather_tree" speed="120"/>
   </animations>
   <props>
-	<prop actor="props/units/tools/axe.xml" attachpoint="weapon_R"/>
-	<prop attachpoint="weapon_L"/>
+    <prop actor="props/units/tools/axe.xml" attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-	<prop attachpoint="helmet"/>
-	<prop attachpoint="ammo"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/pikeman_base.xml b/binaries/data/mods/public/art/variants/biped/pikeman_base.xml
index 32e792d405..38815f419a 100644
--- a/binaries/data/mods/public/art/variants/biped/pikeman_base.xml
+++ b/binaries/data/mods/public/art/variants/biped/pikeman_base.xml
@@ -1,18 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/new/pike_idle_relax.dae" name="Idle" speed="30"/>
-    <animation file="biped/new/pike_walk_relax_b.dae" name="Walk" speed="30"/>
-    <animation file="biped/new/pike_jog_relax.dae" name="run" speed="10"/>
-    <animation file="biped/new/pike_idle_ready.dae" name="syntagma_front_idle" speed="30"/>
-    <animation file="biped/new/pike_walk_ready.dae" name="syntagma_front_walk" speed="30"/>
-    <animation file="biped/new/pike_run_ready.dae" name="syntagma_front_run" speed="10"/>
-    <animation file="biped/new/pike_idle_relax.dae" name="syntagma_med_idle" speed="30"/>
-    <animation file="biped/new/pike_walk_syntagma.dae" name="syntagma_med_walk" speed="30"/>
-    <animation file="biped/new/pike_run_ready.dae" name="syntagma_med_run" speed="10"/> 
-    <animation file="biped/new/pike_idle_relax.dae" name="syntagma_back_idle" speed="30"/>
-    <animation file="biped/new/pike_walk_relax.dae" name="syntagma_back_walk" speed="30"/>
-    <animation file="biped/new/pike_jog_relax.dae" name="syntagma_back_run" speed="10"/>
-	<animation file="biped/new/promotion.dae" name="promotion" speed="80"/>
-    <animation event="0.5" file="biped/new/pike_attack_a.dae" name="attack_melee" id="attack1" speed="10"/>
+    <animation file="biped/infantry/pikeman/idle_relax.dae" name="Idle" speed="30"/>
+    <animation file="biped/infantry/pikeman/walk_relax.dae" name="Walk" speed="30"/>
+    <animation file="biped/infantry/pikeman/jog_relax.dae" name="run" speed="10"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+    <animation event="0.5" file="biped/infantry/pikeman/attack_melee.dae" name="attack_melee" id="attack1" speed="10"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis.xml b/binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis.xml
new file mode 100644
index 0000000000..78d639c5e1
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/rider/cavalry/base_spearman_shield_aspis_normal_attack.xml">
+  <animations>
+    <animation file="biped/rider/cavalry/spearman/idle_shield_aspis_relax_a.dae" name="idle" speed="80"/>
+    <animation file="biped/rider/cavalry/spearman/trot_shield_aspis_a.dae" name="Walk" speed="7"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis_reverse.xml b/binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis_reverse.xml
new file mode 100644
index 0000000000..486c2fe376
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis_reverse.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/rider/cavalry/base_spearman_shield_aspis_reverse_attack.xml">
+  <animations>
+    <animation file="biped/rider/cavalry/spearman/idle_shield_aspis_relax_b.dae" name="idle" speed="80"/>
+    <animation file="biped/rider/cavalry/spearman/trot_shield_aspis_b.dae" name="Walk" speed="7"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_aspis_normal_attack.xml b/binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_aspis_normal_attack.xml
new file mode 100644
index 0000000000..f8f2136728
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_aspis_normal_attack.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/rider/cavalry/base_spearman.xml">
+  <animations>
+    <animation file="biped/rider/cavalry/spearman/gallop_shield_aspis.dae" name="Run" speed="7"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_c.dae" name="attack_melee" event="0.5" id="attack1" speed="60"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_a.dae" event="0.5" name="attack_melee" id="attack2" speed="60"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_a.dae" event="0.5" name="attack_melee" id="attack3" speed="60"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_b.dae" event="0.5" name="attack_melee" id="attack4" speed="60"/>
+    <animation file="biped/rider/cavalry/attack_capture.dae" name="attack_capture" speed="100"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_aspis_reverse_attack.xml b/binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_aspis_reverse_attack.xml
new file mode 100644
index 0000000000..fedfa8b077
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_aspis_reverse_attack.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/rider/cavalry/base_spearman.xml">
+  <animations>
+    <animation file="biped/rider/cavalry/spearman/gallop_shield_aspis.dae" name="Run" speed="7"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_reverse_c.dae" name="attack_melee" event="0.5" id="attack1" speed="60"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_reverse_a.dae" event="0.5" name="attack_melee" id="attack2" speed="60"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_reverse_a.dae" event="0.5" name="attack_melee" id="attack3" speed="60"/>
+    <animation file="biped/rider/cavalry/spearman/attack_shield_aspis_stab_reverse_b.dae" event="0.5" name="attack_melee" id="attack4" speed="60"/>
+    <animation file="biped/rider/cavalry/attack_capture.dae" name="attack_capture" speed="100"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/death_javelin.xml b/binaries/data/mods/public/art/variants/biped/rider/death_javelin.xml
index 34ac9428a8..8c66191fb2 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/death_javelin.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/death_javelin.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <variant name="Death">
   <animations>
-    <animation file="biped/rider/cavalry/javelin/death.dae" name="death" id="death1" speed="120"/>
-    <animation file="biped/rider/cavalry/javelin/death.dae" name="death" id="death2" speed="120"/>
+    <animation file="biped/rider/cavalry/generic/death_shield.dae" name="death" id="death1" speed="120"/>
+    <animation file="biped/rider/cavalry/generic/death_shield.dae" name="death" id="death2" speed="120"/>
   </animations>
 </variant>