diff --git a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
deleted file mode 100644
index bf79bcb957..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Athenians Corral">
-      <mesh>structural/hele_corral.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_water.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
-        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-        <texture file="structural/ao/hele_corral.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_ceiling.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml b/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml
deleted file mode 100644
index 02cc49eacf..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="palisade rocks outpost">
-      <animations>
-        <animation event="0.5" load="0" name="attack_ranged" speed="100"/>
-      </animations>
-      <mesh>props/palisade_rocks_outpost.dae</mesh>
-      <props>
-        <prop actor="props/special/palisade_rocks_outpost_banners.xml" attachpoint="root"/>
-        <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="props/palisade_main.png" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/special/palisade_rocks_outpost_banners.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml b/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
deleted file mode 100644
index 8eb8282224..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="scout tower">
-      <animations>
-        <animation event="0.5" load="0" name="attack_ranged" speed="100"/>
-      </animations>
-      <mesh>structural/hele_scout_tower.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/scout_tower_fancy.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/scout_tower_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_1x1.xml" attachpoint="root"/>
-        <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/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_scout_tower.png" name="aoTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/scout_tower_fancy.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/scout_tower_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_1x1.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml b/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml
deleted file mode 100644
index 171d9742d3..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Hellenes storehouse">
-      <mesh>structural/hele_storehouse.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/storehouse_blocks.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_wood.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/celt_sb1_mud.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
-        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-        <texture file="structural/ao/hele_storehouse.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_blocks.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/storehouse_wood.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/celt_sb1_mud.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml b/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml
deleted file mode 100644
index d040469708..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Epic Greek Temple">
-      <mesh>structural/parth_struct.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/parth_steps.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_walls.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_antefixes.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="structural/hele_struct.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_steps.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_walls.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/parth_antefixes.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall.xml
deleted file mode 100644
index 682e83601a..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Athenian Wall">
-      <mesh>structural/hele_wall_medium.dae</mesh>
-      <textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml
deleted file mode 100644
index 26d581c1a0..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Gate">
-      <animations>
-        <animation file="mechanical/hele_wall_gate_closed.dae" name="gate_closed" speed="65"/>
-        <animation file="mechanical/hele_wall_gate_opening.dae" name="gate_opening" speed="65"/>
-        <animation file="mechanical/hele_wall_gate_open.dae" name="gate_open" speed="65"/>
-        <animation file="mechanical/hele_wall_gate_closing.dae" name="gate_closing" speed="65"/>
-      </animations>
-      <mesh>structural/hele_wall_gate.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/gate_door.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="props/hele_gate.png" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <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/hellenes/gate_door.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml
deleted file mode 100644
index 20b318c09b..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Wall long">
-      <mesh>structural/hele_wall_long.dae</mesh>
-      <textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml
deleted file mode 100644
index 2dd7932638..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Wall Medium">
-      <mesh>structural/hele_wall_medium.dae</mesh>
-      <textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml
deleted file mode 100644
index db09b9b90c..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Wall short">
-      <mesh>structural/hele_wall_short.dae</mesh>
-      <textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml
deleted file mode 100644
index d16297ebe8..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <animations>
-        <animation event="0.5" load="0" name="attack_ranged" speed="100"/>
-      </animations>
-      <mesh>structural/hele_wall_tower.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/wall_turret.xml" attachpoint="root"/>
-        <prop actor="geology/decal_stone_medit_a.xml" attachpoint="root"/>
-        <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/hele_struct_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/wall_turret.xml" attachpoint="root"/>
-        <prop actor="geology/decal_stone_medit_a.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml b/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml
index 4d022debb7..01d7777316 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml
@@ -21,7 +21,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/farmstead.xml b/binaries/data/mods/public/art/actors/structures/hellenes/farmstead.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/structures/athenians/farmstead.xml
rename to binaries/data/mods/public/art/actors/structures/hellenes/farmstead.xml
index 5e068836a9..d3e40610ba 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/farmstead.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/farmstead.xml
@@ -11,11 +11,11 @@
         <prop actor="props/structures/hellenes/farmstead_plants.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
-        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-        <texture file="structural/ao/hele_farmstead.png" name="aoTex"/>
-      </textures>
+<texture file="structural/hele_struct_b.dds" name="baseTex"/>
+<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+<texture file="structural/ao/hele_farmstead.png" name="aoTex"/>
+</textures>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/farmstead_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/farmstead_new.xml
deleted file mode 100644
index ff0d276d2a..0000000000
--- a/binaries/data/mods/public/art/actors/structures/hellenes/farmstead_new.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Hellenes Farmstead">
-      <mesh>structural/hele_farmstead.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/farmstead_hay.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/farmstead_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/farmstead_plants.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_farmstead.png" name="aoTex"/>
-</textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/farmstead_hay.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/farmstead_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/farmstead_plants.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml
index 5335e1254c..0193cccbdd 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml
@@ -21,12 +21,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/gymnasion.xml b/binaries/data/mods/public/art/actors/structures/hellenes/gymnasion.xml
index c876fc3a61..6c6a0bc344 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/gymnasion.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/gymnasion.xml
@@ -15,7 +15,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/house.xml b/binaries/data/mods/public/art/actors/structures/hellenes/house.xml
similarity index 95%
rename from binaries/data/mods/public/art/actors/structures/athenians/house.xml
rename to binaries/data/mods/public/art/actors/structures/hellenes/house.xml
index ee4e18cf2a..0f1576eb44 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/house.xml
@@ -51,7 +51,7 @@
       <textures>
 	    <texture file="structural/ao/hele_house_c.png" name="aoTex"/></textures>
     </variant>
-    <variant frequency="4" name="Hellenes House D">
+    <variant frequency="4" name="Hellenes House d">
       <mesh>structural/hele_house_d.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/house_d_shields.xml" attachpoint="root"/>
@@ -65,7 +65,7 @@
 	    <texture file="structural/ao/hele_house_d.png" name="aoTex"/>
       </textures>
     </variant>
-    <variant frequency="4" name="Hellenes House E">
+    <variant frequency="4" name="Hellenes House 3">
       <mesh>structural/hele_house_e.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/house_e_shields.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/house_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/house_new.xml
deleted file mode 100644
index d5b10a0906..0000000000
--- a/binaries/data/mods/public/art/actors/structures/hellenes/house_new.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="3" name="Hellenes House A">
-      <mesh>structural/hele_house_a.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/house_a_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/house_a_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_a_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_a_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_a_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-	    <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-	    <texture file="structural/ao/hele_house_a.png" name="aoTex"/>
-</textures>
-    </variant>
-    <variant frequency="2" name="Hellenes House B">
-      <mesh>structural/hele_house_b.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/house_b_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/house_b_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_b_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_b_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_b_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-	    <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-	    <texture file="structural/ao/hele_house_b.png" name="aoTex"/></textures>
-    </variant>
-    <variant frequency="2" name="Hellenes House C">
-      <mesh>structural/hele_house_c.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/house_c_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/house_c_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_c_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_c_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_c_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-	    <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-	    <texture file="structural/ao/hele_house_c.png" name="aoTex"/></textures>
-    </variant>
-    <variant frequency="4" name="Hellenes House d">
-      <mesh>structural/hele_house_d.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/house_d_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/house_d_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_d_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_d_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_d_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-	    <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-	    <texture file="structural/ao/hele_house_d.png" name="aoTex"/>
-</textures>
-    </variant>
-    <variant frequency="4" name="Hellenes House 3">
-      <mesh>structural/hele_house_e.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/house_e_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/house_e_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_e_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_e_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-	    <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-	    <texture file="structural/ao/hele_house_e.png" name="aoTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="dust"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="dust"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="dust"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/market.xml b/binaries/data/mods/public/art/actors/structures/hellenes/market.xml
index 6ba01504df..b07f1951f4 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/market.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/market.xml
@@ -8,19 +8,19 @@
         <prop actor="props/structures/hellenes/market_struct_b.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/market_tile_c.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/market_decor.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/market_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/market_props_a.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
       <textures>
-<texture file="structural/hele_struct.dds" name="baseTex"/>
-<texture file="structural/hele_struct_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_market.png" name="aoTex"/>
-</textures>
+        <texture file="structural/hele_struct.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_market.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/merchant_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/merchant.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/structures/athenians/merchant_new.xml
rename to binaries/data/mods/public/art/actors/structures/hellenes/merchant.xml
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/merchant_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/merchant_new.xml
deleted file mode 100644
index 33e3ed472c..0000000000
--- a/binaries/data/mods/public/art/actors/structures/hellenes/merchant_new.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>structural/hele_kyrenia.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/merchantship_sail.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="structural/kyrenia.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="cargo">
-      <props>
-        <prop actor="props/structures/hellenes/merchantship_cargo.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/merchantship_shield.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/merchantship_sail.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml b/binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml
index a293b1750b..02cc49eacf 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml
@@ -16,12 +16,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml b/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml
index 81e32dbd8c..369f609bbf 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml
@@ -18,7 +18,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/prytaneion.xml b/binaries/data/mods/public/art/actors/structures/hellenes/prytaneion.xml
index 4026d032ae..d1b65b1117 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/prytaneion.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/prytaneion.xml
@@ -18,12 +18,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="" attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml b/binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml
index efb4b01b5a..4a497e2cf1 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml
@@ -15,19 +15,23 @@
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
       <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_scout_tower.png" name="aoTex"/></textures>
+        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_scout_tower.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/storehouse.xml b/binaries/data/mods/public/art/actors/structures/hellenes/storehouse.xml
index 51c9a68ebb..171d9742d3 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/storehouse.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/storehouse.xml
@@ -12,15 +12,15 @@
         <prop actor="props/structures/decals/celt_sb1_mud.xml" attachpoint="root"/>
       </props>
       <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_storehouse.png" name="aoTex"/>
-</textures>
+        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_storehouse.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/temple_b.xml b/binaries/data/mods/public/art/actors/structures/hellenes/temple_b.xml
index 8798bc410a..371a9b381f 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/temple_b.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/temple_b.xml
@@ -12,12 +12,15 @@
     </variant>
   </group>
   <group>
-    <variant name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/temple_c.xml b/binaries/data/mods/public/art/actors/structures/hellenes/temple_c.xml
index 987f5cafc8..b6f5c60ab2 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/temple_c.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/temple_c.xml
@@ -12,12 +12,15 @@
     </variant>
   </group>
   <group>
-    <variant name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/temple_epic.xml b/binaries/data/mods/public/art/actors/structures/hellenes/temple_epic.xml
index c15d14dce5..eb7e664709 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/temple_epic.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/temple_epic.xml
@@ -11,21 +11,24 @@
         <prop actor="props/structures/hellenes/parth_walls.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/parth_antefixes.xml" attachpoint="root"/>
       </props>
-<textures>
-<texture file="structural/hele_struct.dds" name="baseTex"/>
-<texture file="structural/hele_struct_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_spec.png" name="specTex"/>
-<texture file="structural/ao/athen_parthenon.png" name="aoTex"/>
-</textures>
+      <textures>
+        <texture file="structural/hele_struct.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_parthenon.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/temple_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/temple_new.xml
index 42e3e3aeb3..0ae9054ba7 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/temple_new.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/temple_new.xml
@@ -28,12 +28,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml b/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml
deleted file mode 100644
index 2f94521501..0000000000
--- a/binaries/data/mods/public/art/actors/structures/hellenes/theatre_new.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="hele theatron">
-      <mesh>structural/hele_theatron_struct.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/theatron_marble.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/theatron_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/theatron_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/theatron_tile.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/theatron_nature.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_6x6.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/hele_struct.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall.xml
index 9a2f4ac7e1..4756a9f9a3 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall.xml
@@ -8,7 +8,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
index f3d89be80b..26d581c1a0 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
@@ -2,20 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Gate A">
-      <animations>
-        <animation file="mechanical/hele_wall_gate_closed.dae" name="gate_closed" speed="65"/>
-        <animation file="mechanical/hele_wall_gate_opening.dae" name="gate_opening" speed="65"/>
-        <animation file="mechanical/hele_wall_gate_open.dae" name="gate_open" speed="65"/>
-        <animation file="mechanical/hele_wall_gate_closing.dae" name="gate_closing" speed="65"/>
-      </animations>
-      <mesh>structural/hele_wall_gate.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/gate_door.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="props/hele_gate.png" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="100" name="Gate B">
+    <variant frequency="100" name="Gate">
       <animations>
         <animation file="mechanical/hele_wall_gate_closed.dae" name="gate_closed" speed="65"/>
         <animation file="mechanical/hele_wall_gate_opening.dae" name="gate_opening" speed="65"/>
@@ -30,7 +17,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml
index 04bd9472b0..f87003385e 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml
@@ -13,7 +13,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_medium.xml
index 43a7ec3c54..8c0ea3f9e3 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_medium.xml
@@ -13,7 +13,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_short.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_short.xml
index 89fc07074b..5703f8ee39 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_short.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_short.xml
@@ -13,7 +13,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_tower.xml
index 3d4b1713f2..fc39cfd793 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_tower.xml
@@ -22,12 +22,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml
index 48e1012668..8317d7a5db 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml
@@ -20,7 +20,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/sb1_new.xml b/binaries/data/mods/public/art/actors/structures/persians/apadana.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/structures/persians/sb1_new.xml
rename to binaries/data/mods/public/art/actors/structures/persians/apadana.xml
diff --git a/binaries/data/mods/public/art/actors/structures/persians/sb2.xml b/binaries/data/mods/public/art/actors/structures/persians/hall.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/structures/persians/sb2.xml
rename to binaries/data/mods/public/art/actors/structures/persians/hall.xml
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_farmstead.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_farmstead.xml
index f9c6abcfda..f4b67f600c 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_farmstead.xml
@@ -7,6 +7,6 @@
     <general>structures/{civ}_farmstead</general>
   </SkirmishReplacer>
   <VisualActor>
-    <Actor>structures/athenians/farmstead_new.xml</Actor>
+    <Actor>structures/athenians/farmstead.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_corral.xml b/binaries/data/mods/public/simulation/templates/structures/athen_corral.xml
index 4c9c0cf865..c4b14de6d7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_corral.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_corral.xml
@@ -16,7 +16,7 @@
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/athenians/corral.xml</Actor>
+    <Actor>structures/hellenes/corral.xml</Actor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
index 172a01c493..751d200cab 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
@@ -18,6 +18,6 @@
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <VisualActor>
-    <Actor>structures/athenians/scout_tower.xml</Actor>
+    <Actor>structures/hellenes/scout_tower.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
index 256a164930..561098efd4 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
@@ -16,7 +16,7 @@
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/athenians/farmstead.xml</Actor>
+    <Actor>structures/hellenes/farmstead.xml</Actor>
     <FoundationActor>structures/fndn_4x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_house.xml b/binaries/data/mods/public/simulation/templates/structures/athen_house.xml
index 0f0b39cf66..6a4361d602 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_house.xml
@@ -19,6 +19,6 @@
     <History>Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia.</History>
   </Identity>
   <VisualActor>
-    <Actor>structures/athenians/house.xml</Actor>
+    <Actor>structures/hellenes/house.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
index f513dff6f8..c2feb7677a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
@@ -6,6 +6,6 @@
     <SpecificName>Prophylakḗ</SpecificName>
   </Identity>
   <VisualActor>
-    <Actor>structures/athenians/outpost.xml</Actor>
+    <Actor>structures/hellenes/outpost.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_storehouse.xml b/binaries/data/mods/public/simulation/templates/structures/athen_storehouse.xml
index 8aaa70bbde..19138f5d5e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_storehouse.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_storehouse.xml
@@ -6,6 +6,6 @@
     <History>Resources and building materials were kept in warehouses.</History>
   </Identity>
   <VisualActor>
-    <Actor>structures/athenians/storehouse.xml</Actor>
+    <Actor>structures/hellenes/storehouse.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml
index a9b7fe5b3c..dd0cb6d60e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_farmstead.xml
@@ -16,7 +16,7 @@
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/hellenes/farmstead_new.xml</Actor>
+    <Actor>structures/hellenes/farmstead.xml</Actor>
     <FoundationActor>structures/fndn_4x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_house.xml b/binaries/data/mods/public/simulation/templates/structures/mace_house.xml
index 65101b61d2..21f55c825f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_house.xml
@@ -19,6 +19,6 @@
     <History>Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia.</History>
   </Identity>
   <VisualActor>
-    <Actor>structures/hellenes/house_new.xml</Actor>
+    <Actor>structures/hellenes/house.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml b/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
index 328e010fc6..29dda18cd1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -62,7 +62,7 @@
     <Interval>1000</Interval>
   </ResourceTrickle>
   <VisualActor>
-    <Actor>structures/persians/sb1_new.xml</Actor>
+    <Actor>structures/persians/apadana.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml b/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
index 61251212d0..a20f60689b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -52,7 +52,7 @@ Train War Elephants and Kardakes mercenaries.</Tooltip>
     </Entities>
   </ProductionQueue>
   <VisualActor>
-    <Actor>structures/persians/sb2.xml</Actor>
+    <Actor>structures/persians/hall.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml
index 57f348661c..6536e5b430 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_farmstead.xml
@@ -16,7 +16,7 @@
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/hellenes/farmstead_new.xml</Actor>
+    <Actor>structures/hellenes/farmstead.xml</Actor>
     <FoundationActor>structures/fndn_4x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_house.xml b/binaries/data/mods/public/simulation/templates/structures/spart_house.xml
index 71146c91df..47a023bbf8 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_house.xml
@@ -19,6 +19,6 @@
     <History>Spartan houses were known to be particularly simple because of two laws of Lycurgus. The first enforced that the roofs only be crafted with an axe, and the second made doors only constructed with saws as tools. (Plutarch 13) These generally made Spartans more likely to furnish their homes with plain furniture to match their homes. This helped give rise to the term 'spartan' which means 'sparse.'</History>
   </Identity>
   <VisualActor>
-    <Actor>structures/hellenes/house_new.xml</Actor>
+    <Actor>structures/hellenes/house.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml
index b06728461d..9392c6ea33 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml
@@ -11,6 +11,6 @@
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/athenians/merchant_new.xml</Actor>
+    <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml
index 54d10b1021..4dd1b25dee 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml
@@ -10,6 +10,6 @@
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/hellenes/merchant_new.xml</Actor>
+    <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml
index c3667c8f1b..8c7b82a96a 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml
@@ -10,6 +10,6 @@
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/hellenes/merchant_new.xml</Actor>
+    <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml
index dadedd3199..23534bca09 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml
@@ -10,6 +10,6 @@
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/hellenes/merchant_new.xml</Actor>
+    <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>