diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_01.xml b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_01.xml
new file mode 100644
index 0000000000..b8bfca8e7a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_01.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>props/gaul_barracks_props_01.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="barrel_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="barrel_02" />
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="barrel_03" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/barrel_a_celt_sword_heap.xml" attachpoint="barrel_empty_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/barrel_a_celt_sword_heap.xml" attachpoint="barrel_empty_02"/>
+        <prop actor="props/special/eyecandy/dummy_a.xml" attachpoint="dummy_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/dummy_a.xml" attachpoint="dummy_02" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/britons/workshop_anvil.xml" attachpoint="anvil_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_01.xml" attachpoint="shield_hex_01"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_02.xml" attachpoint="shield_hex_02"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_03.xml" attachpoint="shield_hex_03"/>
+        <prop actor="props/units/shields/gaul_shield_cav_sw_hex_a_01.xml" attachpoint="shield_hex_04"/>
+        <prop actor="props/units/shields/gaul_shield_cav_sw_hex_a_02.xml" attachpoint="shield_hex_05"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_02.xml" attachpoint="shield_hex_07"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_03.xml" attachpoint="shield_hex_06" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/shields/gaul_shield_cav_sw_hex_a_02.xml" attachpoint="shield_hex_08" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_03.xml" attachpoint="shield_hex_09" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/shields/gaul_shield_cav_sw_hex_a_01.xml" attachpoint="shield_hex_10"/>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_02.xml" attachpoint="shield_hex_11"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_01"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_02"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_03"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_04"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_04"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_05"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_06"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_01.xml" attachpoint="shield_oval_small_01"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_01.xml" attachpoint="shield_oval_small_02"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_02.xml" attachpoint="shield_oval_small_03"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_03.xml" attachpoint="shield_oval_small_04"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_02.xml" attachpoint="shield_oval_small_06"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_03.xml" attachpoint="shield_oval_small_07"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_01.xml" attachpoint="shield_oval_small_08"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_02.xml" attachpoint="shield_oval_small_09"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_03.xml" attachpoint="shield_oval_small_10"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_01.xml" attachpoint="shield_oval_small_11"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_01.xml" attachpoint="shield_oval_small_12"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_02.xml" attachpoint="shield_oval_small_13"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_03.xml" attachpoint="shield_oval_small_14"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_03.xml" attachpoint="shield_oval_small_15"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_02.xml" attachpoint="shield_oval_small_16"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_03.xml" attachpoint="shield_oval_small_17"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_01.xml" attachpoint="shield_oval_small_18"/>
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_02.xml" attachpoint="shield_oval_small_19"/>
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_02.xml" attachpoint="shield_square_01"/>
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_01.xml" attachpoint="shield_square_02"/>
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_03.xml" attachpoint="shield_square_03"/>
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_02.xml" attachpoint="shield_square_04"/>
+      </props>
+      <textures>
+        <texture file="props/celt_prop_1.png" name="baseTex"/>
+        <texture file="props/celt_prop_1_norm.png" name="normTex"/>
+        <texture file="props/celt_prop_1_spec.png" name="specTex"/>
+        <texture file="structural/ao/celt_barracks.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_02.xml b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_02.xml
new file mode 100644
index 0000000000..e19fab858f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_02.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>props/gaul_barracks_props_02.dae</mesh>
+      <textures>
+        <texture file="props/celt_props_new.dds" name="baseTex"/>
+        <texture file="props/celt_props_new_norm.png" name="normTex"/>
+        <texture file="props/celt_props_new_spec.png" name="specTex"/>
+        <texture file="structural/ao/celt_barracks.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_03.xml b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_03.xml
new file mode 100644
index 0000000000..0a4c9e3427
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_03.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>props/gaul_barracks_props_03.dae</mesh>
+      <props>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_02" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_03" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_04" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_05" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_06" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_07" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_08" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_09" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_10" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_11" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_12" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/spear_long.xml" attachpoint="spear_13" maxheight="20" minheight="-20"/>
+      </props>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+        <texture file="structural/ao/celt_barracks.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_1.xml b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_1.xml
deleted file mode 100644
index cf016e26e3..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/celt_barracks_props_1.dae</mesh>
-      <textures>
-	    <texture file="props/celt_prop_1.png" name="baseTex"/>
-	    <texture file="props/celt_prop_1_norm.png" name="normTex"/>
-	    <texture file="props/celt_prop_1_spec.png" name="specTex"/>
-		<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
-	  </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_new.xml b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_new.xml
deleted file mode 100644
index 25c47004d8..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_new.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/celt_barracks_props_new.dae</mesh>
-      <textures>
-		<texture file="props/celt_props_new.dds" name="baseTex"/>
-	    <texture file="props/celt_props_new_norm.png" name="normTex"/>
-	    <texture file="props/celt_props_new_spec.png" name="specTex"/>
-		<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
-	  </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_weapons.xml b/binaries/data/mods/public/art/actors/props/structures/celts/barracks_weapons.xml
deleted file mode 100644
index 0d0c5c65e8..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/celts/barracks_weapons.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/celt_barracks_weapons.dae</mesh>
-      <textures>
-		<texture file="props/prop_weap.dds" name="baseTex"/>
-		<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
-	  </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/barracks.xml b/binaries/data/mods/public/art/actors/structures/celts/barracks.xml
index 594e4f0902..b1d26570db 100644
--- a/binaries/data/mods/public/art/actors/structures/celts/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/celts/barracks.xml
@@ -2,20 +2,26 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="Celtic Barracks">
-      <mesh>structural/celt_barracks_struct1.dae</mesh>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
+      </animations>
+      <mesh>structural/gaul_barracks.dae</mesh>
       <props>
-        <prop actor="props/structures/celts/barracks_props_new.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/barracks_props_1.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/barracks_weapons.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/celt_barracks.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props_01.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props_02.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props_03.xml" attachpoint="root"/>
+        <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
       <textures>
-		<texture file="structural/celt_struct_1.dds" name="baseTex"/>
-	    <texture file="structural/celt_struct_1_norm.png" name="normTex"/>
-	    <texture file="structural/celt_struct_1_spec.png" name="specTex"/>
-		<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
-	  </textures>
+        <texture file="structural/celt_struct_1.dds" name="baseTex"/>
+        <texture file="structural/celt_struct_1_norm.png" name="normTex"/>
+        <texture file="structural/celt_struct_1_spec.png" name="specTex"/>
+        <texture file="structural/ao/celt_barracks.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -30,13 +36,13 @@
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
+        <prop actor="props/structures/decals/celt_barracks.xml" attachpoint="root"/>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/barracks_props_new.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/barracks_props_1.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/barracks_weapons.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/celt_barracks.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props_01.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props_02.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props_03.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/meshes/props/celt_barracks_props_1.dae b/binaries/data/mods/public/art/meshes/props/celt_barracks_props_1.dae
deleted file mode 100644
index 46ff27a5e3..0000000000
--- a/binaries/data/mods/public/art/meshes/props/celt_barracks_props_1.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a4a9add4f1b2a29f1027510c9a76874c2d9ebb9ba1eff8b890e61457d76f555
-size 425373
diff --git a/binaries/data/mods/public/art/meshes/props/celt_barracks_props_new.dae b/binaries/data/mods/public/art/meshes/props/celt_barracks_props_new.dae
deleted file mode 100644
index 62f41edbab..0000000000
--- a/binaries/data/mods/public/art/meshes/props/celt_barracks_props_new.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c89da2ace9179abfd735da766ec29b5e4b1592e109fc24e56828a8f9ad2285ee
-size 64306
diff --git a/binaries/data/mods/public/art/meshes/props/celt_barracks_weapons.dae b/binaries/data/mods/public/art/meshes/props/celt_barracks_weapons.dae
deleted file mode 100644
index 05e7a416af..0000000000
--- a/binaries/data/mods/public/art/meshes/props/celt_barracks_weapons.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1ed8a2c2f78be60ee92e8d5d84bf3eaa400ced5face707ab7dee517d4bc45cf
-size 464313
diff --git a/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_01.dae b/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_01.dae
new file mode 100644
index 0000000000..179b299176
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d5ae345aee50c42909245e982812a77c7c99c5b73f148972da78ea535dbd3b8
+size 31502
diff --git a/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_02.dae b/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_02.dae
new file mode 100644
index 0000000000..88f8e1bdb8
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9937e9e1fd2c4d55afbac884144506d74b891c3581441d3aa3f88fb47221b02d
+size 28610
diff --git a/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_03.dae b/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_03.dae
new file mode 100644
index 0000000000..b98bacbf1d
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/gaul_barracks_props_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83d545ce4f24f29687c91580bba92cf1a9d894e8ee53d73aeb885e3259aba9d0
+size 8964
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_barracks_struct1.dae b/binaries/data/mods/public/art/meshes/structural/celt_barracks_struct1.dae
deleted file mode 100644
index 090bc09fe1..0000000000
--- a/binaries/data/mods/public/art/meshes/structural/celt_barracks_struct1.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43e092a6372cd75ddf4828d4e98a77001a34c5c3201cb09546968c4080c76498
-size 573171
diff --git a/binaries/data/mods/public/art/meshes/structural/gaul_barracks.dae b/binaries/data/mods/public/art/meshes/structural/gaul_barracks.dae
new file mode 100644
index 0000000000..9cb8183a42
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/gaul_barracks.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea43b0dbf1c6fba9f07e47178c8377ce2e5d3ed2b8fa7659cb5065c15b529392
+size 555076