diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers.xml b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers.xml
rename to binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae.xml
index 01b5d66598..2f06cf8346 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae.xml
@@ -2,8 +2,8 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="quadraped/horse/props/blanket_pers.xml" name="horse-blanket-pers"/>
-    <variant file="quadraped/horse/props/blanket_pers_01.xml" name="horse-blanket-pers-01"/>
+    <variant file="quadraped/horse/props/blanket_achae.xml" name="horse-blanket-achae"/>
+    <variant file="quadraped/horse/props/blanket_achae_01.xml" name="horse-blanket-achae-01"/>
   </group>
   <group>
     <variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers_basic.xml b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae_basic.xml
similarity index 92%
rename from binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers_basic.xml
rename to binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae_basic.xml
index 33143523bb..05d8f2bba8 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers_basic.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae_basic.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="quadraped/horse/props/blanket_pers_02.xml" name="horse-blanket-pers-02"/>
+    <variant file="quadraped/horse/props/blanket_achae_02.xml" name="horse-blanket-achae-02"/>
   </group>
   <group>
     <variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers_hero.xml b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae_hero.xml
similarity index 92%
rename from binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers_hero.xml
rename to binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae_hero.xml
index 851e5561dd..daf27ecc18 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_pers_hero.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_achae_hero.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="quadraped/horse/props/blanket_pers_03.xml" name="horse-blanket-pers-03"/>
+    <variant file="quadraped/horse/props/blanket_achae_03.xml" name="horse-blanket-achae-03"/>
   </group>
   <group>
     <variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_blanket_back_pers.xml b/binaries/data/mods/public/art/actors/props/horse/cav_blanket_back_achae.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/horse/cav_blanket_back_pers.xml
rename to binaries/data/mods/public/art/actors/props/horse/cav_blanket_back_achae.xml
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_peytral_pers_bronze.xml b/binaries/data/mods/public/art/actors/props/horse/cav_peytral_achae_bronze.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/props/horse/cav_peytral_pers_bronze.xml
rename to binaries/data/mods/public/art/actors/props/horse/cav_peytral_achae_bronze.xml
index cd31a79766..e215f48f47 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_peytral_pers_bronze.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_peytral_achae_bronze.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="quadraped/horse/props/peytral_pers_bronze_01.xml" name="horse-peytral-persian-Bronze"/>
+    <variant file="quadraped/horse/props/peytral_achae_bronze_01.xml" name="horse-peytral-persian-Bronze"/>
   </group>
   <group>
     <variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_peytral_pers_iron.xml b/binaries/data/mods/public/art/actors/props/horse/cav_peytral_achae_iron.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/props/horse/cav_peytral_pers_iron.xml
rename to binaries/data/mods/public/art/actors/props/horse/cav_peytral_achae_iron.xml
index 00d8868f8f..1d62fe4a83 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_peytral_pers_iron.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_peytral_achae_iron.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="quadraped/horse/props/peytral_pers_iron_01.xml" name="horse-peytral-persian-Iron"/>
+    <variant file="quadraped/horse/props/peytral_achae_iron_01.xml" name="horse-peytral-persian-Iron"/>
   </group>
   <group>
     <variant file="quadraped/base_horse_javelin_fast.xml" name="Javelinist-Fast-Horse" frequency="1"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_01.xml b/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_01.xml
index 16bc36bf8a..ccdc617bb2 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_01.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_01.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-        <mesh>props/horse/armor_pers_winged_01.dae</mesh>
+        <mesh>props/horse/armor_achae_winged_01.dae</mesh>
         <textures>
           <texture file="props/horse/winged_armor_01.png" name="baseTex"/>
           <texture file="props/horse/winged_armor_01_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_02.xml b/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_02.xml
index 4feb89365b..3d75d01b49 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_02.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_02.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-        <mesh>props/horse/armor_pers_winged_02.dae</mesh>
+        <mesh>props/horse/armor_achae_winged_02.dae</mesh>
         <textures>
           <texture file="props/horse/winged_armor_02.png" name="baseTex"/>
           <texture file="props/horse/winged_armor_02_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_03.xml b/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_03.xml
index 0cb783d764..3a81084285 100644
--- a/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_03.xml
+++ b/binaries/data/mods/public/art/actors/props/horse/cav_winged_armor_03.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-        <mesh>props/horse/armor_pers_winged_03.dae</mesh>
+        <mesh>props/horse/armor_achae_winged_03.dae</mesh>
         <textures>
           <texture file="props/horse/winged_armor_03.png" name="baseTex"/>
           <texture file="props/horse/winged_armor_03_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/special/common/pers_waypoint_flag.xml b/binaries/data/mods/public/art/actors/props/special/common/achae_waypoint_flag.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/props/special/common/pers_waypoint_flag.xml
rename to binaries/data/mods/public/art/actors/props/special/common/achae_waypoint_flag.xml
index 875fefb04b..35bec98fa6 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/pers_waypoint_flag.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/achae_waypoint_flag.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <float/>
   <group>
-    <variant file="others/waypoints/base.xml" frequency="1" name="Pers Waypoint Flag">
+    <variant file="others/waypoints/base.xml" frequency="1" name="Achae Waypoint Flag">
       <textures>
-        <texture file="props/banner_persian.png" name="baseTex"/>
+        <texture file="props/banner_achaemenids.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_persians.xml b/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_achaemenids.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/props/special/common/garrison_flag_persians.xml
rename to binaries/data/mods/public/art/actors/props/special/common/garrison_flag_achaemenids.xml
index cfbfb7be9b..9a1e814a2a 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_persians.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_achaemenids.xml
@@ -2,13 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="pers flag 3">
+    <variant frequency="1" name="Achae flag 3">
       <animations>
         <animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
       </animations>
       <mesh>props/garrison_flag.dae</mesh>
       <textures>
-        <texture file="props/garrison_pers_3.png" name="baseTex"/>
+        <texture file="props/garrison_achae_3.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml b/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml
index e5817ace8c..42c3036734 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_factions.xml
@@ -10,9 +10,9 @@
     </variant>
   </group>
   <group>
-    <variant name="waypoint_persians">
+    <variant name="waypoint_achaemenids">
       <textures>
-        <texture file="props/banner_persian.png" name="baseTex"/>
+        <texture file="props/banner_achaemenids.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="waypoint_hellenes">
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_food_big.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_food_big.xml
new file mode 100644
index 0000000000..37db0c48b1
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_food_big.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Achae treasure 4 (food big)">
+      <mesh>props/treasure_achae_4.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_food_small.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_food_small.xml
new file mode 100644
index 0000000000..3ac146b777
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_food_small.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Achae treasure 1 (food smalll)">
+      <mesh>props/treasure_achae_1.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_metal_big.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_metal_big.xml
new file mode 100644
index 0000000000..688960c161
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_metal_big.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Achae treasure 2 (metal bigl)">
+      <mesh>props/treasure_achae_2.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_metal_small.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_metal_small.xml
new file mode 100644
index 0000000000..2d58300bc2
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_achaemenid_metal_small.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Achae treasure 3 (metal small)">
+      <mesh>props/treasure_achae_3.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_food_big.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_food_big.xml
deleted file mode 100644
index d23be108aa..0000000000
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_food_big.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers treasure 4 (food big)">
-      <mesh>props/treasure_pers_4.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_food_small.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_food_small.xml
deleted file mode 100644
index 15c10af1f1..0000000000
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_food_small.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers treasure 1 (food smalll)">
-      <mesh>props/treasure_pers_1.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_metal_big.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_metal_big.xml
deleted file mode 100644
index 0109827836..0000000000
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_metal_big.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers treasure 2 (metal bigl)">
-      <mesh>props/treasure_pers_2.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_metal_small.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_metal_small.xml
deleted file mode 100644
index a1605c93cd..0000000000
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/treasure_persian_metal_small.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers treasure 3 (metal small)">
-      <mesh>props/treasure_pers_3.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/palisade_rocks_outpost_banners.xml b/binaries/data/mods/public/art/actors/props/special/palisade_rocks_outpost_banners.xml
index e48eaa8323..7a3e3667fa 100644
--- a/binaries/data/mods/public/art/actors/props/special/palisade_rocks_outpost_banners.xml
+++ b/binaries/data/mods/public/art/actors/props/special/palisade_rocks_outpost_banners.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="palisade rocks outpost banners">
       <animations/>
       <mesh>props/palisade_rocks_outpost_banners.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_01.xml
similarity index 53%
rename from binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_01.xml
index 22e0509db3..950d07b68a 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_01.xml
@@ -2,15 +2,15 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="persian-alt-building-01">
-      <mesh>props/pers_alt_build_01_big.dae</mesh>
+    <variant frequency="1" name="achaemenid-alt-building-01">
+      <mesh>props/achae_alt_build_01_big.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/alt_building_01_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_01_prop.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -21,7 +21,7 @@
         <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/persians/alt_building_01_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_01_prop.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_01_prop.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_01_prop.xml
new file mode 100644
index 0000000000..661b530bfb
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_01_prop.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="props">
+      <mesh>props/achae_alt_build_01_prop.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_02.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_02.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/props/structures/persians/alt_building_02.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_02.xml
index fcfb9f8a56..3ffab3992c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_02.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_02.xml
@@ -2,15 +2,15 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="persian-alt-building-02">
-      <mesh>props/pers_alt_build_02.dae</mesh>
+    <variant frequency="1" name="achaemenid-alt-building-02">
+      <mesh>props/achae_alt_build_02.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/alt_building_02_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_02_prop.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -21,7 +21,7 @@
         <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/persians/alt_building_02_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_02_prop.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_02_prop.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_02_prop.xml
new file mode 100644
index 0000000000..755ac4f19e
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_02_prop.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/achae_alt_build_02_prop.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_03.xml
similarity index 53%
rename from binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_03.xml
index 800beebdc9..9c755b5fe4 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_03.xml
@@ -2,15 +2,15 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="persian-alt-building-03">
-      <mesh>props/pers_alt_build_03.dae</mesh>
+    <variant frequency="1" name="achaemenid-alt-building-03">
+      <mesh>props/achae_alt_build_03.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/alt_building_03_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_03_prop.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -21,7 +21,7 @@
         <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/persians/alt_building_03_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_03_prop.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_03_prop.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_03_prop.xml
new file mode 100644
index 0000000000..30efd719ed
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_03_prop.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid-alt-building-03-prop">
+      <mesh>props/achae_alt_build_03_prop.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_04.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_04.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/props/structures/persians/alt_building_04.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_04.xml
index 6256fc323a..5601e6c8b1 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_04.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_04.xml
@@ -2,12 +2,12 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="persian-alt-building-04">
-      <mesh>props/pers_alt_build_04.dae</mesh>
+    <variant frequency="1" name="achaemenid-alt-building-04">
+      <mesh>props/achae_alt_build_04.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -18,7 +18,7 @@
         <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/persians/alt_building_01_prop.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_01_prop.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05.xml
new file mode 100644
index 0000000000..8c731051b9
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid-alt-building-05">
+      <mesh>props/achae_alt_build_05.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/alt_building_05_baskets.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_05_prop.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </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/achaemenids/alt_building_05_baskets.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/alt_building_05_prop.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05_baskets.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05_baskets.xml
similarity index 55%
rename from binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05_baskets.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05_baskets.xml
index 11a2fd6ee6..537c2d83f8 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05_baskets.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05_baskets.xml
@@ -3,18 +3,18 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="baskets_a">
-      <mesh>props/pers_alt_build_05_baskets_a.dae</mesh>
+      <mesh>props/achae_alt_build_05_baskets_a.dae</mesh>
     </variant>
     <variant frequency="1" name="baskets_b">
-      <mesh>props/pers_alt_build_05_baskets_b.dae</mesh>
+      <mesh>props/achae_alt_build_05_baskets_b.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="texture">
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05_prop.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05_prop.xml
new file mode 100644
index 0000000000..8a9c72abbb
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/alt_building_05_prop.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid-alt-building-05-prop">
+      <mesh>props/achae_alt_build_05_prop.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/barracks_shields.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/barracks_shields.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/props/structures/persians/barracks_shields.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/barracks_shields.xml
index a28656e84f..ad50bcd26b 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/barracks_shields.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/barracks_shields.xml
@@ -3,23 +3,23 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/pers_barracks_shields.dae</mesh>
+      <mesh>props/achae_barracks_shields.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_back.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="shield-pers-aspis-1">
+    <variant frequency="1" name="shield-achae-aspis-1">
       <textures>
-        <texture file="props/shield/pers_aspis_1.png" name="baseTex"/>
+        <texture file="props/shield/achae_aspis_1.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
 	  </textures>
     </variant>
-    <variant frequency="1" name="shield-pers-aspis-2">
+    <variant frequency="1" name="shield-achae-aspis-2">
       <textures>
-        <texture file="props/shield/pers_aspis_2.png" name="baseTex"/>
+        <texture file="props/shield/achae_aspis_2.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
 	  </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_fence.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_fence.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/props/structures/persians/bireme_fence.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_fence.xml
index b3ef0da5e1..aaf149ce8e 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_fence.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_fence.xml
@@ -4,9 +4,9 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/pers_bir_fence.dae</mesh>
+      <mesh>props/achae_bir_fence.dae</mesh>
       <textures>
-        <texture file="structural/pers_bir.dds" name="baseTex"/>
+        <texture file="structural/achae_bir.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_main_sail.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_main_sail.xml
similarity index 57%
rename from binaries/data/mods/public/art/actors/props/structures/persians/bireme_main_sail.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_main_sail.xml
index a78a3f91b3..4ec7e28e1c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_main_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_main_sail.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant file="others/ships/main_sail_base.xml" name="Bireme Sail">
-      <mesh>props/pers_bireme_sail.dae</mesh>
-      <textures>
-       <texture file="props/ptol_sail_norm.png" name="normTex"/>
-       <texture file="props/sail_spec_1.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" file="others/ships/pers_sail_01.xml" name="zoroaster"/>
-    <variant frequency="100" file="others/ships/pers_sail_02.xml" name="royal standard"/>
-    <variant frequency="100" file="others/ships/pers_sail_03.xml" name="standard"/>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant file="others/ships/main_sail_base.xml" name="Bireme Sail">
+      <mesh>props/achae_bireme_sail.dae</mesh>
+      <textures>
+       <texture file="props/ptol_sail_norm.png" name="normTex"/>
+       <texture file="props/sail_spec_1.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" file="others/ships/achae_sail_01.xml" name="zoroaster"/>
+    <variant frequency="100" file="others/ships/achae_sail_02.xml" name="royal standard"/>
+    <variant frequency="100" file="others/ships/achae_sail_03.xml" name="standard"/>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_mast.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_mast.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/structures/persians/bireme_mast.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_mast.xml
index 22c52ed180..e680fd12b6 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_mast.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_mast.xml
@@ -4,20 +4,20 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/pers_bir_mast.dae</mesh>
+      <mesh>props/achae_bir_mast.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="trireme-sail-zoroaster">
       <textures>
-        <texture file="props/pers_trireme_sail.dds" name="baseTex"/>
+        <texture file="props/achae_trireme_sail.dds" name="baseTex"/>
         <texture file="props/sail_norm_1.png" name="normTex"/>
         <texture file="props/sail_spec_1.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="trireme-sail-royal standard">
       <textures>
-        <texture file="props/pers_trireme_sail_b.dds" name="baseTex"/>
+        <texture file="props/achae_trireme_sail_b.dds" name="baseTex"/>
         <texture file="props/sail_norm_1.png" name="normTex"/>
         <texture file="props/sail_spec_1.png" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_oars.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_oars.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/props/structures/persians/bireme_oars.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_oars.xml
index e57f6c18fa..358634158c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/bireme_oars.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/bireme_oars.xml
@@ -4,9 +4,9 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/pers_bir_oars.dae</mesh>
+      <mesh>props/achae_bir_oars.dae</mesh>
       <textures>
-        <texture file="structural/pers_bir.dds" name="baseTex"/>
+        <texture file="structural/achae_bir.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/blacksmith.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/blacksmith.xml
similarity index 89%
rename from binaries/data/mods/public/art/actors/props/structures/persians/blacksmith.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/blacksmith.xml
index e9609145b3..9387d01f52 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/blacksmith.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/blacksmith.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="Props_a">
-      <mesh>structural/pers_blacksmith_props.dae</mesh>
+      <mesh>structural/achae_blacksmith_props.dae</mesh>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/farmstead.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/structures/persians/farmstead.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead.xml
index ed7aab3c89..6192723342 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/farmstead.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead.xml
@@ -4,10 +4,10 @@
   <group>
     <variant frequency="100" name="Base">
       <animations/>
-      <mesh>props/pers_fc.dae</mesh>
+      <mesh>props/achae_fc.dae</mesh>
       <props/>
       <textures>
-        <texture file="props/pers_prop_a.dds" name="baseTex"/>
+        <texture file="props/achae_prop_a.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead_cart.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead_cart.xml
new file mode 100644
index 0000000000..3d360d1b37
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead_cart.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid farmstead cart">
+      <mesh>props/achae_farmstead_cart.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_farmstead.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/achaemenids/farmstead_cart_big.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead_cart_big.xml
new file mode 100644
index 0000000000..f7215d5704
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/farmstead_cart_big.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid farmstead cart">
+      <mesh>props/achae_farmstead_cart_big.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_farmstead.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/achaemenids/fishship_sail.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fishship_sail.xml
new file mode 100644
index 0000000000..27aba73580
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fishship_sail.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="achae">
+      <mesh>props/achae_fishship_sail.dae</mesh>
+      <animations>
+        <animation file="others/achae_sail_idle.dae" name="idle" speed="100"/>
+        <animation file="others/achae_sail_move.dae" name="Walk" speed="10"/>
+        <animation file="others/achae_sail_move.dae" name="Run" speed="14"/>
+        <animation file="others/achae_sail_move.dae" name="carry_food" speed="10"/>
+        <animation file="others/achae_sail_move.dae" name="carry_fish" speed="10"/>
+      </animations>
+      <textures>
+        <texture file="props/achae_trireme_sail_c.dds" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/fishship_sail_folded.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fishship_sail_folded.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/props/structures/persians/fishship_sail_folded.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/fishship_sail_folded.xml
index d7f37c3524..04d6b2734d 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/fishship_sail_folded.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fishship_sail_folded.xml
@@ -2,13 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="pers">
-      <mesh>props/pers_fishship_sail_folded.dae</mesh>
+    <variant frequency="100" name="achae">
+      <mesh>props/achae_fishship_sail_folded.dae</mesh>
       <animations>
-        <animation file="others/pers_sail_folded_idle.dae" name="idle" speed="100"/>
+        <animation file="others/achae_sail_folded_idle.dae" name="idle" speed="100"/>
       </animations>
       <textures>
-        <texture file="props/pers_trireme_sail_c.dds" name="baseTex"/>
+        <texture file="props/achae_trireme_sail_c.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_b_paintings.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_b_paintings.xml
new file mode 100644
index 0000000000..ef7bedf23f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_b_paintings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>props/achae_fortress_b_paintings.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_b_shields.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_b_shields.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/structures/persians/fortress_b_shields.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_b_shields.xml
index 8da2f22662..fc9b3ed7a8 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_b_shields.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_b_shields.xml
@@ -3,23 +3,23 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/pers_fortress_b_shields.dae</mesh>
+      <mesh>props/achae_fortress_b_shields.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_back.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="shield-pers-aspis-1">
+    <variant frequency="1" name="shield-achae-aspis-1">
       <textures>
-        <texture file="props/shield/pers_aspis_1.png" name="baseTex"/>
+        <texture file="props/shield/achae_aspis_1.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="shield-pers-aspis-2">
+    <variant frequency="1" name="shield-achae-aspis-2">
       <textures>
-	    <texture file="props/shield/pers_aspis_2.png" name="baseTex"/>
+	    <texture file="props/shield/achae_aspis_2.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
 	  </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/temple.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_paintings.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/props/structures/persians/temple.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_paintings.xml
index f2d189b7ca..74cce772a5 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/temple.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_paintings.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
-      <mesh>props/pers_temple_lions.dae</mesh>
+      <mesh>props/achae_fortress_paintings.dae</mesh>
       <textures>
-         <texture file="structural/pers_struct.png" name="baseTex"/>
-         <texture file="structural/pers_struct_norm.png" name="normTex"/>
-         <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
-
   <material>basic_trans_parallax_spec.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_shields.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_shields.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/structures/persians/fortress_shields.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_shields.xml
index c2f948cdf1..0ce1b6893e 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_shields.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/fortress_shields.xml
@@ -3,23 +3,23 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/pers_fortress_shields.dae</mesh>
+      <mesh>props/achae_fortress_shields.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_back.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="shield-pers-aspis-1">
+    <variant frequency="1" name="shield-achae-aspis-1">
       <textures>
-	    <texture file="props/shield/pers_aspis_1.png" name="baseTex"/>
+	    <texture file="props/shield/achae_aspis_1.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
 	  </textures>
     </variant>
-    <variant frequency="1" name="shield-pers-aspis-2">
+    <variant frequency="1" name="shield-achae-aspis-2">
       <textures>
-	    <texture file="props/shield/pers_aspis_2.png" name="baseTex"/>
+	    <texture file="props/shield/achae_aspis_2.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
 	  </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_dese_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_dese_a.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_dese_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_dese_a.xml
index d84b223d7c..726b79901c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_dese_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_dese_a.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_bush_dese_a.dae</mesh>
+      <mesh>structural/achae_gardens_bush_dese_a.dae</mesh>
       <textures>
         <texture file="gaia/bush_dese_a.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_desert_c.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_desert_c.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_desert_c.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_desert_c.xml
index f0f0bad228..6ad9a4bfc5 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_desert_c.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_desert_c.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_bush_desert_c.dae</mesh>
+      <mesh>structural/achae_gardens_bush_desert_c.dae</mesh>
       <textures>
         <texture file="gaia/bush_desert_c.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_lush_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_lush_a.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_lush_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_lush_a.xml
index 4e49fff8f2..86d6fd3e99 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_lush_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_lush_a.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_bush_lush_a.dae</mesh>
+      <mesh>structural/achae_gardens_bush_lush_a.dae</mesh>
       <textures>
         <texture file="gaia/bush_lush_a.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_tempe_la_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_tempe_la_a.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_tempe_la_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_tempe_la_a.xml
index 0279adf056..7a7eb16474 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_tempe_la_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_tempe_la_a.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_bush_tempe_la_a.dae</mesh>
+      <mesh>structural/achae_gardens_bush_tempe_la_a.dae</mesh>
       <textures>
         <texture file="gaia/bush_tempe_la_a.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_tempe_la_b2.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_tempe_la_b2.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_tempe_la_b2.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_tempe_la_b2.xml
index d5a62e0116..c9b6886cb1 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_bush_tempe_la_b2.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_bush_tempe_la_b2.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_bush_tempe_la_b2.dae</mesh>
+      <mesh>structural/achae_gardens_bush_tempe_la_b2.dae</mesh>
       <textures>
         <texture file="gaia/bush_tempe_la_b2.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_grass_field.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_grass_field.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_grass_field.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_grass_field.xml
index a941464cf3..1cc42e3652 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_grass_field.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_grass_field.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_grass_field.dae</mesh>
+      <mesh>structural/achae_gardens_grass_field.dae</mesh>
       <textures>
         <texture file="gaia/grass_field.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_log_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_log_b.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_log_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_log_b.xml
index 0d434f5110..978cb8c513 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_log_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_log_b.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_log_b.dae</mesh>
+      <mesh>structural/achae_gardens_log_b.dae</mesh>
       <textures>
         <texture file="gaia/log_b.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_struct_nature.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_struct_nature.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_struct_nature.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_struct_nature.xml
index faf7e46f40..44e5f6e0cf 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_struct_nature.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_struct_nature.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_struct_nature.dae</mesh>
+      <mesh>structural/achae_gardens_struct_nature.dae</mesh>
       <textures>
         <texture file="props/structs_nature.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_struct_transp.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_struct_transp.xml
new file mode 100644
index 0000000000..cf1399ba25
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_struct_transp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/achae_gardens_struct_transp.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_apple_bloom.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_apple_bloom.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_apple_bloom.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_apple_bloom.xml
index 03160b316f..757f0c704f 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_apple_bloom.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_apple_bloom.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_apple_bloom.dae</mesh>
+      <mesh>structural/achae_gardens_tree_apple_bloom.dae</mesh>
       <textures>
         <texture file="gaia/tree_apple_bloom.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_baobab_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_baobab_a.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_baobab_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_baobab_a.xml
index c18d5a4480..9e96ad8d61 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_baobab_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_baobab_a.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_baobab_a.dae</mesh>
+      <mesh>structural/achae_gardens_tree_baobab_a.dae</mesh>
       <textures>
         <texture file="gaia/tree_baobab_a.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_baobab_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_baobab_b.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_baobab_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_baobab_b.xml
index 003f1708e5..01327ce2b2 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_baobab_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_baobab_b.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_baobab_b.dae</mesh>
+      <mesh>structural/achae_gardens_tree_baobab_b.dae</mesh>
       <textures>
         <texture file="gaia/tree_baobab_b.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_euro_beech_a_aut.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_euro_beech_a_aut.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_euro_beech_a_aut.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_euro_beech_a_aut.xml
index 9d4cab83e3..bdf75b6370 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_euro_beech_a_aut.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_euro_beech_a_aut.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_euro_beech_a_aut.dae</mesh>
+      <mesh>structural/achae_gardens_tree_euro_beech_a_aut.dae</mesh>
       <textures>
         <texture file="gaia/tree_euro_beech_a_aut.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_euro_beech_c.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_euro_beech_c.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_euro_beech_c.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_euro_beech_c.xml
index e216bd9557..9f2c2be5e0 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_euro_beech_c.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_euro_beech_c.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_euro_beech_c.dae</mesh>
+      <mesh>structural/achae_gardens_tree_euro_beech_c.dae</mesh>
       <textures>
         <texture file="gaia/tree_euro_beech_c.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_lumbardypoplar_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_lumbardypoplar_a.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_lumbardypoplar_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_lumbardypoplar_a.xml
index ad4eed5c28..049322a53f 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_lumbardypoplar_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_lumbardypoplar_a.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_lumbardypoplar_a.dae</mesh>
+      <mesh>structural/achae_gardens_tree_lumbardypoplar_a.dae</mesh>
       <textures>
         <texture file="gaia/tree_lumbardypoplar_a.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_palmdate_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_palmdate_b.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_palmdate_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_palmdate_b.xml
index b9b88ce556..7eae2515ba 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_tree_palmdate_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_tree_palmdate_b.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_tree_palmdate_b.dae</mesh>
+      <mesh>structural/achae_gardens_tree_palmdate_b.dae</mesh>
       <textures>
         <texture file="gaia/tree_palmdate_b.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_trunk_baobab.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_trunk_baobab.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_trunk_baobab.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_trunk_baobab.xml
index 48ee959724..4c4312f340 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_trunk_baobab.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_trunk_baobab.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_trunk_baobab.dae</mesh>
+      <mesh>structural/achae_gardens_trunk_baobab.dae</mesh>
       <textures>
         <texture file="gaia/trunk_baobab.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_trunk_deciduous_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_trunk_deciduous_b.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_trunk_deciduous_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_trunk_deciduous_b.xml
index c7ce7c0aea..cf332da853 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_trunk_deciduous_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_trunk_deciduous_b.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_trunk_deciduous_b.dae</mesh>
+      <mesh>structural/achae_gardens_trunk_deciduous_b.dae</mesh>
       <textures>
         <texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_turf.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_turf.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_turf.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_turf.xml
index 3f6b5936d7..4aa8c91526 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_turf.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_turf.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_turf.dae</mesh>
+      <mesh>structural/achae_gardens_turf.dae</mesh>
       <textures>
         <texture file="props/gardens_turf.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_water.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_water.xml
similarity index 82%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_water.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_water.xml
index 189e1a68a3..c2dab2de84 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_water.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_water.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <group>
     <variant>
-      <mesh>structural/pers_gardens_water.dae</mesh>
+      <mesh>structural/achae_gardens_water.dae</mesh>
       <textures>
         <texture file="props/gardens_turf.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_water_lillies.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_water_lillies.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_water_lillies.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_water_lillies.xml
index 7162d09225..1385c46cd1 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_water_lillies.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_water_lillies.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_water_lillies.dae</mesh>
+      <mesh>structural/achae_gardens_water_lillies.dae</mesh>
       <textures>
         <texture file="gaia/water_lillies.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_waterfall.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_waterfall.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_waterfall.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_waterfall.xml
index 145145fc58..27cce8ba35 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_waterfall.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_waterfall.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>structural/pers_gardens_waterfall.dae</mesh>
-      <textures>
-        <texture file="temp/waterfall.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>waterfall.xml</material>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/achae_gardens_waterfall.dae</mesh>
+      <textures>
+        <texture file="temp/waterfall.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>waterfall.xml</material>
 </actor>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_wrld_bush_b_2.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_wrld_bush_b_2.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/structures/persians/gardens_wrld_bush_b_2.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_wrld_bush_b_2.xml
index a41ad07e2d..c4a27a268f 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_wrld_bush_b_2.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/gardens_wrld_bush_b_2.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_gardens_wrld_bush_b_2.dae</mesh>
+      <mesh>structural/achae_gardens_wrld_bush_b_2.dae</mesh>
       <textures>
         <texture file="gaia/wrld_bush_b_2.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/house_a_plants.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/house_a_plants.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/props/structures/persians/house_a_plants.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/house_a_plants.xml
index 442945e9bb..a59c16f360 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/house_a_plants.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/house_a_plants.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/pers_house_a_plants.dae</mesh>
-      <textures>
-        <texture file="props/structs_nature.png" name="baseTex"/>
-        <texture file="props/structs_nature_norm.png" name="normTex"/>
-	      <texture file="props/structs_nature_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/achae_house_a_plants.dae</mesh>
+      <textures>
+        <texture file="props/structs_nature.png" name="baseTex"/>
+        <texture file="props/structs_nature_norm.png" name="normTex"/>
+	      <texture file="props/structs_nature_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/house_c_plants.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/house_c_plants.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/props/structures/persians/house_c_plants.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/house_c_plants.xml
index 5aede5215d..554a383c8f 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/house_c_plants.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/house_c_plants.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/pers_house_c_plants.dae</mesh>
-      <textures>
-        <texture file="props/structs_nature.png" name="baseTex"/>
-        <texture file="props/structs_nature_norm.png" name="normTex"/>
-	      <texture file="props/structs_nature_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/achae_house_c_plants.dae</mesh>
+      <textures>
+        <texture file="props/structs_nature.png" name="baseTex"/>
+        <texture file="props/structs_nature_norm.png" name="normTex"/>
+	      <texture file="props/structs_nature_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/house_d_plants.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/house_d_plants.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/props/structures/persians/house_d_plants.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/house_d_plants.xml
index 95315ee4a9..d849a00315 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/house_d_plants.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/house_d_plants.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/pers_house_d_plants.dae</mesh>
-      <textures>
-        <texture file="props/structs_nature.png" name="baseTex"/>
-        <texture file="props/structs_nature_norm.png" name="normTex"/>
-	      <texture file="props/structs_nature_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/achae_house_d_plants.dae</mesh>
+      <textures>
+        <texture file="props/structs_nature.png" name="baseTex"/>
+        <texture file="props/structs_nature_norm.png" name="normTex"/>
+	      <texture file="props/structs_nature_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/market.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market.xml
similarity index 50%
rename from binaries/data/mods/public/art/actors/props/structures/persians/market.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/market.xml
index 9444996fd0..29f86179ca 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="props-a">
-      <mesh>props/pers_market_props_a.dae</mesh>
+      <mesh>props/achae_market_props_a.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall1.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall1.xml
new file mode 100644
index 0000000000..01d59bf1fc
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall1.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_a_stall2.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall2.xml
new file mode 100644
index 0000000000..1a2163bd99
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall2.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_a_stall3.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall3.xml
new file mode 100644
index 0000000000..57242c5bef
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall3.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall3.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_a_stall4.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall4.xml
new file mode 100644
index 0000000000..c359146604
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall4.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall4.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_a_stall5.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall5.xml
new file mode 100644
index 0000000000..8fa054f63f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall5.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall5.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_a_stall6.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall6.xml
new file mode 100644
index 0000000000..7a829ffc2c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall6.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall6.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_a_stall7.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall7.xml
new file mode 100644
index 0000000000..1b0d8d68f7
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_a_stall7.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_A stall">
+      <mesh>props/achae_market_a_stall7.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_a.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/achaemenids/market_b_stall1.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall1.xml
new file mode 100644
index 0000000000..5c64e7f6e2
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall1.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/achaemenids/market_b_stall2.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall2.xml
new file mode 100644
index 0000000000..63204a8964
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall2.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/achaemenids/market_b_stall3.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall3.xml
new file mode 100644
index 0000000000..4f9ee298e9
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall3.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall3.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/achaemenids/market_b_stall4.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall4.xml
new file mode 100644
index 0000000000..a5c8c13fcf
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall4.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall4.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/achaemenids/market_b_stall5.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall5.xml
new file mode 100644
index 0000000000..877981c44d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall5.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall5.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/achaemenids/market_b_stall6.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall6.xml
new file mode 100644
index 0000000000..f2f0949a7c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall6.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall6.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/achaemenids/market_b_stall7.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall7.xml
new file mode 100644
index 0000000000..1d0c8e1bf8
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/market_b_stall7.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achaemenid market_B stall">
+      <mesh>props/achae_market_b_stall7.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+          <texture file="structural/achae_struct.png" name="baseTex"/>
+          <texture file="structural/achae_struct_norm.png" name="normTex"/>
+          <texture file="structural/achae_struct_spec.png" name="specTex"/>
+          <texture file="structural/ao/achae_market_b.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/persians/merchant_rail.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/merchant_rail.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/props/structures/persians/merchant_rail.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/merchant_rail.xml
index 468e515d14..ce399adff4 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/merchant_rail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/merchant_rail.xml
@@ -4,9 +4,9 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_merc_rail.dae</mesh>
+      <mesh>structural/achae_merc_rail.dae</mesh>
       <textures>
-        <texture file="structural/pers_merc.dds" name="baseTex"/>
+        <texture file="structural/achae_merc.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/merchant_sail.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/merchant_sail.xml
similarity index 94%
rename from binaries/data/mods/public/art/actors/props/structures/persians/merchant_sail.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/merchant_sail.xml
index 769aa988ca..304309567a 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/merchant_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/merchant_sail.xml
@@ -4,7 +4,7 @@
   <float/>
   <group>
     <variant frequency="1" name="Base">
-      <mesh>props/pers_merc_sail.dae</mesh>
+      <mesh>props/achae_merc_sail.dae</mesh>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/sb1.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/sb1.xml
similarity index 63%
rename from binaries/data/mods/public/art/actors/props/structures/persians/sb1.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/sb1.xml
index 423948c4a0..327d951624 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/sb1.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/sb1.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="persian apadana props">
-      <mesh>props/pers_sb1_props.dae</mesh>
+    <variant frequency="1" name="achaemenid apadana props">
+      <mesh>props/achae_sb1_props.dae</mesh>
       <textures>
-        <texture file="structural/pers_cc_staircase.png" name="baseTex"/>
+        <texture file="structural/achae_cc_staircase.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/stable_horse_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/stable_horse_a.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/structures/persians/stable_horse_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/stable_horse_a.xml
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/stable_horse_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/stable_horse_b.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/structures/persians/stable_horse_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/stable_horse_b.xml
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/stable_horse_c.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/stable_horse_c.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/structures/persians/stable_horse_c.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/stable_horse_c.xml
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/storehouse.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/storehouse.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/props/structures/persians/storehouse.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/storehouse.xml
index 13d6ab24d6..b3445e713c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/storehouse.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/storehouse.xml
@@ -3,18 +3,18 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="props_1">
-      <mesh>props/pers_storehouse_1.dae</mesh>
+      <mesh>props/achae_storehouse_1.dae</mesh>
     </variant>
     <variant frequency="1" name="props_2">
-      <mesh>props/pers_storehouse_2.dae</mesh>
+      <mesh>props/achae_storehouse_2.dae</mesh>
     </variant>
   </group>
   <group>
     <variant>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_a.xml
similarity index 74%
rename from binaries/data/mods/public/art/actors/props/structures/persians/tachara_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_a.xml
index 4e86c54995..33f3dfeec6 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_a.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="props_a">
-      <mesh>props/pers_civic_props_a.dae</mesh>
+      <mesh>props/achae_civic_props_a.dae</mesh>
       <textures>
-        <texture file="structural/pers_cc_staircase.png" name="baseTex"/>
+        <texture file="structural/achae_cc_staircase.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_b.xml
similarity index 50%
rename from binaries/data/mods/public/art/actors/props/structures/persians/tachara_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_b.xml
index 39b85065c7..eadba34400 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_b.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="props_b">
-      <mesh>props/pers_civic_props_b.dae</mesh>
+      <mesh>props/achae_civic_props_b.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_a.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_a.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_a.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_a.xml
index 6916241897..0f48a62134 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_a.xml
@@ -2,8 +2,8 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="pers civic plants a">
-      <mesh>props/pers_civic_shrub_a.dae</mesh>
+    <variant frequency="1" name="achae civic plants a">
+      <mesh>props/achae_civic_shrub_a.dae</mesh>
       <textures>
       	<texture file="gaia/shrub_tropic_a.png" name="baseTex"/>
         <texture file="gaia/shrub_tropic_a_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_b.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_b.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_b.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_b.xml
index 042c24d1a3..717f36e574 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_b.xml
@@ -2,8 +2,8 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="pers civic plants b">
-      <mesh>props/pers_civic_shrub_b.dae</mesh>
+    <variant frequency="1" name="achae civic plants b">
+      <mesh>props/achae_civic_shrub_b.dae</mesh>
       <textures>
       	<texture file="gaia/shrub_tropic_b.png" name="baseTex"/>
         <texture file="gaia/shrub_tropic_b_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_c.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_c.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_c.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_c.xml
index e22f60d825..a603a669c0 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_c.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_c.xml
@@ -2,8 +2,8 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="pers civic plants c">
-      <mesh>props/pers_civic_shrub_c.dae</mesh>
+    <variant frequency="1" name="achae civic plants c">
+      <mesh>props/achae_civic_shrub_c.dae</mesh>
       <textures>
       	<texture file="gaia/shrub_tropic_palm.png" name="baseTex"/>
         <texture file="gaia/shrub_tropic_palm_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_d.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_d.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_d.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_d.xml
index aa260d70e9..a96b31c75e 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_d.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/tachara_shrubs_d.xml
@@ -2,8 +2,8 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="pers civic plants d">
-      <mesh>props/pers_civic_shrub_d.dae</mesh>
+    <variant frequency="1" name="achae civic plants d">
+      <mesh>props/achae_civic_shrub_d.dae</mesh>
       <textures>
       	<texture file="gaia/shrub_spikes.png" name="baseTex"/>
         <texture file="gaia/shrub_spikes_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/temple.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/temple.xml
new file mode 100644
index 0000000000..c41f507721
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/temple.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>props/achae_temple_lions.dae</mesh>
+      <textures>
+         <texture file="structural/achae_struct.png" name="baseTex"/>
+         <texture file="structural/achae_struct_norm.png" name="normTex"/>
+         <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_main_sail.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_main_sail.xml
new file mode 100644
index 0000000000..1d11107006
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_main_sail.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant file="others/ships/main_sail_base.xml" name="achaemenid Trireme">
+      <mesh>props/achae_trireme_sail.dae</mesh>
+      <textures>
+       <texture file="props/ptol_sail_norm.png" name="normTex"/>
+       <texture file="props/sail_spec_1.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" file="others/ships/achae_sail_01.xml" name="zoroaster"/>
+    <variant frequency="100" file="others/ships/achae_sail_02.xml" name="royal standard"/>
+    <variant frequency="100" file="others/ships/achae_sail_03.xml" name="standard"/>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/trireme_mast.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_mast.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/structures/persians/trireme_mast.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_mast.xml
index 11ad307cd1..679e68f9ed 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/trireme_mast.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_mast.xml
@@ -4,20 +4,20 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/pers_tri_mast.dae</mesh>
+      <mesh>props/achae_tri_mast.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="trireme-sail-zoroaster">
       <textures>
-        <texture file="props/pers_trireme_sail.dds" name="baseTex"/>
+        <texture file="props/achae_trireme_sail.dds" name="baseTex"/>
         <texture file="props/sail_norm_1.png" name="normTex"/>
         <texture file="props/sail_spec_1.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="trireme-sail-royal standard">
       <textures>
-        <texture file="props/pers_trireme_sail_b.dds" name="baseTex"/>
+        <texture file="props/achae_trireme_sail_b.dds" name="baseTex"/>
         <texture file="props/sail_norm_1.png" name="normTex"/>
         <texture file="props/sail_spec_1.png" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/trireme_oars.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_oars.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/props/structures/persians/trireme_oars.xml
rename to binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_oars.xml
index 24c732fe45..a70a98c56d 100644
--- a/binaries/data/mods/public/art/actors/props/structures/persians/trireme_oars.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/trireme_oars.xml
@@ -4,9 +4,9 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/pers_tri_oars.dae</mesh>
+      <mesh>props/achae_tri_oars.dae</mesh>
       <textures>
-        <texture file="structural/pers_tri.dds" name="baseTex"/>
+        <texture file="structural/achae_tri.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/structures/achaemenids/wall_tower.xml b/binaries/data/mods/public/art/actors/props/structures/achaemenids/wall_tower.xml
new file mode 100644
index 0000000000..761bba022b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/achaemenids/wall_tower.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1">
+      <mesh>props/achae_wall_tower_prop.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml
deleted file mode 100644
index 9f92ad4f33..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="props">
-      <mesh>props/pers_alt_build_01_prop.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_02_prop.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_02_prop.xml
deleted file mode 100644
index 50a9c829f7..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_02_prop.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="base">
-      <mesh>props/pers_alt_build_02_prop.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03_prop.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03_prop.xml
deleted file mode 100644
index 4560a5b236..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03_prop.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian-alt-building-03-prop">
-      <mesh>props/pers_alt_build_03_prop.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05.xml
deleted file mode 100644
index 65a7229a7a..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian-alt-building-05">
-      <mesh>props/pers_alt_build_05.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/alt_building_05_baskets.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/alt_building_05_prop.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </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/persians/alt_building_05_baskets.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/alt_building_05_prop.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05_prop.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05_prop.xml
deleted file mode 100644
index 27189939b3..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_05_prop.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian-alt-building-05-prop">
-      <mesh>props/pers_alt_build_05_prop.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/farmstead_cart.xml b/binaries/data/mods/public/art/actors/props/structures/persians/farmstead_cart.xml
deleted file mode 100644
index 7aaf4085ca..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/farmstead_cart.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian farmstead cart">
-      <mesh>props/pers_farmstead_cart.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_farmstead.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/persians/farmstead_cart_big.xml b/binaries/data/mods/public/art/actors/props/structures/persians/farmstead_cart_big.xml
deleted file mode 100644
index 1d6163f4eb..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/farmstead_cart_big.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian farmstead cart">
-      <mesh>props/pers_farmstead_cart_big.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_farmstead.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/persians/fishship_sail.xml b/binaries/data/mods/public/art/actors/props/structures/persians/fishship_sail.xml
deleted file mode 100644
index b4e71c4aee..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/fishship_sail.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="pers">
-      <mesh>props/pers_fishship_sail.dae</mesh>
-      <animations>
-        <animation file="others/pers_sail_idle.dae" name="idle" speed="100"/>
-        <animation file="others/pers_sail_move.dae" name="Walk" speed="10"/>
-        <animation file="others/pers_sail_move.dae" name="Run" speed="14"/>
-        <animation file="others/pers_sail_move.dae" name="carry_food" speed="10"/>
-        <animation file="others/pers_sail_move.dae" name="carry_fish" speed="10"/>
-      </animations>
-      <textures>
-        <texture file="props/pers_trireme_sail_c.dds" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_b_paintings.xml b/binaries/data/mods/public/art/actors/props/structures/persians/fortress_b_paintings.xml
deleted file mode 100644
index 295460011b..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_b_paintings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>props/pers_fortress_b_paintings.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_paintings.xml b/binaries/data/mods/public/art/actors/props/structures/persians/fortress_paintings.xml
deleted file mode 100644
index 3e19a913bb..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/fortress_paintings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>props/pers_fortress_paintings.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_struct_transp.xml b/binaries/data/mods/public/art/actors/props/structures/persians/gardens_struct_transp.xml
deleted file mode 100644
index 6fdadb7cd2..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/gardens_struct_transp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>structural/pers_gardens_struct_transp.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall1.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall1.xml
deleted file mode 100644
index 5fff7c31b4..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall1.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_a_stall2.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall2.xml
deleted file mode 100644
index e5abd889a6..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall2.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_a_stall3.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall3.xml
deleted file mode 100644
index 3ef5b053a4..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall3.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall3.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_a_stall4.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall4.xml
deleted file mode 100644
index 7a1cb8e15a..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall4.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall4.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_a_stall5.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall5.xml
deleted file mode 100644
index ae55a88cdd..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall5.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall5.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_a_stall6.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall6.xml
deleted file mode 100644
index 34b7613ae6..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall6.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall6.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_a_stall7.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall7.xml
deleted file mode 100644
index f4e941bb8f..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_a_stall7.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_A stall">
-      <mesh>props/pers_market_a_stall7.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_a.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/persians/market_b_stall1.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall1.xml
deleted file mode 100644
index 2dbe1233e5..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall1.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/market_b_stall2.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall2.xml
deleted file mode 100644
index ab632ea109..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall2.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/market_b_stall3.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall3.xml
deleted file mode 100644
index 8231f75a22..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall3.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall3.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/market_b_stall4.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall4.xml
deleted file mode 100644
index 632414f1ce..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall4.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall4.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/market_b_stall5.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall5.xml
deleted file mode 100644
index 4a9dd5ddc4..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall5.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall5.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/market_b_stall6.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall6.xml
deleted file mode 100644
index bb8de43dd4..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall6.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall6.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/market_b_stall7.xml b/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall7.xml
deleted file mode 100644
index 9af8729c39..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/market_b_stall7.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="persian market_B stall">
-      <mesh>props/pers_market_b_stall7.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-          <texture file="structural/pers_struct.png" name="baseTex"/>
-          <texture file="structural/pers_struct_norm.png" name="normTex"/>
-          <texture file="structural/pers_struct_spec.png" name="specTex"/>
-          <texture file="structural/ao/pers_market_b.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/persians/trireme_main_sail.xml b/binaries/data/mods/public/art/actors/props/structures/persians/trireme_main_sail.xml
deleted file mode 100644
index 99b08b4fe2..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/trireme_main_sail.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant file="others/ships/main_sail_base.xml" name="Persian Trireme">
-      <mesh>props/pers_trireme_sail.dae</mesh>
-      <textures>
-       <texture file="props/ptol_sail_norm.png" name="normTex"/>
-       <texture file="props/sail_spec_1.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" file="others/ships/pers_sail_01.xml" name="zoroaster"/>
-    <variant frequency="100" file="others/ships/pers_sail_02.xml" name="royal standard"/>
-    <variant frequency="100" file="others/ships/pers_sail_03.xml" name="standard"/>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/wall_tower.xml b/binaries/data/mods/public/art/actors/props/structures/persians/wall_tower.xml
deleted file mode 100644
index cff538034d..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/persians/wall_tower.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1">
-      <mesh>props/pers_wall_tower_prop.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/pirates/bireme_main_sail.xml b/binaries/data/mods/public/art/actors/props/structures/pirates/bireme_main_sail.xml
index 184827011a..8bc00ddcad 100644
--- a/binaries/data/mods/public/art/actors/props/structures/pirates/bireme_main_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/pirates/bireme_main_sail.xml
@@ -4,7 +4,7 @@
   <float/>
   <group>
     <variant file="others/ships/main_sail_base.xml" name="Pirate Ship Sail">
-      <mesh>props/pers_bireme_sail.dae</mesh>
+      <mesh>props/achae_bireme_sail.dae</mesh>
       <textures>
         <texture file="props/ptol_sail_norm.png" name="normTex"/>
         <texture file="props/sail_spec_1.png" name="specTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_left_bronze.xml b/binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_left_bronze.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_left_bronze.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_left_bronze.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_left_iron.xml b/binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_left_iron.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_left_iron.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_left_iron.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_right_bronze.xml b/binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_right_bronze.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_right_bronze.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_right_bronze.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_right_iron.xml b/binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_right_iron.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/pers_bactrian_arm_right_iron.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_bactrian_arm_right_iron.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/achae_camel_props.xml b/binaries/data/mods/public/art/actors/props/units/achae_camel_props.xml
new file mode 100644
index 0000000000..f9b72990c7
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/achae_camel_props.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="camel prop1">
+      <mesh>props/achae_camel_prop1.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_chariot_e_emblem.xml b/binaries/data/mods/public/art/actors/props/units/achae_chariot_e_emblem.xml
similarity index 73%
rename from binaries/data/mods/public/art/actors/props/units/pers_chariot_e_emblem.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_chariot_e_emblem.xml
index 4a360f6322..daf11ceaac 100644
--- a/binaries/data/mods/public/art/actors/props/units/pers_chariot_e_emblem.xml
+++ b/binaries/data/mods/public/art/actors/props/units/achae_chariot_e_emblem.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/pers_chariot_e_emblem.dae</mesh>
+      <mesh>props/achae_chariot_e_emblem.dae</mesh>
       <textures>
-        <texture file="props/pers_faravahar.png" name="baseTex"/>
+        <texture file="props/achae_faravahar.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_chariot_hero_emblem.xml b/binaries/data/mods/public/art/actors/props/units/achae_chariot_hero_emblem.xml
similarity index 73%
rename from binaries/data/mods/public/art/actors/props/units/pers_chariot_hero_emblem.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_chariot_hero_emblem.xml
index 24d2efddc1..78cc147bbb 100644
--- a/binaries/data/mods/public/art/actors/props/units/pers_chariot_hero_emblem.xml
+++ b/binaries/data/mods/public/art/actors/props/units/achae_chariot_hero_emblem.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/pers_chariot_hero_emblem.dae</mesh>
+      <mesh>props/achae_chariot_hero_emblem.dae</mesh>
       <textures>
-        <texture file="props/pers_symbol.png" name="baseTex"/>
+        <texture file="props/achae_symbol.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_quiver_back.xml b/binaries/data/mods/public/art/actors/props/units/achae_quiver_back.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/props/units/pers_quiver_back.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_quiver_back.xml
index 678deff226..4595b6942a 100644
--- a/binaries/data/mods/public/art/actors/props/units/pers_quiver_back.xml
+++ b/binaries/data/mods/public/art/actors/props/units/achae_quiver_back.xml
@@ -3,18 +3,18 @@
   <castshadow/>
   <group>
     <variant frequency="100">
-      <mesh>props/pers_quiver_back.dae</mesh>
+      <mesh>props/achae_quiver_back.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="quiver light">
       <textures>
-        <texture file="props/pers_quiver_light.png" name="baseTex"/>
+        <texture file="props/achae_quiver_light.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="quiver dark">
       <textures>
-        <texture file="props/pers_quiver_dark.png" name="baseTex"/>
+        <texture file="props/achae_quiver_dark.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_quiver_hip.xml b/binaries/data/mods/public/art/actors/props/units/achae_quiver_hip.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/props/units/pers_quiver_hip.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_quiver_hip.xml
index febf0397f6..f403226fa2 100644
--- a/binaries/data/mods/public/art/actors/props/units/pers_quiver_hip.xml
+++ b/binaries/data/mods/public/art/actors/props/units/achae_quiver_hip.xml
@@ -3,18 +3,18 @@
   <castshadow/>
   <group>
     <variant frequency="100">
-      <mesh>props/pers_quiver_hip.dae</mesh>
+      <mesh>props/achae_quiver_hip.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="quiver light">
       <textures>
-        <texture file="props/pers_quiver_light.png" name="baseTex"/>
+        <texture file="props/achae_quiver_light.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="quiver dark">
       <textures>
-        <texture file="props/pers_quiver_dark.png" name="baseTex"/>
+        <texture file="props/achae_quiver_dark.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_quiver_xerxes.xml b/binaries/data/mods/public/art/actors/props/units/achae_quiver_xerxes.xml
similarity index 89%
rename from binaries/data/mods/public/art/actors/props/units/pers_quiver_xerxes.xml
rename to binaries/data/mods/public/art/actors/props/units/achae_quiver_xerxes.xml
index cf2246c382..6d1a2ce9df 100644
--- a/binaries/data/mods/public/art/actors/props/units/pers_quiver_xerxes.xml
+++ b/binaries/data/mods/public/art/actors/props/units/achae_quiver_xerxes.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100">
-      <mesh>props/pers_quiver_back.dae</mesh>
+      <mesh>props/achae_quiver_back.dae</mesh>
       <textures>
         <texture file="props/quiver_xerxes.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_iron.xml b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_bronze.xml
similarity index 94%
rename from binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_iron.xml
rename to binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_bronze.xml
index c41d019f5f..7666044d4a 100644
--- a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_iron.xml
+++ b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_bronze.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/helmet/pers_neckguard.dae</mesh>
+      <mesh>props/helmet/achae_neckguard.dae</mesh>
       <textures>
-        <texture file="props/helmet/pers_neckguard_iron.png" name="baseTex"/>
-        <texture file="props/helmet/pers_neckguard_norm.png" name="normTex"/>
-        <texture file="props/helmet/pers_neckguard_spec.png" name="specTex"/>
+        <texture file="props/helmet/achae_neckguard_bronze.png" name="baseTex"/>
+        <texture file="props/helmet/achae_neckguard_norm.png" name="normTex"/>
+        <texture file="props/helmet/achae_neckguard_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_iron_archer.xml b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_bronze_archer.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_iron_archer.xml
rename to binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_bronze_archer.xml
index e5a9ea1729..90dc41babe 100644
--- a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_iron_archer.xml
+++ b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_bronze_archer.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_archer_chariot_ready.xml" frequency="100" name="Base">
-      <mesh>props/helmet/pers_neckguard.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_neckguard_iron.png" name="baseTex"/>
-        <texture file="props/helmet/pers_neckguard_norm.png" name="normTex"/>
-        <texture file="props/helmet/pers_neckguard_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_ranged_archer_hip.xml"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant name="carry_meat"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_archer_chariot_ready.xml" frequency="100" name="Base">
+      <mesh>props/helmet/achae_neckguard.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_neckguard_bronze.png" name="baseTex"/>
+        <texture file="props/helmet/achae_neckguard_norm.png" name="normTex"/>
+        <texture file="props/helmet/achae_neckguard_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_archer_hip.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant name="carry_meat"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_bronze.xml b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_iron.xml
similarity index 94%
rename from binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_bronze.xml
rename to binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_iron.xml
index 0cfd150932..de0de55981 100644
--- a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_bronze.xml
+++ b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_iron.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/helmet/pers_neckguard.dae</mesh>
+      <mesh>props/helmet/achae_neckguard.dae</mesh>
       <textures>
-        <texture file="props/helmet/pers_neckguard_bronze.png" name="baseTex"/>
-        <texture file="props/helmet/pers_neckguard_norm.png" name="normTex"/>
-        <texture file="props/helmet/pers_neckguard_spec.png" name="specTex"/>
+        <texture file="props/helmet/achae_neckguard_iron.png" name="baseTex"/>
+        <texture file="props/helmet/achae_neckguard_norm.png" name="normTex"/>
+        <texture file="props/helmet/achae_neckguard_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_bronze_archer.xml b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_iron_archer.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_bronze_archer.xml
rename to binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_iron_archer.xml
index 5acea6cda3..81f9e53308 100644
--- a/binaries/data/mods/public/art/actors/props/units/armor/pers_neckguard_bronze_archer.xml
+++ b/binaries/data/mods/public/art/actors/props/units/armor/achae_neckguard_iron_archer.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_archer_chariot_ready.xml" frequency="100" name="Base">
-      <mesh>props/helmet/pers_neckguard.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_neckguard_bronze.png" name="baseTex"/>
-        <texture file="props/helmet/pers_neckguard_norm.png" name="normTex"/>
-        <texture file="props/helmet/pers_neckguard_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_ranged_archer_hip.xml"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant name="carry_meat"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_archer_chariot_ready.xml" frequency="100" name="Base">
+      <mesh>props/helmet/achae_neckguard.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_neckguard_iron.png" name="baseTex"/>
+        <texture file="props/helmet/achae_neckguard_norm.png" name="normTex"/>
+        <texture file="props/helmet/achae_neckguard_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_archer_hip.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant name="carry_meat"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/pers_hair.xml b/binaries/data/mods/public/art/actors/props/units/heads/achae_hair.xml
similarity index 73%
rename from binaries/data/mods/public/art/actors/props/units/heads/pers_hair.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/achae_hair.xml
index fc479e3243..99d7b30029 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/pers_hair.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/achae_hair.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/helmet/pers_hair.dae</mesh>
+      <mesh>props/helmet/achae_hair.dae</mesh>
       <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/pers_hair_xerxes.xml b/binaries/data/mods/public/art/actors/props/units/heads/achae_hair_xerxes.xml
similarity index 89%
rename from binaries/data/mods/public/art/actors/props/units/heads/pers_hair_xerxes.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/achae_hair_xerxes.xml
index 5d21d8e553..4532ae6944 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/pers_hair_xerxes.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/achae_hair_xerxes.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/helmet/pers_hair.dae</mesh>
+      <mesh>props/helmet/achae_hair.dae</mesh>
       <textures>
         <texture file="props/head/xerxes.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_a.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_a.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_a.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_a.xml
index 6dbea95118..59907882da 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_a.xml
@@ -2,68 +2,68 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="2" name="face-beard-small-a">
-      <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="face-beard-small-b">
-      <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="face-beard-large-a">
-      <mesh>props/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="face-beard-large-b">
-      <mesh>props/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-beard-wide-a">
-      <mesh>props/head_beard_wide.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-beard-wide-b">
-      <mesh>props/head_beard_wide.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-scrubby-i">
-      <mesh>props/dude_head.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_i.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="face-beard-large-j">
-      <mesh>props/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_j.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-beard-small-j">
-      <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_j.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
+    <variant frequency="100" name="Base">
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="2" name="face-beard-small-a">
+      <mesh>props/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="face-beard-small-b">
+      <mesh>props/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="face-beard-large-a">
+      <mesh>props/head_beard_large.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="face-beard-large-b">
+      <mesh>props/head_beard_large.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-beard-wide-a">
+      <mesh>props/head_beard_wide.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-beard-wide-b">
+      <mesh>props/head_beard_wide.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-scrubby-i">
+      <mesh>props/dude_head.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_i.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="face-beard-large-j">
+      <mesh>props/head_beard_large.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_j.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-beard-small-j">
+      <mesh>props/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_j.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>objectcolor_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_b.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_b.xml
similarity index 53%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_b.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_b.xml
index 29fb3f7de9..d0841b01ad 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_b.xml
@@ -2,34 +2,30 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Head Mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/dude_head.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Persian Face a">
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian Face b">
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian Face i">
-      <textures>
-        <texture file="props/head/pers_face_i.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Achaemenid Face a">
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Achaemenid Face b">
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Achaemenid Face i">
+      <textures>
+        <texture file="props/head/achae_face_i.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>objectcolor_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_darius.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_darius.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_darius.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_darius.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_elite.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_elite.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_elite.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_elite.xml
index e8b8f8ccc5..71b321a5e2 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_elite.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_elite.xml
@@ -2,38 +2,27 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="3" name="head_beard">
-      <mesh>props/new/head_beard.dae</mesh>
+    <variant frequency="100" name="Base">
       <textures>
         <texture file="props/head/xerxes.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="head_beard_small">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/xerxes.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="head_beard_large">
-      <mesh>props/new/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/xerxes.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="head_beard_wide">
-      <mesh>props/new/head_beard_wide.dae</mesh>
-      <textures>
-        <texture file="props/head/xerxes.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="3" name="head_beard">
+      <mesh>props/new/head_beard.dae</mesh>
+    </variant>
+    <variant frequency="3" name="head_beard_small">
+      <mesh>props/new/head_beard_small.dae</mesh>
+    </variant>
+    <variant frequency="3" name="head_beard_large">
+      <mesh>props/new/head_beard_large.dae</mesh>
+    </variant>
+    <variant frequency="3" name="head_beard_wide">
+      <mesh>props/new/head_beard_wide.dae</mesh>
+    </variant>
+  </group>
   <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_fem_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_fem_1.xml
similarity index 83%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_fem_1.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_fem_1.xml
index 676a791b5f..b562505076 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_fem_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_fem_1.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant frequency="100" name="hair-bun">
       <mesh>props/dudette_head.dae</mesh>
@@ -12,12 +20,12 @@
   <group>
     <variant frequency="1" name="face-a">
       <textures>
-        <texture file="props/head/pers_fem_a.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_a.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-b">
       <textures>
-        <texture file="props/head/pers_fem_b.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_b.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-cin-kart">
@@ -28,15 +36,7 @@
   </group>
   <group>
     <variant frequency="5" name="hair-black">
-      <color>0 0 0</color>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
+      <color>5 5 5</color>
     </variant>
   </group>
   <material>objectcolor_norm_spec.xml</material>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_hero_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_hero_1.xml
similarity index 89%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_hero_1.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_hero_1.xml
index 78add3a791..f924346c03 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_hero_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_hero_1.xml
@@ -11,5 +11,5 @@
       </textures>
     </variant>
   </group>
-  <material>objectcolor_norm_spec.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara.xml
similarity index 60%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara.xml
index 47a4201a27..df18ee8441 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara.xml
@@ -2,38 +2,35 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="3" name="tiara-face-c">
+    <variant frequency="100" name="Base">
       <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_c.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="tiara-face-d">
-      <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_d.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="tiara-face-h-mouth">
-      <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_h_mouth.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="tiara-face-e">
-      <mesh>props/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_e.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
-  <material>objectcolor_norm_spec.xml</material>
+  <group>
+    <variant frequency="3" name="tiara-face-c">
+      <textures>
+        <texture file="props/head/achae_face_c.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="tiara-face-d">
+      <textures>
+        <texture file="props/head/achae_face_d.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="tiara-face-h-mouth">
+      <textures>
+        <texture file="props/head/achae_face_h_mouth.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="tiara-face-e">
+      <textures>
+        <texture file="props/head/achae_face_e.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara_mouth.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara_mouth.xml
similarity index 75%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara_mouth.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara_mouth.xml
index 983ece5e2c..83a8cf6370 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara_mouth.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara_mouth.xml
@@ -5,11 +5,11 @@
     <variant frequency="1" name="tiara-face-h-mouth">
       <mesh>props/head_beard_small.dae</mesh>
       <textures>
-        <texture file="props/head/pers_face_h_mouth.dds" name="baseTex"/>
+        <texture file="props/head/achae_face_h_mouth.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
-  <material>objectcolor_norm_spec.xml</material>
+  <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara_y.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara_y.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara_y.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara_y.xml
index 065a50ae7c..53be46418a 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_tiara_y.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_tiara_y.xml
@@ -2,29 +2,25 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/head_beard_small.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="tiara-yellow-f">
-      <textures>
-        <texture file="props/head/pers_face_f_y.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="tiara-yellow-g">
-      <textures>
-        <texture file="props/head/pers_face_g_y.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="tiara-yellow-f">
+      <textures>
+        <texture file="props/head/achae_face_f_y.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="tiara-yellow-g">
+      <textures>
+        <texture file="props/head/achae_face_g_y.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_pers_xerxes.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_achae_xerxes.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_pers_xerxes.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_achae_xerxes.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_kart_fem_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_kart_fem_1.xml
index 50c38340fe..fec1dda27b 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_kart_fem_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_kart_fem_1.xml
@@ -15,12 +15,12 @@
   <group>
     <variant frequency="1" name="face-a">
       <textures>
-        <texture file="props/head/pers_fem_a.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_a.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-b">
       <textures>
-        <texture file="props/head/pers_fem_b.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_b.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-cin-kart">
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_1.xml
index 62cb1e469b..5a9bb4f8f4 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_1.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>props/helmet/maur_earrings_fem_1.dae</mesh>
       <textures>
-        <texture file="props/helmet/old/pers_f1.dds" name="baseTex"/>
+        <texture file="props/helmet/old/achae_f1.dds" name="baseTex"/>
         <texture name="specTex" file="null_white.dds"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_2.xml b/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_2.xml
index af14b86d59..fc28cb67e2 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_2.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/maur_earrings_2.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>props/helmet/maur_earrings_round_1.dae</mesh>
       <textures>
-        <texture file="props/helmet/old/pers_f1.dds" name="baseTex"/>
+        <texture file="props/helmet/old/achae_f1.dds" name="baseTex"/>
         <texture name="specTex" file="null_white.dds"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_a.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_a.xml
similarity index 72%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_a.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_a.xml
index 08ed2640b1..17a064e8e8 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_a.xml
@@ -2,68 +2,68 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="2" name="face-beard-small-a">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="face-beard-small-b">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="face-beard-large-a">
-      <mesh>props/new/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="face-beard-large-b">
-      <mesh>props/new/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-beard-wide-a">
-      <mesh>props/new/head_beard_wide.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-beard-wide-b">
-      <mesh>props/new/head_beard_wide.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-scrubby-i">
-      <mesh>props/new/dude_head.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_i.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="face-beard-large-j">
-      <mesh>props/new/head_beard_large.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_j.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face-beard-small-j">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_j.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
+    <variant frequency="100" name="Base">
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="2" name="face-beard-small-a">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="face-beard-small-b">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="face-beard-large-a">
+      <mesh>props/new/head_beard_large.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="face-beard-large-b">
+      <mesh>props/new/head_beard_large.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-beard-wide-a">
+      <mesh>props/new/head_beard_wide.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-beard-wide-b">
+      <mesh>props/new/head_beard_wide.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-scrubby-i">
+      <mesh>props/new/dude_head.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_i.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="face-beard-large-j">
+      <mesh>props/new/head_beard_large.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_j.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="face-beard-small-j">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_j.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>objectcolor_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_b.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_b.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_b.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_b.xml
index 8c34d6c509..057854e458 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_b.xml
@@ -2,34 +2,30 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Head Mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/new/dude_head.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Persian Face a">
-      <textures>
-        <texture file="props/head/pers_face_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian Face b">
-      <textures>
-        <texture file="props/head/pers_face_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian Face i">
-      <textures>
-        <texture file="props/head/pers_face_i.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Achaemenid Face a">
+      <textures>
+        <texture file="props/head/achae_face_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Achaemenid Face b">
+      <textures>
+        <texture file="props/head/achae_face_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Achaemenid Face i">
+      <textures>
+        <texture file="props/head/achae_face_i.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>objectcolor_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_darius.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_darius.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_darius.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_darius.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_elite.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_elite.xml
similarity index 96%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_elite.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_elite.xml
index e8b8f8ccc5..0e4a4e2ace 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_elite.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_elite.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant frequency="3" name="head_beard">
       <mesh>props/new/head_beard.dae</mesh>
@@ -27,13 +35,5 @@
       </textures>
     </variant>
   </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_fem_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_fem_1.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_fem_1.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_fem_1.xml
index 5fde03b691..336b405b13 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_fem_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_fem_1.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant frequency="50" name="hair-bun">
       <mesh>props/new/dudette_head_a.dae</mesh>
@@ -15,12 +23,12 @@
   <group>
     <variant frequency="1" name="face-a">
       <textures>
-        <texture file="props/head/pers_fem_a.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_a.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-b">
       <textures>
-        <texture file="props/head/pers_fem_b.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_b.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-cin-kart">
@@ -34,13 +42,5 @@
       <color>0 0 0</color>
     </variant>
   </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>objectcolor_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_hero_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_hero_1.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_hero_1.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_hero_1.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara.xml
similarity index 73%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara.xml
index a473e8e343..7874ab2f94 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
-  <group>
-    <variant frequency="3" name="tiara-face-c">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_c.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="tiara-face-d">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_d.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="tiara-face-h-mouth">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_h_mouth.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="tiara-face-e">
-      <mesh>props/new/head_beard_small.dae</mesh>
-      <textures>
-        <texture file="props/head/pers_face_e.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
+  <group >
+    <variant frequency="100" name="Base">
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="3" name="tiara-face-c">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_c.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="tiara-face-d">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_d.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="tiara-face-h-mouth">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_h_mouth.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="tiara-face-e">
+      <mesh>props/new/head_beard_small.dae</mesh>
+      <textures>
+        <texture file="props/head/achae_face_e.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>objectcolor_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara_mouth.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara_mouth.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara_mouth.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara_mouth.xml
index c33c8b24f2..c56f11a8a5 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara_mouth.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara_mouth.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="tiara-face-h-mouth">
       <mesh>props/new/head_beard_small.dae</mesh>
       <textures>
-        <texture file="props/head/pers_face_h_mouth.dds" name="baseTex"/>
+        <texture file="props/head/achae_face_h_mouth.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara_y.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara_y.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara_y.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara_y.xml
index 938f7bb535..67de5372b8 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_tiara_y.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_tiara_y.xml
@@ -2,29 +2,25 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/new/head_beard_small.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="tiara-yellow-f">
-      <textures>
-        <texture file="props/head/pers_face_f_y.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="tiara-yellow-g">
-      <textures>
-        <texture file="props/head/pers_face_g_y.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="tiara-yellow-f">
+      <textures>
+        <texture file="props/head/achae_face_f_y.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="tiara-yellow-g">
+      <textures>
+        <texture file="props/head/achae_face_g_y.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_xerxes.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_xerxes.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/heads/new/head_pers_xerxes.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/new/head_achae_xerxes.xml
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/new/head_kart_fem_1.xml b/binaries/data/mods/public/art/actors/props/units/heads/new/head_kart_fem_1.xml
index 047ed5c108..7ae703b8bf 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/new/head_kart_fem_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/new/head_kart_fem_1.xml
@@ -15,12 +15,12 @@
   <group>
     <variant frequency="1" name="face-a">
       <textures>
-        <texture file="props/head/pers_fem_a.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_a.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-b">
       <textures>
-        <texture file="props/head/pers_fem_b.dds" name="baseTex"/>
+        <texture file="props/head/achae_fem_b.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="face-cin-kart">
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/placeholder_head_pers.xml b/binaries/data/mods/public/art/actors/props/units/heads/placeholder_head_achae.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/units/heads/placeholder_head_pers.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/placeholder_head_achae.xml
index 82e57e2495..a353508be3 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/placeholder_head_pers.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/placeholder_head_achae.xml
@@ -3,11 +3,9 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <animations/>
       <mesh>props/head_goatee.dae</mesh>
-      <props/>
       <textures>
-        <texture file="props/plac_head_pers.dds" name="baseTex"/>
+        <texture file="props/plac_head_achae.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_conical_a1.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_conical_a1.xml
similarity index 52%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_conical_a1.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_conical_a1.xml
index e71140cf42..2a1aab479c 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_conical_a1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_conical_a1.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Base">
-      <mesh>props/helmet/pers_conical_a.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_conical_01_bronze.png" name="baseTex"/>
-        <texture file="props/helmet/pers_conical_01_norm.png" name="normTex"/>
-        <texture file="props/helmet/pers_conical_01_bronze_spec.png" name="specTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/helmets/props/hele_boeotian_hair.xml" attachpoint="hair"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="Base">
+      <mesh>props/helmet/achae_conical_a.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_conical_01_bronze.png" name="baseTex"/>
+        <texture file="props/helmet/achae_conical_01_norm.png" name="normTex"/>
+        <texture file="props/helmet/achae_conical_01_bronze_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/helmets/props/hele_boeotian_hair.xml" attachpoint="hair"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/achae_conical_b1.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_conical_b1.xml
new file mode 100644
index 0000000000..211d2a6991
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_conical_b1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="Base">
+      <mesh>props/helmet/achae_conical_a.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_conical_01_bronze.png" name="baseTex"/>
+        <texture file="props/helmet/achae_conical_01_norm.png" name="normTex"/>
+        <texture file="props/helmet/achae_conical_01_bronze_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_crown.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_crown.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_crown.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_crown.xml
index 878fde5965..8c434beb8c 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_crown.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_crown.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="persian crown">
-      <mesh>props/helmet/old/pers_crown.dae</mesh>
+    <variant name="Achaemenid crown">
+      <mesh>props/helmet/old/achae_crown.dae</mesh>
       <textures>
-        <texture file="props/helmet/old/pers_crown.png" name="baseTex"/>
+        <texture file="props/helmet/old/achae_crown.png" name="baseTex"/>
         <texture name="specTex" file="null_white.dds"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose.xml
new file mode 100644
index 0000000000..f8f8a4e841
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/helmet/achae_kidaris_loose.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_kidaris_1.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_all.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_all.xml
similarity index 63%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_all.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_all.xml
index 0fc33b25ef..2ccf46afcf 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_all.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_all.xml
@@ -2,34 +2,30 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="base">
-      <mesh>props/helmet/pers_kidaris_loose.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Kidaris White">
-      <textures>
-        <texture file="props/helmet/pers_kidaris_1.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Kidaris Tan">
-      <textures>
-        <texture file="props/helmet/pers_kidaris_2.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Kidaris Yellow">
-      <textures>
-        <texture file="props/helmet/pers_kidaris_3.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
+    <variant frequency="100" name="Base">
+      <mesh>props/helmet/achae_kidaris_loose.dae</mesh>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Kidaris White">
+      <textures>
+        <texture file="props/helmet/achae_kidaris_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Kidaris Tan">
+      <textures>
+        <texture file="props/helmet/achae_kidaris_2.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Kidaris Yellow">
+      <textures>
+        <texture file="props/helmet/achae_kidaris_3.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>no_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_tan.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_tan.xml
new file mode 100644
index 0000000000..b5d3d064cd
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_tan.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/helmet/achae_kidaris_loose.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_kidaris_2.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_yellow.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_yellow.xml
new file mode 100644
index 0000000000..3b1822698d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_loose_yellow.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/helmet/achae_kidaris_loose.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_kidaris_3.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_royal_loose.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_royal_loose.xml
similarity index 72%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_royal_loose.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_royal_loose.xml
index 2da1ddbe40..82ad36b102 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_royal_loose.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_royal_loose.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant name="Royal Kidaris Loose">
-      <mesh>props/helmet/pers_kidaris_royal_loose.dae</mesh>
+      <mesh>props/helmet/achae_kidaris_royal_loose.dae</mesh>
       <textures>
-        <texture file="props/helmet/pers_kidaris_hero.png" name="baseTex"/>
+        <texture file="props/helmet/achae_kidaris_hero.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_royal_tied.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_royal_tied.xml
similarity index 72%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_royal_tied.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_royal_tied.xml
index 8b9ffe4680..76a6f359c1 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_royal_tied.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_royal_tied.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant name="Royal Kidaris Tied">
-      <mesh>props/helmet/pers_kidaris_royal_tied.dae</mesh>
+      <mesh>props/helmet/achae_kidaris_royal_tied.dae</mesh>
       <textures>
-        <texture file="props/helmet/pers_kidaris_hero.png" name="baseTex"/>
+        <texture file="props/helmet/achae_kidaris_hero.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied.xml
index b4332d09af..1023c89b65 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/helmet/pers_kidaris_loose.dae</mesh>
+      <mesh>props/helmet/achae_kidaris_tied.dae</mesh>
       <textures>
-        <texture file="props/helmet/pers_kidaris_1.png" name="baseTex"/>
+        <texture file="props/helmet/achae_kidaris_1.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_tan.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied_tan.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_tan.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied_tan.xml
index cbb2afcf1f..a210dd039f 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_tan.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied_tan.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>props/helmet/pers_kidaris_loose.dae</mesh>
+      <mesh>props/helmet/achae_kidaris_tied.dae</mesh>
       <textures>
-        <texture file="props/helmet/pers_kidaris_2.png" name="baseTex"/>
+        <texture file="props/helmet/achae_kidaris_2.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied_yellow.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied_yellow.xml
new file mode 100644
index 0000000000..84f5715905
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_kidaris_tied_yellow.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/helmet/achae_kidaris_tied.dae</mesh>
+      <textures>
+        <texture file="props/helmet/achae_kidaris_3.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_pilos_crested.xml b/binaries/data/mods/public/art/actors/props/units/helmets/achae_pilos_crested.xml
similarity index 90%
rename from binaries/data/mods/public/art/actors/props/units/helmets/pers_pilos_crested.xml
rename to binaries/data/mods/public/art/actors/props/units/helmets/achae_pilos_crested.xml
index 987eebaf39..67c4c8656a 100644
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_pilos_crested.xml
+++ b/binaries/data/mods/public/art/actors/props/units/helmets/achae_pilos_crested.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Pilos-01">
-      <mesh>props/helmet/pers_conical_b.dae</mesh>
-      <props>
-        <prop actor="props/units/helmets/props/hele_crest_pilos_small_bronze_01.xml" attachpoint="crest_transversal"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Bronze">
-      <textures>
-        <texture file="props/helmet/hele_pilos_01_bronze.png" name="baseTex"/>
-        <texture file="props/helmet/hele_pilos_01_norm.png" name="normTex"/>
-        <texture file="props/helmet/hele_pilos_01_bronze_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="Pilos-01">
+      <mesh>props/helmet/achae_conical_b.dae</mesh>
+      <props>
+        <prop actor="props/units/helmets/props/hele_crest_pilos_small_bronze_01.xml" attachpoint="crest_transversal"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Bronze">
+      <textures>
+        <texture file="props/helmet/hele_pilos_01_bronze.png" name="baseTex"/>
+        <texture file="props/helmet/hele_pilos_01_norm.png" name="normTex"/>
+        <texture file="props/helmet/hele_pilos_01_bronze_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_conical_b1.xml b/binaries/data/mods/public/art/actors/props/units/helmets/pers_conical_b1.xml
deleted file mode 100644
index 12e861e89c..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_conical_b1.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="Base">
-      <mesh>props/helmet/pers_conical_a.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_conical_01_bronze.png" name="baseTex"/>
-        <texture file="props/helmet/pers_conical_01_norm.png" name="normTex"/>
-        <texture file="props/helmet/pers_conical_01_bronze_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_yellow.xml b/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_yellow.xml
deleted file mode 100644
index db4b0a9f32..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_loose_yellow.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/helmet/pers_kidaris_loose.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_kidaris_3.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied.xml b/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied.xml
deleted file mode 100644
index 3f6f501262..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/helmet/pers_kidaris_tied.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_kidaris_1.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied_tan.xml b/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied_tan.xml
deleted file mode 100644
index a15f3a71c9..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied_tan.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/helmet/pers_kidaris_tied.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_kidaris_2.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied_yellow.xml b/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied_yellow.xml
deleted file mode 100644
index 65c0dd44c8..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/helmets/pers_kidaris_tied_yellow.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/helmet/pers_kidaris_tied.dae</mesh>
-      <textures>
-        <texture file="props/helmet/pers_kidaris_3.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/pers_camel_props.xml b/binaries/data/mods/public/art/actors/props/units/pers_camel_props.xml
deleted file mode 100644
index 0cd5134ec6..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/pers_camel_props.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="camel prop1">
-      <mesh>props/pers_camel_prop1.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/quivers/achae_back.xml b/binaries/data/mods/public/art/actors/props/units/quivers/achae_back.xml
new file mode 100644
index 0000000000..7580170d1c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/quivers/achae_back.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="quiver back">
+      <mesh>props/quivers/achae_back.dae</mesh>
+      <props>
+        <prop actor="props/units/weapons/achae_quiver_arrows.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="props/quivers/achae_back.png" name="baseTex"/>
+        <texture file="props/quivers/achae_back_norm.png" name="normTex"/>
+        <texture file="props/quivers/achae_back_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/quivers/pers_back.xml b/binaries/data/mods/public/art/actors/props/units/quivers/pers_back.xml
deleted file mode 100644
index 433759472b..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/quivers/pers_back.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="quiver back">
-      <mesh>props/quivers/pers_back.dae</mesh>
-      <props>
-        <prop actor="props/units/weapons/pers_quiver_arrows.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="props/quivers/pers_back.png" name="baseTex"/>
-        <texture file="props/quivers/pers_back_norm.png" name="normTex"/>
-        <texture file="props/quivers/pers_back_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_back_curved_iron.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_back_curved_iron.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_back_curved_iron.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_back_curved_iron.xml
index e0a2adcb0e..d5b5299efd 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_back_curved_iron.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_back_curved_iron.xml
@@ -5,9 +5,9 @@
     <variant>
       <mesh>props/shield/per_back_curved.dae</mesh>
       <textures>
-        <texture file="props/pers_back_shield_01_iron.png" name="baseTex"/>
-        <texture file="props/pers_back_shield_01_spec.png" name="specTex"/>
-        <texture file="props/pers_back_shield_01_norm.png" name="normTex"/>
+        <texture file="props/achae_back_shield_01_iron.png" name="baseTex"/>
+        <texture file="props/achae_back_shield_01_spec.png" name="specTex"/>
+        <texture file="props/achae_back_shield_01_norm.png" name="normTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_buckler_1.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_buckler_1.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_buckler_1.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_buckler_1.xml
index 9ea4c0a4da..aeeec169c7 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_buckler_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_buckler_1.xml
@@ -12,14 +12,14 @@
   <group>
     <variant frequency="1" name="shield-bronze-A">
       <textures>
-        <texture file="props/shield/pers_round_a.dds" name="baseTex"/>
+        <texture file="props/shield/achae_round_a.dds" name="baseTex"/>
         <texture name="specTex" file="null_white.dds"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="shield-bronze-B">
       <textures>
-        <texture file="props/shield/pers_round_b.dds" name="baseTex"/>
+        <texture file="props/shield/achae_round_b.dds" name="baseTex"/>
         <texture name="specTex" file="null_white.dds"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a.xml
index 3fc275c7f2..cfcf760d6d 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a.xml
@@ -2,17 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="achae_pelta_b">
       <mesh>props/shield/pelta_a_f.dae</mesh>
       <props>
         <prop actor="props/units/shields/pelta_a_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers-pelta-b">
       <textures>
-        <texture file="props/shield/pers_pelta_b.dds" name="baseTex"/>
+        <texture file="props/shield/achae_pelta_b.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a_b_reverse.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a_b_reverse.xml
similarity index 66%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a_b_reverse.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a_b_reverse.xml
index 788ac3b4f6..769e8b72af 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a_b_reverse.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a_b_reverse.xml
@@ -3,14 +3,10 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/pelta_pers_back_a_f.dae</mesh>
+      <mesh>props/shield/pelta_achae_back_a_f.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pers_pelta_a_back_reverse.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/achae_pelta_a_back_reverse.xml" attachpoint="root"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers-pelta-b">
       <textures>
         <texture file="props/shield/hele_pelta_i.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a_back_reverse.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a_back_reverse.xml
similarity index 67%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a_back_reverse.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a_back_reverse.xml
index b5b8c2a7a7..ae5e334038 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_a_back_reverse.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_a_back_reverse.xml
@@ -3,33 +3,29 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/shield/pelta_pers_back_a_b.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="shield b">
-      <textures>
-        <texture file="props/shield/pers_pelta_b.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield e">
-      <textures>
-        <texture file="props/shield/pers_pelta_e.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield f">
-      <textures>
-        <texture file="props/shield/pers_pelta_f.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
+      <mesh>props/shield/pelta_achae_back_a_b.dae</mesh>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="shield b">
+      <textures>
+        <texture file="props/shield/achae_pelta_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield e">
+      <textures>
+        <texture file="props/shield/achae_pelta_e.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield f">
+      <textures>
+        <texture file="props/shield/achae_pelta_f.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_basic.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_basic.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_basic.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_basic.xml
index 09d2103558..8cac837c82 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_basic.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_basic.xml
@@ -2,17 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="achae_pelta_d">
       <mesh>props/shield/pelta_b_f.dae</mesh>
       <props>
         <prop actor="props/units/shields/pelta_b_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers-pelta-d">
       <textures>
-        <texture file="props/shield/pers_pelta_d.dds" name="baseTex"/>
+        <texture file="props/shield/achae_pelta_d.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e.xml
index 489f39b8e5..22a9cf7584 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e.xml
@@ -2,17 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="achae_pelta_c">
       <mesh>props/shield/pelta_b_f.dae</mesh>
       <props>
         <prop actor="props/units/shields/pelta_b_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers-pelta-c">
       <textures>
-        <texture file="props/shield/pers_pelta_c.dds" name="baseTex"/>
+        <texture file="props/shield/achae_pelta_c.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e_back_reverse.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e_back_reverse.xml
new file mode 100644
index 0000000000..25bc7bdfa3
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e_back_reverse.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="achae_pelta_c">
+      <mesh>props/shield/pelta_achae_back_b_b.dae</mesh>
+      <textures>
+        <texture file="props/shield/achae_pelta_c.dds" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e_reverse.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e_reverse.xml
similarity index 60%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e_reverse.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e_reverse.xml
index 897d87a722..3b82a3768e 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e_reverse.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_pelta_e_reverse.xml
@@ -2,15 +2,11 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
-      <mesh>props/shield/pelta_pers_back_b_f.dae</mesh>
+    <variant frequency="1" name="hele_pelta_i">
+      <mesh>props/shield/pelta_achae_back_b_f.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pers_pelta_e_back_reverse.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/achae_pelta_e_back_reverse.xml" attachpoint="root"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers-pelta-c">
       <textures>
         <texture file="props/shield/hele_pelta_i.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_round_kardakes.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_round_kardakes.xml
similarity index 57%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_round_kardakes.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_round_kardakes.xml
index a38753a9df..d92e9a0173 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_round_kardakes.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_round_kardakes.xml
@@ -2,26 +2,26 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="100" name="Base">
       <mesh>props/shield/aspis_sm_f.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_back.xml" attachpoint="root"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="shield-pers-aspis-1">
       <textures>
-        <texture file="props/shield/pers_aspis_1.png" name="baseTex"/>
         <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="shield-pers-aspis-2">
+  </group>
+  <group>
+    <variant frequency="1" name="achae_aspis_1">
       <textures>
-        <texture file="props/shield/pers_aspis_2.png" name="baseTex"/>
-        <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
-        <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
+        <texture file="props/shield/achae_aspis_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_aspis_2">
+      <textures>
+        <texture file="props/shield/achae_aspis_2.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_cyrus.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_a.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_taka_cyrus.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_taka_a.xml
index 265893da8a..34475ff4ef 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_cyrus.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_a.xml
@@ -2,13 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="achae_pelta_h">
       <mesh>props/shield/taka_front.dae</mesh>
       <props>
         <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="props/shield/pers_pelta_f.png" name="baseTex"/>
+        <texture file="props/shield/achae_pelta_h.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_b.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_taka_b.xml
index d25db4ffdd..ace1de590c 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_b.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <group>
+    <variant frequency="100" name="achae_pelta_g">
+      <textures>
+        <texture file="props/shield/achae_pelta_g.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant frequency="1" name="taka large">
       <mesh>props/shield/taka_front.dae</mesh>
@@ -15,14 +24,5 @@
       </props>
     </variant>
   </group>
-  <group>
-    <variant frequency="1" name="taka shield g">
-      <textures>
-        <texture file="props/shield/pers_pelta_g.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_cyrus.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_taka_cyrus.xml
index bb5b7d7670..b17f658e14 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_cyrus.xml
@@ -2,17 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="achae_pelta_f">
       <mesh>props/shield/taka_front.dae</mesh>
       <props>
         <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="taka shield h">
       <textures>
-        <texture file="props/shield/pers_pelta_h.png" name="baseTex"/>
+        <texture file="props/shield/achae_pelta_f.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_e.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_taka_e.xml
index 3aacaa4603..a0caa7fdc4 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_taka_e.xml
@@ -2,37 +2,33 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="100" name="base">
       <mesh>props/shield/taka_front.dae</mesh>
       <props>
         <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="taka shield b">
-      <textures>
-        <texture file="props/shield/pers_pelta_b.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="taka shield e">
-      <textures>
-        <texture file="props/shield/pers_pelta_e.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="taka shield f">
-      <textures>
-        <texture file="props/shield/pers_pelta_f.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="achae_pelta_b">
+      <textures>
+        <texture file="props/shield/achae_pelta_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_pelta_e">
+      <textures>
+        <texture file="props/shield/achae_pelta_e.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_pelta_f">
+      <textures>
+        <texture file="props/shield/achae_pelta_f.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower.xml
similarity index 56%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_tower.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_tower.xml
index c5d18279e9..0595400567 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower.xml
@@ -2,32 +2,28 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/shield/spara_a_f.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pers_tower_back.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_tower_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="spara-texture-c">
-      <textures>
-        <texture file="props/shield/pers_rect_c.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="spara-texture-d">
-      <textures>
-        <texture file="props/shield/pers_rect_d.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant name="achae_rect_c">
+      <textures>
+        <texture file="props/shield/achae_rect_c.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant name="achae_rect_d">
+      <textures>
+        <texture file="props/shield/achae_rect_d.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower_a.xml
similarity index 56%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_tower_a.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_tower_a.xml
index f5c3719cf5..5f7a948676 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower_a.xml
@@ -2,32 +2,28 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/shield/spara_a_f.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pers_tower_back.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_tower_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="spara-texture-b">
-      <textures>
-        <texture file="props/shield/pers_rect_b.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="spara-texture-e">
-      <textures>
-        <texture file="props/shield/pers_rect_e.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant name="achae_rect_b">
+      <textures>
+        <texture file="props/shield/achae_rect_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant name="achae_rect_e">
+      <textures>
+        <texture file="props/shield/achae_rect_e.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower_back.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower_back.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_tower_back.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_tower_back.xml
index 9f259bd7eb..86d9ac73ef 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower_back.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower_back.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/shield/spara_a_b.dae</mesh>
       <textures>
-        <texture file="props/shield/pers_rect_f.dds" name="baseTex"/>
+        <texture file="props/shield/achae_rect_f.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower_e.xml b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower_e.xml
similarity index 55%
rename from binaries/data/mods/public/art/actors/props/units/shields/pers_tower_e.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/achae_tower_e.xml
index 1619757027..b49b2a2855 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_tower_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/achae_tower_e.xml
@@ -2,32 +2,28 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Mesh">
+    <variant frequency="100" name="Base">
       <mesh>props/shield/spara_a_f.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pers_tower_back.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_tower_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="spara-texture-a">
-      <textures>
-        <texture file="props/shield/pers_rect_a.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="spara-texture-g">
-      <textures>
-        <texture file="props/shield/pers_rect_g.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="achae_rect_a">
+      <textures>
+        <texture file="props/shield/achae_rect_a.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_rect_g">
+      <textures>
+        <texture file="props/shield/achae_rect_g.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/aspis_pers_kardakes.xml b/binaries/data/mods/public/art/actors/props/units/shields/aspis_achae_kardakes.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/props/units/shields/aspis_pers_kardakes.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/aspis_achae_kardakes.xml
index 6f3ac673d5..a4ceafae22 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/aspis_pers_kardakes.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/aspis_achae_kardakes.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/shields/props/aspis_handgrip_bronze_01.xml" attachpoint="handgrip"/>
       </props>
       <textures>
-        <texture file="props/shield/aspis_pers_norm.png" name="normTex"/>
+        <texture file="props/shield/aspis_achae_norm.png" name="normTex"/>
         <texture file="props/shield/aspis_spec_bronze.png" name="specTex"/>
       </textures>
     </variant>
@@ -17,12 +17,12 @@
   <group>
     <variant frequency="1" name="Faravah-01">
       <textures>
-        <texture file="props/shield/aspis_pers_kardakes_01.png" name="baseTex"/>
+        <texture file="props/shield/aspis_achae_kardakes_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Shahbaz-02">
       <textures>
-        <texture file="props/shield/aspis_pers_kardakes_02.png" name="baseTex"/>
+        <texture file="props/shield/aspis_achae_kardakes_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gerron_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/gerron_a.xml
index 18071c1b60..f32ab7384b 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gerron_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gerron_a.xml
@@ -7,32 +7,28 @@
       <props>
         <prop actor="props/units/shields/gerron_a_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="shield-gerron-a">
-      <textures>
-        <texture file="props/shield/pers_gerron_a.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield-gerron-b">
-      <textures>
-        <texture file="props/shield/pers_gerron_b.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield-gerron-e">
-      <textures>
-        <texture file="props/shield/pers_gerron_e.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="shield-gerron-a">
+      <textures>
+        <texture file="props/shield/achae_gerron_a.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield-gerron-b">
+      <textures>
+        <texture file="props/shield/achae_gerron_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield-gerron-e">
+      <textures>
+        <texture file="props/shield/achae_gerron_e.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gerron_b.xml b/binaries/data/mods/public/art/actors/props/units/shields/gerron_b.xml
index 18071c1b60..f32ab7384b 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gerron_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gerron_b.xml
@@ -7,32 +7,28 @@
       <props>
         <prop actor="props/units/shields/gerron_a_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="shield-gerron-a">
-      <textures>
-        <texture file="props/shield/pers_gerron_a.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield-gerron-b">
-      <textures>
-        <texture file="props/shield/pers_gerron_b.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield-gerron-e">
-      <textures>
-        <texture file="props/shield/pers_gerron_e.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="shield-gerron-a">
+      <textures>
+        <texture file="props/shield/achae_gerron_a.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield-gerron-b">
+      <textures>
+        <texture file="props/shield/achae_gerron_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield-gerron-e">
+      <textures>
+        <texture file="props/shield/achae_gerron_e.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gerron_plain.xml b/binaries/data/mods/public/art/actors/props/units/shields/gerron_plain.xml
index 146197a2c2..b272573e7a 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gerron_plain.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gerron_plain.xml
@@ -7,27 +7,23 @@
       <props>
         <prop actor="props/units/shields/gerron_a_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="shield-gerron-f">
-      <textures>
-        <texture file="props/shield/pers_gerron_f.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield-gerron-g">
-      <textures>
-        <texture file="props/shield/pers_gerron_g.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="shield-gerron-f">
+      <textures>
+        <texture file="props/shield/achae_gerron_f.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield-gerron-g">
+      <textures>
+        <texture file="props/shield/achae_gerron_g.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gerron_x.xml b/binaries/data/mods/public/art/actors/props/units/shields/gerron_x.xml
index 146197a2c2..b272573e7a 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gerron_x.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gerron_x.xml
@@ -7,27 +7,23 @@
       <props>
         <prop actor="props/units/shields/gerron_a_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="shield-gerron-f">
-      <textures>
-        <texture file="props/shield/pers_gerron_f.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="shield-gerron-g">
-      <textures>
-        <texture file="props/shield/pers_gerron_g.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="shield-gerron-f">
+      <textures>
+        <texture file="props/shield/achae_gerron_f.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="shield-gerron-g">
+      <textures>
+        <texture file="props/shield/achae_gerron_g.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pelta_b_back_reverse.xml b/binaries/data/mods/public/art/actors/props/units/shields/pelta_b_back_reverse.xml
index f5f4a00c59..944d4892fe 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pelta_b_back_reverse.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/pelta_b_back_reverse.xml
@@ -9,7 +9,7 @@
   <group>
     <variant frequency="1" name="back-i">
       <textures>
-        <texture file="props/shield/pers_pelta_c.dds" name="baseTex"/>
+        <texture file="props/shield/achae_pelta_c.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e_back_reverse.xml b/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e_back_reverse.xml
deleted file mode 100644
index c38d67d8b5..0000000000
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_pelta_e_back_reverse.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>props/shield/pelta_pers_back_b_b.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="back-i">
-      <textures>
-        <texture file="props/shield/pers_pelta_c.dds" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/standards/formation.xml b/binaries/data/mods/public/art/actors/props/units/standards/formation.xml
index f1cff27368..d4b9702162 100644
--- a/binaries/data/mods/public/art/actors/props/units/standards/formation.xml
+++ b/binaries/data/mods/public/art/actors/props/units/standards/formation.xml
@@ -13,6 +13,11 @@
     </variant>
   </group>
   <group>
+    <variant name="achae">
+      <props>
+        <prop actor="props/units/standards/formation_flag_achae.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="athen">
       <props>
         <prop actor="props/units/standards/formation_flag_athen.xml" attachpoint="root"/>
@@ -77,11 +82,6 @@
         <prop actor="props/units/standards/formation_flag_maur.xml" attachpoint="root"/>
       </props>
     </variant>
-    <variant name="pers">
-      <props>
-        <prop actor="props/units/standards/formation_flag_pers.xml" attachpoint="root"/>
-      </props>
-    </variant>
     <variant name="ptol">
       <props>
         <prop actor="props/units/standards/formation_flag_ptol.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/standards/formation_flag_pers.xml b/binaries/data/mods/public/art/actors/props/units/standards/formation_flag_achae.xml
similarity index 83%
rename from binaries/data/mods/public/art/actors/props/units/standards/formation_flag_pers.xml
rename to binaries/data/mods/public/art/actors/props/units/standards/formation_flag_achae.xml
index bd70afeeda..fd51f8909a 100644
--- a/binaries/data/mods/public/art/actors/props/units/standards/formation_flag_pers.xml
+++ b/binaries/data/mods/public/art/actors/props/units/standards/formation_flag_achae.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>props/standard/formation_flag.dae</mesh>
       <textures>
-        <texture file="props/standards/pers_infantry_01.png" name="baseTex"/>
+        <texture file="props/standards/achae_infantry_01.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/pers_quiver_arrows.xml b/binaries/data/mods/public/art/actors/props/units/weapons/achae_quiver_arrows.xml
similarity index 89%
rename from binaries/data/mods/public/art/actors/props/units/weapons/pers_quiver_arrows.xml
rename to binaries/data/mods/public/art/actors/props/units/weapons/achae_quiver_arrows.xml
index 342a0b087d..e7761977f1 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/pers_quiver_arrows.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/achae_quiver_arrows.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/pers_quiver_arrows.dae</mesh>
+      <mesh>props/achae_quiver_arrows.dae</mesh>
       <textures>
         <texture file="props/prop_weap.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/blades/pers_spear_blade.xml b/binaries/data/mods/public/art/actors/props/units/weapons/blades/achae_spear_blade.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/props/units/weapons/blades/pers_spear_blade.xml
rename to binaries/data/mods/public/art/actors/props/units/weapons/blades/achae_spear_blade.xml
index e0edb985cd..af2ece536c 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/blades/pers_spear_blade.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/blades/achae_spear_blade.xml
@@ -12,10 +12,10 @@
   </group>
   <group>
     <variant frequency="1" name="blade-a">
-      <mesh>props/spear_blade_pers_a.dae</mesh>
+      <mesh>props/spear_blade_achae_a.dae</mesh>
     </variant>
     <variant frequency="1" name="blade-b">
-      <mesh>props/spear_blade_pers_b.dae</mesh>
+      <mesh>props/spear_blade_achae_b.dae</mesh>
     </variant>
   </group>
   <material>no_trans_norm_spec.xml</material>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/bow_recurve.xml b/binaries/data/mods/public/art/actors/props/units/weapons/bow_recurve.xml
index 966c87ac68..808a5e23b3 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/bow_recurve.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/bow_recurve.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/weapons/bow_recurve_pers.dae</mesh>
+      <mesh>props/weapons/bow_recurve_achae.dae</mesh>
       <textures>
         <texture file="props/spart_sail_a.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/spear_ball.xml b/binaries/data/mods/public/art/actors/props/units/weapons/spear_ball.xml
index c9253a6cc5..610bc22e5b 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/spear_ball.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/spear_ball.xml
@@ -6,10 +6,10 @@
       <textures>
         <texture file="props/prop_weap.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
+        <texture file="props/prop_weap.dds" name="specTex"/>
       </textures>
       <props>
-        <prop actor="props/units/weapons/blades/pers_spear_blade.xml" attachpoint="blade"/>
+        <prop actor="props/units/weapons/blades/achae_spear_blade.xml" attachpoint="blade"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance_persian.xml b/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance_achaemenid.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/props/units/weapons/spear_lance_persian.xml
rename to binaries/data/mods/public/art/actors/props/units/weapons/spear_lance_achaemenid.xml
index f28f2cb89b..7b9f3de1a1 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance_persian.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance_achaemenid.xml
@@ -4,7 +4,7 @@
   <group>
     <variant frequency="100" name="Base">
       <props>
-        <prop actor="props/units/weapons/blades/pers_spear_blade.xml" attachpoint="blade"/>
+        <prop actor="props/units/weapons/blades/achae_spear_blade.xml" attachpoint="blade"/>
       </props>
       <textures>
         <texture file="props/prop_weap.dds" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/special/pers_ishtar_gate.xml b/binaries/data/mods/public/art/actors/special/achae_ishtar_gate.xml
similarity index 51%
rename from binaries/data/mods/public/art/actors/special/pers_ishtar_gate.xml
rename to binaries/data/mods/public/art/actors/special/achae_ishtar_gate.xml
index 14bba6e3cd..151db9510f 100644
--- a/binaries/data/mods/public/art/actors/special/pers_ishtar_gate.xml
+++ b/binaries/data/mods/public/art/actors/special/achae_ishtar_gate.xml
@@ -4,11 +4,11 @@
   <group>
     <variant frequency="100" name="Ishtar Gate">
       <color>58 98 203</color>
-      <mesh>structural/pers_ishtar.dae</mesh>
+      <mesh>structural/achae_ishtar.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/special/old/pers_tower_test.xml b/binaries/data/mods/public/art/actors/special/old/achae_tower_test.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/special/old/pers_tower_test.xml
rename to binaries/data/mods/public/art/actors/special/old/achae_tower_test.xml
index 91b9119d3d..f936bdbf2d 100644
--- a/binaries/data/mods/public/art/actors/special/old/pers_tower_test.xml
+++ b/binaries/data/mods/public/art/actors/special/old/achae_tower_test.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>temp/test_tower.dae</mesh>
       <textures>
-        <texture file="structural/pers_tower_01.dds" name="baseTex"/>
+        <texture file="structural/achae_tower_01.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/special/old/persian_special_building.xml b/binaries/data/mods/public/art/actors/special/old/achaemenid_special_building.xml
similarity index 50%
rename from binaries/data/mods/public/art/actors/special/old/persian_special_building.xml
rename to binaries/data/mods/public/art/actors/special/old/achaemenid_special_building.xml
index 97626bdd1b..ef69c9fa2d 100644
--- a/binaries/data/mods/public/art/actors/special/old/persian_special_building.xml
+++ b/binaries/data/mods/public/art/actors/special/old/achaemenid_special_building.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>structural/pers_sb_1.dae</mesh>
+      <mesh>structural/achae_sb_1.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/apadana.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/apadana.xml
new file mode 100644
index 0000000000..67ab54200b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/apadana.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Achaemenid Kahk Special Building">
+      <mesh>structural/achae_sb_1_new.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/sb1.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_small.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/sb1.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/babylonian_tower.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/babylonian_tower.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/structures/persians/babylonian_tower.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/babylonian_tower.xml
index 04317da382..94143e63ac 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/babylonian_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/babylonian_tower.xml
@@ -8,9 +8,9 @@
         <prop actor="props/structures/decals/dirt_3x3.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
         <texture file="structural/ao/baby_defense_tower_AO.png" name="aoTex"/>
       </textures>
     </variant>
@@ -19,7 +19,7 @@
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/ballista_tower.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/ballista_tower.xml
similarity index 61%
rename from binaries/data/mods/public/art/actors/structures/persians/ballista_tower.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/ballista_tower.xml
index cb62b47952..e340fabd8f 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/ballista_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/ballista_tower.xml
@@ -7,23 +7,23 @@
         <prop actor="geology/decal_stone_desert_a.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ballista_tower_AO.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ballista_tower_AO.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="scouttowera">
-      <mesh>structural/pers_ballista_tower.dae</mesh>
+      <mesh>structural/achae_ballista_tower.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/barracks.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/barracks.xml
new file mode 100644
index 0000000000..e319838456
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/barracks.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_barracks.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/barracks_shields.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/achae_taka_a.xml" attachpoint="shieldright"/>
+        <prop actor="props/units/shields/achae_pelta_a.xml" attachpoint="shieldleft"/>
+        <prop actor="props/units/shields/achae_tower.xml" attachpoint="entranceshield"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="tableside"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="shieldtop"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="shieldoutside"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_barracks.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_medium.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/barracks_shields.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/persians/bireme.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/bireme.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/structures/persians/bireme.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/bireme.xml
index e738a1da83..4bb5103dfa 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/bireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/bireme.xml
@@ -3,21 +3,21 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" file="others/ships/pers_bireme_oars.xml" name="Persian bireme">
-      <mesh>structural/pers_ship_bireme.dae</mesh>
+    <variant frequency="1" file="others/ships/achae_bireme_oars.xml" name="Achaemenid bireme">
+      <mesh>structural/achae_ship_bireme.dae</mesh>
       <animations>
         <!-- Note: Ship attacks don't have dae animations, but animations are required to trigger sound effects. Perhaps in the future it should use the C++ code instead. -->
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
       <props>
-        <prop actor="props/structures/persians/bireme_main_sail.xml" attachpoint="sail"/>
+        <prop actor="props/structures/achaemenids/bireme_main_sail.xml" attachpoint="sail"/>
         <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
       </props>
       <textures>
-        <texture file="structural/pers_bireme.png" name="baseTex"/>
-        <texture file="structural/pers_bireme_spec.png" name="specTex"/>
-        <texture file="structural/pers_bireme_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_bireme.png" name="aoTex"/>
+        <texture file="structural/achae_bireme.png" name="baseTex"/>
+        <texture file="structural/achae_bireme_spec.png" name="specTex"/>
+        <texture file="structural/achae_bireme_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_bireme.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/bireme_scout.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/bireme_scout.xml
new file mode 100644
index 0000000000..308503c0fb
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/bireme_scout.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="1" name="Achaemenid Scout Ship">
+      <mesh>structural/achae_ship_bireme.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/bireme_main_sail.xml" attachpoint="sail"/>
+        <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_bireme.png" name="baseTex"/>
+        <texture file="structural/achae_bireme_spec.png" name="specTex"/>
+        <texture file="structural/achae_bireme_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_bireme.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/blacksmith.xml
new file mode 100644
index 0000000000..05bd8d7f04
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/blacksmith.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Blacksmith">
+      <mesh>structural/achae_blacksmith.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/blacksmith.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/achae_taka_a.xml" attachpoint="shielda"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="shieldb"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="shieldc"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmeta"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmetb"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmetc"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmetd"/>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_blacksmith.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant name="researching">
+      <props>
+        <prop actor="particle/sparks_blacksmith.xml" attachpoint="smoke"/>
+        <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
+        <prop actor="particle/flame.xml" attachpoint="fire"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_medium.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/blacksmith.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/persians/civil_centre.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/civil_centre.xml
similarity index 52%
rename from binaries/data/mods/public/art/actors/structures/persians/civil_centre.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/civil_centre.xml
index 1d43abef2b..caf933f1ba 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/civil_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/civil_centre.xml
@@ -3,17 +3,17 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="civic_center" file="structures/defensive_building.xml">
-      <mesh>structural/pers_palace.dae</mesh>
+      <mesh>structural/achae_palace.dae</mesh>
       <props>
         <prop actor="props/structures/decals/paving_tile_sahara_9x9_round.xml" attachpoint="root"/>
-        <prop actor="structures/persians/lamassu_small.xml" attachpoint="lamassu_01"/>
-        <prop actor="structures/persians/lamassu_small.xml" attachpoint="lamassu_02"/>
+        <prop actor="structures/achaemenids/lamassu_small.xml" attachpoint="lamassu_01"/>
+        <prop actor="structures/achaemenids/lamassu_small.xml" attachpoint="lamassu_02"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_palace.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_palace.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -21,7 +21,7 @@
     <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/corral.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/corral.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/structures/persians/corral.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/corral.xml
index 9a003560c4..3ed8cc04cb 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/corral.xml
@@ -3,15 +3,15 @@
   <castshadow/>
   <group>
     <variant name="Corral">
-      <mesh>structural/pers_corral.dae</mesh>
+      <mesh>structural/achae_corral.dae</mesh>
       <props>
         <prop actor="props/structures/decals/iber_corral_mud.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_corral.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_corral.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -19,7 +19,7 @@
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/dock.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/dock.xml
new file mode 100644
index 0000000000..55750e7f8c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/dock.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_dock.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_dock.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/farmstead.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/farmstead.xml
new file mode 100644
index 0000000000..acc7e22dd4
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/farmstead.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_farmstead.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_3x3.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/farmstead_cart.xml" attachpoint="cart" minheight="-20" maxheight="20"/>
+        <prop actor="props/structures/achaemenids/farmstead_cart_big.xml" attachpoint="cartbig" minheight="-20" maxheight="20"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_farmstead.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_small.xml"/>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/fishship.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/fishship.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/structures/persians/fishship.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/fishship.xml
index 380aa7ad58..11662a9a83 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/fishship.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/fishship.xml
@@ -3,14 +3,14 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="Pers Fishing Ship">
-      <mesh>structural/pers_fishship.dae</mesh>
+    <variant frequency="1" name="Achae Fishing Ship">
+      <mesh>structural/achae_fishship.dae</mesh>
       <props>
-        <prop actor="units/persians/fisherman.xml" attachpoint="fisherman"/>
-        <prop actor="props/structures/persians/fishship_sail.xml" attachpoint="root"/>
+        <prop actor="units/achaemenids/fisherman.xml" attachpoint="fisherman"/>
+        <prop actor="props/structures/achaemenids/fishship_sail.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_fishship.dds" name="baseTex"/>
+        <texture file="structural/achae_fishship.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
@@ -22,7 +22,7 @@
     <variant frequency="1" name="run"/>
     <variant frequency="1" name="gather_fish">
       <props>
-        <prop actor="props/structures/persians/fishship_sail_folded.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/fishship_sail_folded.xml" attachpoint="root"/>
         <prop actor="props/fauna/fish_captured.xml" attachpoint="fish_a"/>
         <prop actor="props/fauna/fish_captured.xml" attachpoint="fish_b"/>
         <prop actor="props/fauna/fish_captured.xml" attachpoint="fish_c"/>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/fortress.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/fortress.xml
new file mode 100644
index 0000000000..f379e0dffa
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/fortress.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achae_fortress" file="structures/defensive_building.xml">
+      <mesh>structural/achae_fortress.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/fortress_paintings.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/fortress_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_fortress.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_fortress_b" file="structures/defensive_building.xml">
+      <mesh>structural/achae_fortress_b.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/fortress_b_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/fortress_b_paintings.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_fortress_b.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_large.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/fortress_paintings.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/fortress_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/fortress_b_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/fortress_b_paintings.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/achaemenids/gardens_struct.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/gardens_struct.xml
new file mode 100644
index 0000000000..0344296d7a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/gardens_struct.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="structures/defensive_building.xml">
+      <mesh>structural/achae_gardens_struct.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/gardens_bush_dese_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_desert_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_lush_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_waterfall.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_tempe_la_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_tempe_la_b2.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_grass_field.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_log_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_struct_nature.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_struct_transp.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_apple_bloom.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_baobab_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_baobab_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_palmdate_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_trunk_baobab.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_turf.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_water.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_water_lillies.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_wrld_bush_b_2.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_gardens_ao.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_large.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/gardens_bush_dese_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_desert_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_lush_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_waterfall.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_tempe_la_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_bush_tempe_la_b2.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_grass_field.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_log_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_struct_nature.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_struct_transp.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_apple_bloom.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_baobab_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_baobab_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_tree_palmdate_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_trunk_baobab.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_turf.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_water.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_water_lillies.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/gardens_wrld_bush_b_2.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/persians/hall.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/hall.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/structures/persians/hall.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/hall.xml
index e4c472495c..4fa05db6d3 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/hall.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/hall.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="sb2">
-      <mesh>structural/pers_sb2.dae</mesh>
+      <mesh>structural/achae_sb2.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/house.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/house.xml
similarity index 55%
rename from binaries/data/mods/public/art/actors/structures/persians/house.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/house.xml
index 842d719c82..388e0db4a1 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/house.xml
@@ -4,50 +4,50 @@
   <group>
     <variant name="base" frequency="1">
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="House A">
-      <mesh>structural/pers_house_a.dae</mesh>
+      <mesh>structural/achae_house_a.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/house_a_plants.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/house_a_plants.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/ao/pers_house_a.png" name="aoTex"/>
+        <texture file="structural/ao/achae_house_a.png" name="aoTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="House B">
-      <mesh>structural/pers_house_b.dae</mesh>
+      <mesh>structural/achae_house_b.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
       </props>
       <textures>
-          <texture file="structural/ao/pers_house_b.png" name="aoTex"/>
+          <texture file="structural/ao/achae_house_b.png" name="aoTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="House C">
-      <mesh>structural/pers_house_c.dae</mesh>
+      <mesh>structural/achae_house_c.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/house_c_plants.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/house_c_plants.xml" attachpoint="root"/>
       </props>
       <textures>
-          <texture file="structural/ao/pers_house_c.png" name="aoTex"/>
+          <texture file="structural/ao/achae_house_c.png" name="aoTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="House D">
-      <mesh>structural/pers_house_d.dae</mesh>
+      <mesh>structural/achae_house_d.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/house_d_plants.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/house_d_plants.xml" attachpoint="root"/>
       </props>
       <textures>
-          <texture file="structural/ao/pers_house_d.png" name="aoTex"/>
+          <texture file="structural/ao/achae_house_d.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/ice_house.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/ice_house.xml
new file mode 100644
index 0000000000..afeb55fc3d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/ice_house.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="achae_ice_house_01">
+      <mesh>structural/achae_ice_house_01.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ice_house_01.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_ice_house_02">
+      <mesh>structural/achae_ice_house_02.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ice_house_02.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_ice_house_03">
+      <mesh>structural/achae_ice_house_03.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ice_house_03.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_ice_house_04">
+      <mesh>structural/achae_ice_house_04.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ice_house_04.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_ice_house_05">
+      <mesh>structural/achae_ice_house_05.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ice_house_05.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_ice_house_06">
+      <mesh>structural/achae_ice_house_06.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_ice_house_06.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.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"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu.xml
new file mode 100644
index 0000000000..822bf090f4
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_lamassu.dae</mesh>
+      <textures>
+        <texture file="structural/achae_lamassu.png" name="baseTex"/>
+        <texture file="structural/achae_lamassu_spec.png" name="specTex"/>
+        <texture file="structural/achae_lamassu_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_lamassu.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_black.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_black.xml
new file mode 100644
index 0000000000..668f65f7a0
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_black.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_lamassu.dae</mesh>
+      <textures>
+        <texture file="structural/achae_lamassu_dark.png" name="baseTex"/>
+        <texture file="structural/achae_lamassu_spec.png" name="specTex"/>
+        <texture file="structural/achae_lamassu_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_lamassu.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_plinth.xml
similarity index 53%
rename from binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_plinth.xml
index d638e17236..6bb3fc2b61 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_plinth.xml
@@ -3,14 +3,14 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_plinth.dae</mesh>
+      <mesh>structural/achae_plinth.dae</mesh>
       <props>
-        <prop actor="structures/persians/lamassu.xml" attachpoint="statue"/>
+        <prop actor="structures/achaemenids/lamassu.xml" attachpoint="statue"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_ruin.xml
similarity index 52%
rename from binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_ruin.xml
index 68efd95fd6..5b04a1fabe 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_ruin.xml
@@ -3,12 +3,12 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_lamassu_small.dae</mesh>
+      <mesh>structural/achae_lamassu_small.dae</mesh>
       <textures>
-        <texture file="structural/pers_lamassu_ruin.png" name="baseTex"/>
+        <texture file="structural/achae_lamassu_ruin.png" name="baseTex"/>
         <texture file="null_black.dds" name="specTex"/>
-        <texture file="structural/pers_lamassu_ruin_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_lamassu.png" name="aoTex"/>
+        <texture file="structural/achae_lamassu_ruin_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_lamassu.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_small.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_small.xml
new file mode 100644
index 0000000000..55919492cc
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_small.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_lamassu_small.dae</mesh>
+      <textures>
+        <texture file="structural/achae_lamassu.png" name="baseTex"/>
+        <texture file="structural/achae_lamassu_spec.png" name="specTex"/>
+        <texture file="structural/achae_lamassu_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_lamassu.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_small_black.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_small_black.xml
new file mode 100644
index 0000000000..5e59a37d95
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/lamassu_small_black.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_lamassu_small.dae</mesh>
+      <textures>
+        <texture file="structural/achae_lamassu_dark.png" name="baseTex"/>
+        <texture file="structural/achae_lamassu_spec.png" name="specTex"/>
+        <texture file="structural/achae_lamassu_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_lamassu.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/market.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/market.xml
new file mode 100644
index 0000000000..b566fdbcd0
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/market.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <props>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Bazaar A">
+      <mesh>structural/achae_market_a.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/market_a_stall1.xml" attachpoint="stall1" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_a_stall2.xml" attachpoint="stall2" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_a_stall3.xml" attachpoint="stall3" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_a_stall4.xml" attachpoint="stall4" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_a_stall5.xml" attachpoint="stall5" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_a_stall6.xml" attachpoint="stall6" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_a_stall7.xml" attachpoint="stall7" minheight="-20" maxheight="2"/>
+      </props>
+      <textures>
+        <texture file="structural/ao/achae_market_a.png" name="aoTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Bazaar B">
+      <mesh>structural/achae_market_b.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/market_b_stall1.xml" attachpoint="stall1" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_b_stall2.xml" attachpoint="stall2" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_b_stall3.xml" attachpoint="stall3" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_b_stall4.xml" attachpoint="stall4" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_b_stall5.xml" attachpoint="stall5" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_b_stall6.xml" attachpoint="stall6" minheight="-20" maxheight="2"/>
+        <prop actor="props/structures/achaemenids/market_b_stall7.xml" attachpoint="stall7" minheight="-20" maxheight="2"/>
+      </props>
+      <textures>
+        <texture file="structural/ao/achae_market_b.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_medium.xml"/>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/merchant.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/merchant.xml
similarity index 57%
rename from binaries/data/mods/public/art/actors/structures/persians/merchant.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/merchant.xml
index 1147d8f748..2968c2273c 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/merchant.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/merchant.xml
@@ -4,13 +4,13 @@
   <float/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_merc.dae</mesh>
+      <mesh>structural/achae_merc.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/merchant_sail.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/merchant_rail.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/merchant_sail.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/merchant_rail.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_merc.dds" name="baseTex"/>
+        <texture file="structural/achae_merc.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
@@ -19,7 +19,7 @@
   <group>
     <variant frequency="0" name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
     <variant frequency="1" name="ungarrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/outpost.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/outpost.xml
similarity index 92%
rename from binaries/data/mods/public/art/actors/structures/persians/outpost.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/outpost.xml
index a391036ef2..f113b9c4d8 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/outpost.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/outpost.xml
@@ -27,7 +27,7 @@
     <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/palace.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/palace.xml
similarity index 56%
rename from binaries/data/mods/public/art/actors/structures/persians/palace.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/palace.xml
index d15de79980..bd58c52ad0 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/palace.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/palace.xml
@@ -3,12 +3,12 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="palace" file="structures/defensive_building.xml">
-      <mesh>structural/pers_palace.dae</mesh>
+      <mesh>structural/achae_palace.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_palace.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_palace.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/range.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/range.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/structures/persians/range.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/range.xml
index 6d292a8156..52f8ee12dc 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/range.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/range.xml
@@ -3,15 +3,15 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_range.dae</mesh>
+      <mesh>structural/achae_range.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_8x7.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_range_AO.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_range_AO.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -19,7 +19,7 @@
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/scout_tower.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/scout_tower.xml
index 40d6117d08..d20ae068bd 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/scout_tower.xml
@@ -4,23 +4,23 @@
   <group>
     <variant name="base" frequency="1" file="structures/defensive_building.xml">
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="scouttowera">
-      <mesh>structural/pers_scout_tower_a.dae</mesh>
+      <mesh>structural/achae_scout_tower_a.dae</mesh>
       <textures>
-        <texture file="structural/ao/pers_defense_tower.png" name="aoTex"/>
+        <texture file="structural/ao/achae_defense_tower.png" name="aoTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scouttowerb">
-      <mesh>structural/pers_scout_tower_b.dae</mesh>
+      <mesh>structural/achae_scout_tower_b.dae</mesh>
       <textures>
-        <texture file="structural/ao/pers_scout_tower_02.png" name="aoTex"/>
+        <texture file="structural/ao/achae_scout_tower_02.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -37,7 +37,7 @@
     <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/shrine.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/shrine.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/structures/persians/shrine.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/shrine.xml
index f904090d6b..0bee997b39 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/shrine.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/shrine.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant>
-      <mesh>structural/pers_shrine.dae</mesh>
+      <mesh>structural/achae_shrine.dae</mesh>
       <props>
         <prop actor="particle/sparks.xml" attachpoint="fire"/>
         <prop actor="particle/flame_firepit_1.xml" attachpoint="fire"/>
@@ -12,10 +12,10 @@
         <prop actor="particle/smoke_small_light.xml" attachpoint="smoke"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_shrine.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_shrine.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/siege_ram.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/siege_ram.xml
similarity index 64%
rename from binaries/data/mods/public/art/actors/structures/persians/siege_ram.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/siege_ram.xml
index a533a33719..191c341b77 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/siege_ram.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/siege_ram.xml
@@ -4,12 +4,12 @@
   <group>
     <variant frequency="100" name="Assyrian Ram">
       <animations>
-        <animation file="mechanical/pers_ram_idle.dae" name="idle" speed="5"/>
-        <animation file="mechanical/pers_ram_walk.dae" name="walk" speed="25"/>
-        <animation file="mechanical/pers_ram_walk.dae" name="run" speed="25"/>
-        <animation event="0.41" file="mechanical/pers_ram.dae" name="attack_melee" speed="50"/>
+        <animation file="mechanical/achae_ram_idle.dae" name="idle" speed="5"/>
+        <animation file="mechanical/achae_ram_walk.dae" name="walk" speed="25"/>
+        <animation file="mechanical/achae_ram_walk.dae" name="run" speed="25"/>
+        <animation event="0.41" file="mechanical/achae_ram.dae" name="attack_melee" speed="50"/>
       </animations>
-      <mesh>structural/pers_ram.dae</mesh>
+      <mesh>structural/achae_ram.dae</mesh>
       <textures>
         <texture file="structural/assyrian_ram_2.png" name="baseTex"/>
         <texture file="structural/assyrian_ram_2_spec.png" name="specTex"/>
@@ -21,7 +21,7 @@
     <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/stable.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/stable.xml
new file mode 100644
index 0000000000..87df2254b2
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/stable.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>structural/achae_stable.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horsea" minheight="-20" maxheight="1.7"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horseb" minheight="-20" maxheight="1.7"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horsec" minheight="-20" maxheight="1.7"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_stable.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_medium.xml"/>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/stable_elephant.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/stable_elephant.xml
similarity index 66%
rename from binaries/data/mods/public/art/actors/structures/persians/stable_elephant.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/stable_elephant.xml
index cfd706bb82..2e8e74d280 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/stable_elephant.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/stable_elephant.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_stable_elephant.dae</mesh>
+      <mesh>structural/achae_stable_elephant.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_8x8.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/iber_corral_mud.xml" attachpoint="root"/>
@@ -12,10 +12,10 @@
         <prop actor="fauna/elephant_asian.xml" attachpoint="horse_2"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_stable_elephant.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_stable_elephant.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -23,7 +23,7 @@
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/storehouse.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/storehouse.xml
similarity index 50%
rename from binaries/data/mods/public/art/actors/structures/persians/storehouse.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/storehouse.xml
index 6c0c588672..5785bfa821 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/storehouse.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/storehouse.xml
@@ -3,16 +3,16 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_storehouse.dae</mesh>
+      <mesh>structural/achae_storehouse.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/storehouse.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/storehouse.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_storehouse.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_storehouse.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -20,7 +20,7 @@
     <variant name="alive" frequency="1"/>
     <variant file="structures/destruction_small.xml">
       <props>
-        <prop actor="props/structures/persians/storehouse.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/storehouse.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/tachara.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/tachara.xml
new file mode 100644
index 0000000000..1cd612b148
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/tachara.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base a" file="structures/defensive_building.xml">
+      <mesh>structural/achae_civic.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/tachara_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_d.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/achae_tower.xml" attachpoint="shielda"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="shieldb"/>
+        <prop actor="props/units/shields/achae_round_kardakes.xml" attachpoint="shieldc"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_civic_b.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_large.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/tachara_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/tachara_shrubs_d.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/achaemenids/temple.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/temple.xml
new file mode 100644
index 0000000000..854a6bfd25
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/temple.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/achae_temple_1.dae</mesh>
+      <props>
+        <prop actor="props/structures/achaemenids/temple.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_temple.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_medium.xml">
+      <props>
+        <prop actor="props/structures/achaemenids/temple.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/persians/trireme.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/trireme.xml
similarity index 50%
rename from binaries/data/mods/public/art/actors/structures/persians/trireme.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/trireme.xml
index 9cc9fc8882..e8a2a2fbc9 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/trireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/trireme.xml
@@ -3,26 +3,26 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" file="others/ships/pers_trireme_oars.xml" name="Persian Trireme">
-      <mesh>structural/pers_ship_trireme.dae</mesh>
+    <variant frequency="1" file="others/ships/achae_trireme_oars.xml" name="Achaemenid Trireme">
+      <mesh>structural/achae_ship_trireme.dae</mesh>
       <animations>
         <!-- Note: Ship attacks don't have dae animations, but animations are required to trigger sound effects. Perhaps in the future it should use the C++ code instead. -->
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
       <props>
-        <prop actor="props/structures/persians/trireme_main_sail.xml" attachpoint="main_sail"/>
+        <prop actor="props/structures/achaemenids/trireme_main_sail.xml" attachpoint="main_sail"/>
         <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
       </props>
       <textures>
-        <texture file="structural/pers_trireme.png" name="baseTex"/>
-        <texture file="structural/pers_trireme_spec.png" name="specTex"/>
-        <texture file="structural/pers_trireme_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_trireme.png" name="aoTex"/>
+        <texture file="structural/achae_trireme.png" name="baseTex"/>
+        <texture file="structural/achae_trireme_spec.png" name="specTex"/>
+        <texture file="structural/achae_trireme_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_trireme.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
   <group>
-    <variant file="others/ships/pers_trireme_shields.xml" name="Persian Trireme Shields"/>
+    <variant file="others/ships/achae_trireme_shields.xml" name="Achaemenid Trireme Shields"/>
   </group>
   <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/trireme_ram.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/trireme_ram.xml
new file mode 100644
index 0000000000..00622baf48
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/trireme_ram.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="1" file="others/ships/achae_trireme_oars.xml" name="Achaemenid Ramming Trireme">
+      <mesh>structural/achae_ship_trireme.dae</mesh>
+      <textures>
+        <texture file="structural/achae_trireme.png" name="baseTex"/>
+        <texture file="structural/achae_trireme_spec.png" name="specTex"/>
+        <texture file="structural/achae_trireme_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_trireme.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="others/ships/achae_trireme_shields.xml" name="Achaemenid Trireme Shields"/>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/achaemenids/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_gate.xml
new file mode 100644
index 0000000000..6256cfefef
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_gate.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="wall gate">
+      <animations>
+        <animation file="mechanical/achae_wall_gate_closed.dae" name="gate_closed" speed="65"/>
+        <animation file="mechanical/achae_wall_gate_opening.dae" name="gate_opening" speed="65"/>
+        <animation file="mechanical/achae_wall_gate_open.dae" name="gate_open" speed="65"/>
+        <animation file="mechanical/achae_wall_gate_closing.dae" name="gate_closing" speed="65"/>
+      </animations>
+      <mesh>structural/achae_wall_gate.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_medium.xml"/>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/wall_long.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_long.xml
similarity index 72%
rename from binaries/data/mods/public/art/actors/structures/persians/wall_long.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/wall_long.xml
index 59bc96a489..27767f49f6 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/wall_long.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_long.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="wall long">
-      <mesh>structural/pers_wall_long.dae</mesh>
+      <mesh>structural/achae_wall_long.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_medium.xml
similarity index 59%
rename from binaries/data/mods/public/art/actors/structures/persians/wall_medium.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/wall_medium.xml
index 992d2005ac..8bbdfb998a 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_medium.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="wall medium">
-      <mesh>structural/pers_wall_medium.dae</mesh>
+      <mesh>structural/achae_wall_medium.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/wall_short.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_short.xml
similarity index 59%
rename from binaries/data/mods/public/art/actors/structures/persians/wall_short.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/wall_short.xml
index ee05f77a92..13251b95ed 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/wall_short.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_short.xml
@@ -3,11 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="wall_short">
-      <mesh>structural/pers_wall_short.dae</mesh>
+      <mesh>structural/achae_wall_short.dae</mesh>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_tower.xml
similarity index 53%
rename from binaries/data/mods/public/art/actors/structures/persians/wall_tower.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/wall_tower.xml
index 5105f17635..9f53262b40 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/wall_tower.xml
@@ -3,14 +3,14 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="wall tower" file="structures/defensive_building.xml">
-      <mesh>structural/pers_wall_tower.dae</mesh>
+      <mesh>structural/achae_wall_tower.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/wall_tower.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/wall_tower.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -18,7 +18,7 @@
     <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
@@ -26,7 +26,7 @@
     <variant name="alive" frequency="1"/>
     <variant file="structures/destruction_small.xml">
       <props>
-        <prop actor="props/structures/persians/wall_tower.xml" attachpoint="root"/>
+        <prop actor="props/structures/achaemenids/wall_tower.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/wooden_tower.xml
similarity index 66%
rename from binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/wooden_tower.xml
index 8d1b819004..250534f6b8 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/wooden_tower.xml
@@ -4,16 +4,16 @@
   <group>
     <variant frequency="1" name="base" file="structures/defensive_building.xml">
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_wooden_tower_AO.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_wooden_tower_AO.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="scouttowerb">
-      <mesh>structural/pers_wooden_tower.dae</mesh>
+      <mesh>structural/achae_wooden_tower.dae</mesh>
     </variant>
   </group>
   <group>
@@ -29,7 +29,7 @@
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/workshop.xml b/binaries/data/mods/public/art/actors/structures/achaemenids/workshop.xml
similarity index 57%
rename from binaries/data/mods/public/art/actors/structures/persians/workshop.xml
rename to binaries/data/mods/public/art/actors/structures/achaemenids/workshop.xml
index 954ba81b08..4532219bfa 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/workshop.xml
+++ b/binaries/data/mods/public/art/actors/structures/achaemenids/workshop.xml
@@ -3,15 +3,15 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_workshop.dae</mesh>
+      <mesh>structural/achae_workshop.dae</mesh>
       <props>
         <prop actor="props/structures/decals/spart_5x5.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_workshop_AO.png" name="aoTex"/>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/achae_workshop_AO.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -19,7 +19,7 @@
     <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
+        <prop actor="props/special/common/garrison_flag_achaemenids.xml" attachpoint="garrisoned" selectable="false"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/stable.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/stable.xml
index acf66b8585..19fbdb6850 100644
--- a/binaries/data/mods/public/art/actors/structures/carthaginians/stable.xml
+++ b/binaries/data/mods/public/art/actors/structures/carthaginians/stable.xml
@@ -6,9 +6,9 @@
       <mesh>structural/kart_stable.dae</mesh>
       <props>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horse_1"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horse_2"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horse_1"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horse_2"/>
       </props>
       <textures>
         <texture file="structural/kart_struct.dds" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_pers_cc.xml b/binaries/data/mods/public/art/actors/structures/destruct_achae_cc.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/structures/destruct_pers_cc.xml
rename to binaries/data/mods/public/art/actors/structures/destruct_achae_cc.xml
index 67081feef7..4d7dd88027 100644
--- a/binaries/data/mods/public/art/actors/structures/destruct_pers_cc.xml
+++ b/binaries/data/mods/public/art/actors/structures/destruct_achae_cc.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="pers cc rubble 6x6">
-      <mesh>props/pers_cc_rubble.dae</mesh>
+    <variant name="achae cc rubble 6x6">
+      <mesh>props/achae_cc_rubble.dae</mesh>
       <props>
-        <prop actor="structures/destruct_pers_pieces.xml" attachpoint="root"/>
+        <prop actor="structures/destruct_achae_pieces.xml" attachpoint="root"/>
         <prop actor="particle/flame.xml" attachpoint="flame1"/>
         <prop actor="particle/smoke.xml" attachpoint="flame1"/>
         <prop actor="particle/flame_jav.xml" attachpoint="flame2"/>
@@ -14,9 +14,9 @@
       </props>
       <textures>
         <texture file="props/rubble_stone.png" name="baseTex"/>
-        <texture file="props/ao/pers_cc_rubble.png" name="aoTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
+        <texture file="props/ao/achae_cc_rubble.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_pers_dock_rubble.xml b/binaries/data/mods/public/art/actors/structures/destruct_achae_dock_rubble.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/structures/destruct_pers_dock_rubble.xml
rename to binaries/data/mods/public/art/actors/structures/destruct_achae_dock_rubble.xml
index 6bbbf8fae9..1817180c95 100644
--- a/binaries/data/mods/public/art/actors/structures/destruct_pers_dock_rubble.xml
+++ b/binaries/data/mods/public/art/actors/structures/destruct_achae_dock_rubble.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="pers dock rubble">
-      <mesh>props/pers_dock_rubble.dae</mesh>
+    <variant name="achae dock rubble">
+      <mesh>props/achae_dock_rubble.dae</mesh>
       <props>
-        <prop actor="structures/destruct_pers_dock_struct.xml" attachpoint="root"/>
+        <prop actor="structures/destruct_achae_dock_struct.xml" attachpoint="root"/>
         <prop actor="props/special/eyecandy/barrels_floating.xml" attachpoint="barrels"/>
         <prop actor="particle/flame.xml" attachpoint="flame1"/>
         <prop actor="particle/smoke.xml" attachpoint="flame1"/>
@@ -15,9 +15,9 @@
       </props>
       <textures>
         <texture file="props/rubble_stone.png" name="baseTex"/>
-        <texture file="props/ao/pers_dock_rubble_ao.png" name="aoTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
+        <texture file="props/ao/achae_dock_rubble_ao.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_achae_dock_struct.xml b/binaries/data/mods/public/art/actors/structures/destruct_achae_dock_struct.xml
new file mode 100644
index 0000000000..da9b7a8cbc
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/destruct_achae_dock_struct.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="achae dock rubble struct">
+      <mesh>props/achae_dock_rubble_struct.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="props/ao/achae_dock_rubble_ao.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_achae_pieces.xml b/binaries/data/mods/public/art/actors/structures/destruct_achae_pieces.xml
new file mode 100644
index 0000000000..5ae029f2b0
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/destruct_achae_pieces.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="achae cc pieces 6x6">
+      <mesh>props/achae_cc_pieces.dae</mesh>
+      <textures>
+        <texture file="structural/achae_struct.png" name="baseTex"/>
+        <texture file="structural/achae_struct_norm.png" name="normTex"/>
+        <texture file="structural/achae_struct_spec.png" name="specTex"/>
+        <texture file="props/ao/achae_cc_rubble.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_pers_dock_struct.xml b/binaries/data/mods/public/art/actors/structures/destruct_pers_dock_struct.xml
deleted file mode 100644
index 2925d34095..0000000000
--- a/binaries/data/mods/public/art/actors/structures/destruct_pers_dock_struct.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="pers dock rubble struct">
-      <mesh>props/pers_dock_rubble_struct.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="props/ao/pers_dock_rubble_ao.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_pers_pieces.xml b/binaries/data/mods/public/art/actors/structures/destruct_pers_pieces.xml
deleted file mode 100644
index b73be4c6cc..0000000000
--- a/binaries/data/mods/public/art/actors/structures/destruct_pers_pieces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="pers cc pieces 6x6">
-      <mesh>props/pers_cc_pieces.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="props/ao/pers_cc_rubble.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/stable.xml b/binaries/data/mods/public/art/actors/structures/germans/stable.xml
index 58580ad58e..5ac081e57d 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/stable.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/stable.xml
@@ -7,9 +7,9 @@
       <props>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="mud"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse_1" maxheight="20" minheight="-20"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horse_2" maxheight="20" minheight="-20"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horse_3" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse_1" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horse_2" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horse_3" maxheight="20" minheight="-20"/>
       </props>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/han/stable.xml b/binaries/data/mods/public/art/actors/structures/han/stable.xml
index 19bb8b661e..448bfc364c 100644
--- a/binaries/data/mods/public/art/actors/structures/han/stable.xml
+++ b/binaries/data/mods/public/art/actors/structures/han/stable.xml
@@ -7,9 +7,9 @@
       <props>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horse_1"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horse_2"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horse_1"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horse_2"/>
       </props>
       <textures>
         <texture file="structural/han_struct_02.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/kushites/stable.xml b/binaries/data/mods/public/art/actors/structures/kushites/stable.xml
index 14a034821d..05e6b04d71 100644
--- a/binaries/data/mods/public/art/actors/structures/kushites/stable.xml
+++ b/binaries/data/mods/public/art/actors/structures/kushites/stable.xml
@@ -7,9 +7,9 @@
       <props>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horse_1"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horse_2"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horse_1"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horse_2"/>
       </props>
       <textures>
         <texture file="structural/kush_struct_02.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/mercenaries/camp_egyptian.xml b/binaries/data/mods/public/art/actors/structures/mercenaries/camp_egyptian.xml
index 72b88df376..c5431ea992 100644
--- a/binaries/data/mods/public/art/actors/structures/mercenaries/camp_egyptian.xml
+++ b/binaries/data/mods/public/art/actors/structures/mercenaries/camp_egyptian.xml
@@ -11,7 +11,7 @@
         <prop actor="props/structures/ptolemies/settlement_greektent.xml" attachpoint="greektent" minheight="-20" maxheight="20"/>
         <prop actor="props/structures/ptolemies/settlement_arabtent.xml" attachpoint="arabtent" minheight="-20" maxheight="20"/>
         <prop actor="props/structures/ptolemies/settlement_bigtent.xml" attachpoint="bigtent" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse" minheight="-20" maxheight="20"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse" minheight="-20" maxheight="20"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/structures/ptolemies/settlement_entrance.xml" attachpoint="root"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/apadana.xml b/binaries/data/mods/public/art/actors/structures/persians/apadana.xml
deleted file mode 100644
index 4877757895..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/apadana.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Persian Kahk Special Building">
-      <mesh>structural/pers_sb_1_new.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/sb1.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_small.xml">
-      <props>
-        <prop actor="props/structures/persians/sb1.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/barracks.xml b/binaries/data/mods/public/art/actors/structures/persians/barracks.xml
deleted file mode 100644
index 3d0b152c04..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/barracks.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_barracks.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/barracks_shields.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/pers_taka_a.xml" attachpoint="shieldright"/>
-        <prop actor="props/units/shields/pers_pelta_a.xml" attachpoint="shieldleft"/>
-        <prop actor="props/units/shields/pers_tower.xml" attachpoint="entranceshield"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="tableside"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldtop"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldoutside"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_barracks.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_medium.xml">
-      <props>
-        <prop actor="props/structures/persians/barracks_shields.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/persians/bireme_scout.xml b/binaries/data/mods/public/art/actors/structures/persians/bireme_scout.xml
deleted file mode 100644
index 27336e3481..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/bireme_scout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant frequency="1" name="Persian Scout Ship">
-      <mesh>structural/pers_ship_bireme.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/bireme_main_sail.xml" attachpoint="sail"/>
-        <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_bireme.png" name="baseTex"/>
-        <texture file="structural/pers_bireme_spec.png" name="specTex"/>
-        <texture file="structural/pers_bireme_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_bireme.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/persians/blacksmith.xml
deleted file mode 100644
index 93dff81adc..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/blacksmith.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Blacksmith">
-      <mesh>structural/pers_blacksmith.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/blacksmith.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/pers_taka_a.xml" attachpoint="shielda"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldb"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldc"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmeta"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmetb"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmetc"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmetd"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_blacksmith.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant name="researching">
-      <props>
-        <prop actor="particle/sparks_blacksmith.xml" attachpoint="smoke"/>
-        <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
-        <prop actor="particle/flame.xml" attachpoint="fire"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_medium.xml">
-      <props>
-        <prop actor="props/structures/persians/blacksmith.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/persians/dock.xml b/binaries/data/mods/public/art/actors/structures/persians/dock.xml
deleted file mode 100644
index a761703096..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/dock.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_dock.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_dock.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/farmstead.xml b/binaries/data/mods/public/art/actors/structures/persians/farmstead.xml
deleted file mode 100644
index 76ebdc19fe..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/farmstead.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_farmstead.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_3x3.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/farmstead_cart.xml" attachpoint="cart" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/persians/farmstead_cart_big.xml" attachpoint="cartbig" minheight="-20" maxheight="20"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_farmstead.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_small.xml"/>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/fortress.xml b/binaries/data/mods/public/art/actors/structures/persians/fortress.xml
deleted file mode 100644
index 6bb0f4bd17..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/fortress.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Persian_Fortress_A" file="structures/defensive_building.xml">
-      <mesh>structural/pers_fortress.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/fortress_paintings.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/fortress_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_fortress.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian_Fortress_B" file="structures/defensive_building.xml">
-      <mesh>structural/pers_fortress_b.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/fortress_b_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/fortress_b_paintings.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_fortress_b.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_large.xml">
-      <props>
-        <prop actor="props/structures/persians/fortress_paintings.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/fortress_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/fortress_b_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/fortress_b_paintings.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/persians/gardens_struct.xml b/binaries/data/mods/public/art/actors/structures/persians/gardens_struct.xml
deleted file mode 100644
index 59225625ac..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/gardens_struct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="structures/defensive_building.xml">
-      <mesh>structural/pers_gardens_struct.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/gardens_bush_dese_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_desert_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_lush_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_waterfall.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_tempe_la_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_tempe_la_b2.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_grass_field.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_log_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_struct_nature.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_struct_transp.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_apple_bloom.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_baobab_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_baobab_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_palmdate_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_trunk_baobab.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_turf.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_water.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_water_lillies.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_wrld_bush_b_2.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_gardens_ao.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_large.xml">
-      <props>
-        <prop actor="props/structures/persians/gardens_bush_dese_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_desert_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_lush_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_waterfall.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_tempe_la_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_bush_tempe_la_b2.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_grass_field.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_log_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_struct_nature.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_struct_transp.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_apple_bloom.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_baobab_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_baobab_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_tree_palmdate_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_trunk_baobab.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_turf.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_water.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_water_lillies.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/gardens_wrld_bush_b_2.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/persians/ice_house.xml b/binaries/data/mods/public/art/actors/structures/persians/ice_house.xml
deleted file mode 100644
index 394d5f09b6..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/ice_house.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Persian_Yakhchal_01">
-      <mesh>structural/pers_ice_house_01.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ice_house_01.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian_Yakhchal_02">
-      <mesh>structural/pers_ice_house_02.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ice_house_02.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian_Yakhchal_03">
-      <mesh>structural/pers_ice_house_03.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ice_house_03.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian_Yakhchal_04">
-      <mesh>structural/pers_ice_house_04.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ice_house_04.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian_Yakhchal_05">
-      <mesh>structural/pers_ice_house_05.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ice_house_05.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Persian_Yakhchal_06">
-      <mesh>structural/pers_ice_house_06.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_ice_house_06.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.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"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu.xml
deleted file mode 100644
index cda9f4e3a2..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/lamassu.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_lamassu.dae</mesh>
-      <textures>
-        <texture file="structural/pers_lamassu.png" name="baseTex"/>
-        <texture file="structural/pers_lamassu_spec.png" name="specTex"/>
-        <texture file="structural/pers_lamassu_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_lamassu.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml
deleted file mode 100644
index 89ad0b8021..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_lamassu.dae</mesh>
-      <textures>
-        <texture file="structural/pers_lamassu_dark.png" name="baseTex"/>
-        <texture file="structural/pers_lamassu_spec.png" name="specTex"/>
-        <texture file="structural/pers_lamassu_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_lamassu.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml
deleted file mode 100644
index b6efb7ccf1..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_lamassu_small.dae</mesh>
-      <textures>
-        <texture file="structural/pers_lamassu.png" name="baseTex"/>
-        <texture file="structural/pers_lamassu_spec.png" name="specTex"/>
-        <texture file="structural/pers_lamassu_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_lamassu.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml
deleted file mode 100644
index a655bcb834..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_lamassu_small.dae</mesh>
-      <textures>
-        <texture file="structural/pers_lamassu_dark.png" name="baseTex"/>
-        <texture file="structural/pers_lamassu_spec.png" name="specTex"/>
-        <texture file="structural/pers_lamassu_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_lamassu.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/market.xml b/binaries/data/mods/public/art/actors/structures/persians/market.xml
deleted file mode 100644
index 8a0d5aaa0c..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/market.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <props>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Bazaar A">
-      <mesh>structural/pers_market_a.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/market_a_stall1.xml" attachpoint="stall1" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_a_stall2.xml" attachpoint="stall2" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_a_stall3.xml" attachpoint="stall3" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_a_stall4.xml" attachpoint="stall4" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_a_stall5.xml" attachpoint="stall5" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_a_stall6.xml" attachpoint="stall6" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_a_stall7.xml" attachpoint="stall7" minheight="-20" maxheight="2"/>
-      </props>
-      <textures>
-        <texture file="structural/ao/pers_market_a.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Bazaar B">
-      <mesh>structural/pers_market_b.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/market_b_stall1.xml" attachpoint="stall1" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_b_stall2.xml" attachpoint="stall2" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_b_stall3.xml" attachpoint="stall3" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_b_stall4.xml" attachpoint="stall4" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_b_stall5.xml" attachpoint="stall5" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_b_stall6.xml" attachpoint="stall6" minheight="-20" maxheight="2"/>
-        <prop actor="props/structures/persians/market_b_stall7.xml" attachpoint="stall7" minheight="-20" maxheight="2"/>
-      </props>
-      <textures>
-        <texture file="structural/ao/pers_market_b.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_medium.xml"/>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/stable.xml b/binaries/data/mods/public/art/actors/structures/persians/stable.xml
deleted file mode 100644
index d6fb27f1f5..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/stable.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>structural/pers_stable.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horsea" minheight="-20" maxheight="1.7"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horseb" minheight="-20" maxheight="1.7"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horsec" minheight="-20" maxheight="1.7"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_stable.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_medium.xml"/>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/tachara.xml b/binaries/data/mods/public/art/actors/structures/persians/tachara.xml
deleted file mode 100644
index bc80221499..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/tachara.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base a" file="structures/defensive_building.xml">
-      <mesh>structural/pers_civic.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/tachara_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_d.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shielda"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldb"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldc"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_civic_b.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_large.xml">
-      <props>
-        <prop actor="props/structures/persians/tachara_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/tachara_shrubs_d.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/persians/temple.xml b/binaries/data/mods/public/art/actors/structures/persians/temple.xml
deleted file mode 100644
index aa42676fa7..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/temple.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/pers_temple_1.dae</mesh>
-      <props>
-        <prop actor="props/structures/persians/temple.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_temple.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned" selectable="false"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_medium.xml">
-      <props>
-        <prop actor="props/structures/persians/temple.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/persians/trireme_ram.xml b/binaries/data/mods/public/art/actors/structures/persians/trireme_ram.xml
deleted file mode 100644
index 166b96a2aa..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/trireme_ram.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant frequency="1" file="others/ships/pers_trireme_oars.xml" name="Persian Ramming Trireme">
-      <mesh>structural/pers_ship_trireme.dae</mesh>
-      <textures>
-        <texture file="structural/pers_trireme.png" name="baseTex"/>
-        <texture file="structural/pers_trireme_spec.png" name="specTex"/>
-        <texture file="structural/pers_trireme_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_trireme.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="others/ships/pers_trireme_shields.xml" name="Persian Trireme Shields"/>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/persians/wall_gate.xml
deleted file mode 100644
index 506a3470b8..0000000000
--- a/binaries/data/mods/public/art/actors/structures/persians/wall_gate.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="wall gate">
-      <animations>
-        <animation file="mechanical/pers_wall_gate_closed.dae" name="gate_closed" speed="65"/>
-        <animation file="mechanical/pers_wall_gate_opening.dae" name="gate_opening" speed="65"/>
-        <animation file="mechanical/pers_wall_gate_open.dae" name="gate_open" speed="65"/>
-        <animation file="mechanical/pers_wall_gate_closing.dae" name="gate_closing" speed="65"/>
-      </animations>
-      <mesh>structural/pers_wall_gate.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_medium.xml"/>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/pirates/bireme.xml b/binaries/data/mods/public/art/actors/structures/pirates/bireme.xml
index 6ce7a3be86..6a81ad63bf 100644
--- a/binaries/data/mods/public/art/actors/structures/pirates/bireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/pirates/bireme.xml
@@ -3,17 +3,17 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" file="others/ships/pers_bireme_oars.xml" name="Persian bireme">
-      <mesh>structural/pers_ship_bireme.dae</mesh>
+    <variant frequency="100" file="others/ships/achae_bireme_oars.xml" name="Pirate Scout Ship">
+      <mesh>structural/achae_ship_bireme.dae</mesh>
       <props>
         <prop actor="props/structures/pirates/bireme_main_sail.xml" attachpoint="sail"/>
         <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
       </props>
       <textures>
-        <texture file="structural/pers_bireme.png" name="baseTex"/>
-        <texture file="structural/pers_bireme_spec.png" name="specTex"/>
-        <texture file="structural/pers_bireme_norm.png" name="normTex"/>
-        <texture file="structural/ao/pers_bireme.png" name="aoTex"/>
+        <texture file="structural/achae_bireme.png" name="baseTex"/>
+        <texture file="structural/achae_bireme_spec.png" name="specTex"/>
+        <texture file="structural/achae_bireme_norm.png" name="normTex"/>
+        <texture file="structural/ao/achae_bireme.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/pirates/trireme.xml b/binaries/data/mods/public/art/actors/structures/pirates/trireme.xml
index beaea939a2..f4c312acd8 100644
--- a/binaries/data/mods/public/art/actors/structures/pirates/trireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/pirates/trireme.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" file="others/ships/kart_trireme_oars.xml" name="Pirate Trireme">
+    <variant frequency="1" file="others/ships/kart_trireme_oars.xml" name="Pirate Arrow Ship">
       <mesh>structural/kart_ship_trireme.dae</mesh>
       <props>
         <prop actor="props/structures/pirates/trireme_fore_sail.xml" attachpoint="fore_sail"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml
index be0d26bcb6..05d11aa1cf 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml
@@ -11,7 +11,7 @@
         <prop actor="props/structures/ptolemies/settlement_greektent.xml" attachpoint="greektent" minheight="-20" maxheight="20"/>
         <prop actor="props/structures/ptolemies/settlement_arabtent.xml" attachpoint="arabtent" minheight="-20" maxheight="20"/>
         <prop actor="props/structures/ptolemies/settlement_bigtent.xml" attachpoint="bigtent" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse" minheight="-20" maxheight="20"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse" minheight="-20" maxheight="20"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/structures/ptolemies/settlement_entrance.xml" attachpoint="root"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/stable.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/stable.xml
index 96235315a2..cf038de7a8 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/stable.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/stable.xml
@@ -6,9 +6,9 @@
       <mesh>structural/ptol_stable.dae</mesh>
       <props>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horse_1"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horse_2"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horse_1"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horse_2"/>
       </props>
       <textures>
         <texture file="structural/ptol_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/stable.xml b/binaries/data/mods/public/art/actors/structures/seleucids/stable.xml
index 1f10f551a2..1396f76fa5 100644
--- a/binaries/data/mods/public/art/actors/structures/seleucids/stable.xml
+++ b/binaries/data/mods/public/art/actors/structures/seleucids/stable.xml
@@ -6,9 +6,9 @@
       <mesh>structural/sele_stable.dae</mesh>
       <props>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/stable_horse_a.xml" attachpoint="horse"/>
-        <prop actor="props/structures/persians/stable_horse_b.xml" attachpoint="horse_1"/>
-        <prop actor="props/structures/persians/stable_horse_c.xml" attachpoint="horse_2"/>
+        <prop actor="props/structures/achaemenids/stable_horse_a.xml" attachpoint="horse"/>
+        <prop actor="props/structures/achaemenids/stable_horse_b.xml" attachpoint="horse_1"/>
+        <prop actor="props/structures/achaemenids/stable_horse_c.xml" attachpoint="horse_2"/>
       </props>
       <textures>
         <texture file="structural/Sele_struct_2.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/temp/statue_pers_bull.xml b/binaries/data/mods/public/art/actors/temp/statue_achae_bull.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/temp/statue_pers_bull.xml
rename to binaries/data/mods/public/art/actors/temp/statue_achae_bull.xml
index 4f917615b0..1b70adf9dd 100644
--- a/binaries/data/mods/public/art/actors/temp/statue_pers_bull.xml
+++ b/binaries/data/mods/public/art/actors/temp/statue_achae_bull.xml
@@ -5,7 +5,7 @@
     <variant frequency="100" name="Base">
       <mesh>props/bull_statue.dae</mesh>
       <textures>
-        <texture file="props/pers_bull_a.dds" name="baseTex"/>
+        <texture file="props/achae_bull_a.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/temp/test_tower.xml b/binaries/data/mods/public/art/actors/temp/test_tower.xml
index a4c4391162..ba21cb7dc5 100644
--- a/binaries/data/mods/public/art/actors/temp/test_tower.xml
+++ b/binaries/data/mods/public/art/actors/temp/test_tower.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>temp/test_tower.dae</mesh>
       <textures>
-        <texture file="temp/pers_tower_01.dds" name="baseTex"/>
+        <texture file="temp/achae_tower_01.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_a_m.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_a_m.xml
index ca1f373621..22a174e06f 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_a_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_archer_a_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_archer_a_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
       </props>
@@ -27,7 +27,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_archer_a_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/achaemenids/cavalry_archer_a_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_a_r.xml
similarity index 74%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_a_r.xml
index ebf89d5aba..084fa9c541 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_a_r.xml
@@ -5,23 +5,23 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_yellow.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_yellow.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_pelta_e_reverse.xml" attachpoint="back"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/pers_quiver_hip.xml" attachpoint="sheath_L"/>
+        <prop actor="props/units/achae_quiver_hip.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="linothorax_01_01">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="linothorax_01_04">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_01_01">
@@ -36,12 +36,12 @@
     </variant>
     <variant frequency="1" name="padded_01_07">
       <textures>
-        <texture file="skeletal/pers/padded_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_01_08">
       <textures>
-        <texture file="skeletal/pers/padded_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_b_m.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_b_m.xml
index 6e67b93631..2467e6b8e0 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_b_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_archer_b_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_archer_b_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
       </props>
@@ -27,7 +27,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_archer_b_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/achaemenids/cavalry_archer_b_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_b_r.xml
similarity index 75%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_b_r.xml
index 6d100d5979..9534e556af 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_b_r.xml
@@ -5,37 +5,37 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/hele_thracian_cap_leather.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/pers_quiver_hip.xml" attachpoint="sheath_L"/>
+        <prop actor="props/units/achae_quiver_hip.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="tunic_coat_01_01">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_02">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_03">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_04">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_05">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_05.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_c_m.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_c_m.xml
index 59a42022f1..fabe8b46ff 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_c_m.xml
@@ -5,9 +5,9 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_archer_c_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_archer_c_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_c_r.xml
similarity index 53%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_c_r.xml
index 58450b5118..339be0a9a8 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_c_r.xml
@@ -5,9 +5,9 @@
     <variant>
       <mesh>skeletal/new/m_armor_pants.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/pers_quiver_back.xml" attachpoint="quiver_back"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/achae_quiver_back.xml" attachpoint="quiver_back"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
       </props>
@@ -16,22 +16,22 @@
   <group>
     <variant frequency="1" name="Rider-Armour-Iron">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="Rider-Armour-Bronze">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1a">
@@ -41,91 +41,91 @@
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-armband-full-1a">
       <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-armband-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-top-1a">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-top-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-bottom-1a">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-bottom-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="Arm Guards Iron">
       <props>
-        <prop actor="props/units/pers_bactrian_arm_left_iron.xml" attachpoint="shoulderpad_L"/>
-        <prop actor="props/units/pers_bactrian_arm_right_iron.xml" attachpoint="shoulderpad_R"/>
+        <prop actor="props/units/achae_bactrian_arm_left_iron.xml" attachpoint="shoulderpad_L"/>
+        <prop actor="props/units/achae_bactrian_arm_right_iron.xml" attachpoint="shoulderpad_R"/>
       </props>
     </variant>
     <variant frequency="1" name="Arm Guards Bronze">
       <props>
-        <prop actor="props/units/pers_bactrian_arm_left_bronze.xml" attachpoint="shoulderpad_L"/>
-        <prop actor="props/units/pers_bactrian_arm_right_bronze.xml" attachpoint="shoulderpad_R"/>
+        <prop actor="props/units/achae_bactrian_arm_left_bronze.xml" attachpoint="shoulderpad_L"/>
+        <prop actor="props/units/achae_bactrian_arm_right_bronze.xml" attachpoint="shoulderpad_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_e_m.xml
similarity index 83%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_e_m.xml
index 57d98cbb82..c585ea307c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_e_m.xml
@@ -5,9 +5,9 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_archer_e_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_archer_e_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
@@ -27,7 +27,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_archer_e_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/achaemenids/cavalry_archer_e_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_e_r.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_e_r.xml
index f5771bee84..0be32f22bd 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_archer_e_r.xml
@@ -5,11 +5,11 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/hele_scythian_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_back_curved_iron.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_back_curved_iron.xml" attachpoint="back"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/pers_quiver_hip.xml" attachpoint="sheath_L"/>
+        <prop actor="props/units/achae_quiver_hip.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
   </group>
@@ -23,8 +23,8 @@
     </variant>
     <variant frequency="3" name="scale_sleeve_top_01_02">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_a_m.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_a_m.xml
index 6fc2013d69..1f85e8ce6b 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_a_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_axeman_a_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
@@ -26,7 +26,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/achaemenids/cavalry_axeman_a_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_a_r.xml
similarity index 59%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_a_r.xml
index 330ccfe13e..f4042ea5e8 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_a_r.xml
@@ -5,37 +5,37 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/pelta_scyth_elite_bronze.xml" attachpoint="shield_arm"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="pers_isp_a_linothorax_1b">
+    <variant frequency="1" name="achae_isp_a_linothorax_1b">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1c">
+    <variant frequency="1" name="achae_isp_a_linothorax_1c">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1f">
+    <variant frequency="1" name="achae_isp_a_linothorax_1f">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_06.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1b">
+    <variant frequency="1" name="achae_isp_a_padded_1b">
       <textures>
-        <texture file="skeletal/pers/padded_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1i">
+    <variant frequency="1" name="achae_isp_a_padded_1i">
       <textures>
-        <texture file="skeletal/pers/padded_01_09.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_09.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -46,7 +46,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_shield.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_b_m.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_b_m.xml
index 5f52a243e5..10428ce2ee 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_b_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_axeman_b_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
@@ -26,7 +26,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/achaemenids/cavalry_axeman_b_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_b_r.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_b_r.xml
index 0b2956620a..c96a1d7f91 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_b_r.xml
@@ -5,8 +5,8 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_tan.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_tan.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/pelta_scyth_basic.xml" attachpoint="shield_arm"/>
       </props>
@@ -41,7 +41,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/promotion.xml"/>
-    <variant file="biped/rider/attack_slaughter_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_e_m.xml
similarity index 78%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_e_m.xml
index f099b62f96..6752f9ab3d 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_e_m.xml
@@ -5,10 +5,10 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/cavalry_axeman_e_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
@@ -27,7 +27,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/achaemenids/cavalry_axeman_e_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_e_r.xml
similarity index 61%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_e_r.xml
index 084dfbf553..156f2701b7 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_axeman_e_r.xml
@@ -5,60 +5,60 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/hele_scythian_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_back_curved_iron.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_back_curved_iron.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="Armor Iron Scales">
       <textures>
-        <texture file="skeletal/pers/scale_04_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_04_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_04_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_04_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-1a">
       <textures>
-        <texture file="skeletal/pers/scale_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-1c">
       <textures>
-        <texture file="skeletal/pers/scale_01_03.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-1f">
       <textures>
-        <texture file="skeletal/pers/scale_01_06.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-top-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-bottom-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -70,7 +70,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_shield.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_a_m.xml
similarity index 81%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_a_m.xml
index fd157ca7a0..90e65634ce 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_a_m.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers_basic.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_javelinist_a_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae_basic.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/achaemenids/cavalry_javelinist_a_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_a_r.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_a_r.xml
index 8c28e8a676..5b8d3e225a 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_a_r.xml
@@ -5,27 +5,27 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_pelta_e_reverse.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="padded_02_01">
       <textures>
-        <texture file="skeletal/pers/padded_02_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_02_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_02_02">
       <textures>
-        <texture file="skeletal/pers/padded_02_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_02_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_02_03">
       <textures>
-        <texture file="skeletal/pers/padded_02_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_02_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -37,7 +37,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/cavalry/attack_ranged_javelin.xml"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_ranged.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_b_m.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_b_m.xml
index 68e48f40ef..3bf7aca156 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_b_m.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_javelinist_b_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_javelinist_b_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_javelinist_b_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/achaemenids/cavalry_javelinist_b_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_b_r.xml
similarity index 62%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_b_r.xml
index 9850d0cb9e..6e36e25cdb 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_b_r.xml
@@ -5,69 +5,73 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
     </variant>
   </group>
   <group>
     <variant name="kidaris-tied-yellow-a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_y.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied_yellow.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara_y.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied_yellow.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="kidaris-tied-white-a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="kidaris-tied-white-b">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="tunic-basic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -79,17 +83,9 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/cavalry/attack_ranged_javelin.xml"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_ranged.xml"/>
   </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_e_m.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_e_m.xml
index 7773a5b05f..19a7b34010 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_e_m.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_winged_armor_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Winged-Armor-01">
-      <props>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_winged_armor_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="Winged-Armor-02">
-      <props>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_winged_armor_03.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_javelinist_a_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_winged_armor_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Winged-Armor-01">
+      <props>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_winged_armor_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Winged-Armor-02">
+      <props>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_winged_armor_03.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_javelin.xml" name="Javelinist-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/achaemenids/cavalry_javelinist_a_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_e_r.xml
similarity index 63%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_e_r.xml
index d70aa6ec76..8592240278 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_javelinist_e_r.xml
@@ -5,14 +5,14 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_pilos_crested.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/pers_hair.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_a_b_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_pilos_crested.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/achae_hair.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_pelta_a_b_reverse.xml" attachpoint="back"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -20,12 +20,12 @@
   <group>
     <variant frequency="1" name="Mail Iron">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Mail Bronze">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -37,7 +37,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/cavalry/attack_ranged_javelin.xml"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_ranged.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_a_m.xml
similarity index 81%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_a_m.xml
index 5830cb1900..6d6719da36 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_a_m.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_spearman_a_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers_basic.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_spearman_a_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_a_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae_basic.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_a_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_a_r.xml
similarity index 60%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_a_r.xml
index 0a45646e91..dbe027c53c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_a_r.xml
@@ -5,8 +5,8 @@
     <variant>
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/capes/rider/cape_med_player.xml" attachpoint="root"/>
       </props>
@@ -17,24 +17,24 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="pers_isp_a_linothorax_1a">
+    <variant frequency="1" name="achae_isp_a_linothorax_1a">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_01.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1d">
+    <variant frequency="1" name="achae_isp_a_linothorax_1d">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_04.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1e">
+    <variant frequency="1" name="achae_isp_a_linothorax_1e">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_05.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1f">
+    <variant frequency="1" name="achae_isp_a_linothorax_1f">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_06.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -45,7 +45,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_shield.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_b_m.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_b_m.xml
index 63bd1d73ef..e2504284ee 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_b_m.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_spearman_b_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_spearman_b_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_b_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_b_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_b_r.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_b_r.xml
index ada82edf7a..fa002399ec 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_b_r.xml
@@ -5,27 +5,27 @@
     <variant>
       <mesh>skeletal/new/m_pants.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/capes/rider/cape_med_player.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="3" name="pers_isp_a_padded_1g">
+    <variant frequency="3" name="achae_isp_a_padded_1g">
       <textures>
-        <texture file="skeletal/pers/padded_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_07.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1h">
+    <variant frequency="1" name="achae_isp_a_padded_1h">
       <textures>
-        <texture file="skeletal/pers/padded_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_08.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1i">
+    <variant frequency="1" name="achae_isp_a_padded_1i">
       <textures>
-        <texture file="skeletal/pers/padded_01_09.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_09.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -36,7 +36,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/promotion.xml"/>
-    <variant file="biped/rider/attack_slaughter_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_c_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_c_m.xml
similarity index 86%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_c_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_c_m.xml
index d540289000..c5cbcc36cb 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_c_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_c_m.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_spearman_c_r.xml" attachpoint="rider"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Cataphract-Armor-01">
-      <props>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_c_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Cataphract-Armor-01">
+      <props>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_c_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_c_r.xml
new file mode 100644
index 0000000000..7148c43d94
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_c_r.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/new/m_armor_pants.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/spear_lance_cavalry_reverse.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/achae_quiver_hip.xml" attachpoint="sheath_L"/>
+      </props>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Rider-Armour-Iron">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Rider-Armour-Bronze">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-sleeve-full-1a">
+      <textures>
+        <texture file="skeletal/scyth/scale_03_01.png" name="baseTex"/>
+        <texture file="skeletal/scyth/scale_03_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-sleeve-full-1b">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-armband-full-1a">
+      <textures>
+        <texture file="skeletal/achae/scale_armband_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-armband-full-1b">
+      <textures>
+        <texture file="skeletal/achae/scale_armband_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-sleeve-top-1a">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_top_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-sleeve-top-1b">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_top_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-sleeve-bottom-1a">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="scale-sleeve-bottom-1b">
+      <textures>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_bottom_01_spec.png" name="specTex"/>
+      </textures>
+      <props>
+        <prop actor="props/units/armor/achae_neckguard_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Arm Guards Iron">
+      <props>
+        <prop actor="props/units/achae_bactrian_arm_left_iron.xml" attachpoint="shoulderpad_L"/>
+        <prop actor="props/units/achae_bactrian_arm_right_iron.xml" attachpoint="shoulderpad_R"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Arm Guards Bronze">
+      <props>
+        <prop actor="props/units/achae_bactrian_arm_left_bronze.xml" attachpoint="shoulderpad_L"/>
+        <prop actor="props/units/achae_bactrian_arm_right_bronze.xml" attachpoint="shoulderpad_R"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/rider/cavalry/base_spearman_2h_fast_relax.xml" name="Spearman-2h-Fast-Relax" frequency="1"/>
+    <variant file="biped/rider/death_2h.xml"/>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_e_m.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_e_m.xml
index 57739b0177..cf211cb00f 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_e_m.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_spearman_e_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_spearman_e_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_e_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/achaemenids/cavalry_spearman_e_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_e_r.xml
similarity index 61%
rename from binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_e_r.xml
index bf1ee77461..8cd597e88c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/cavalry_spearman_e_r.xml
@@ -5,8 +5,8 @@
     <variant>
       <mesh>skeletal/new/m_pants.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_pilos_crested.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_pilos_crested.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/capes/rider/cape_long_player.xml" attachpoint="root"/>
       </props>
@@ -15,57 +15,57 @@
   <group>
     <variant frequency="1" name="scale-armband-1a">
       <textures>
-        <texture file="skeletal/pers/scale_armband_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-armband-1b">
       <textures>
-        <texture file="skeletal/pers/scale_armband_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-armband-full-1a">
       <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-armband-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-top-1a">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-top-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_top_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1a">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -77,7 +77,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/promotion.xml"/>
-    <variant file="biped/rider/attack_slaughter_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_d.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_d.xml
new file mode 100644
index 0000000000..ae0c006457
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_d.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_driver_chariot.xml">
+      <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_achae_tiara_y.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied_yellow.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="achae_isp_a_linothorax_1a">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1b">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1c">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1d">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_04.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1e">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_05.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1f">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_06.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1a">
+      <textures>
+        <texture file="skeletal/achae/padded_01_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1b">
+      <textures>
+        <texture file="skeletal/achae/padded_01_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1c">
+      <textures>
+        <texture file="skeletal/achae/padded_01_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1d">
+      <textures>
+        <texture file="skeletal/achae/padded_01_04.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1e">
+      <textures>
+        <texture file="skeletal/achae/padded_01_05.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1f">
+      <textures>
+        <texture file="skeletal/achae/padded_01_06.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1g">
+      <textures>
+        <texture file="skeletal/achae/padded_01_07.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1h">
+      <textures>
+        <texture file="skeletal/achae/padded_01_08.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1i">
+      <textures>
+        <texture file="skeletal/achae/padded_01_09.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <group>
+    <variant>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h1.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h1.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h1.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h1.xml
index 452b4defbd..bbe2da79bf 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h1.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h1.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-04"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-04"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h2.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h2.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h2.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h2.xml
index 69ffb1d288..b3ea168ac3 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h2.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h2.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h3.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h3.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h3.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h3.xml
index 656f122652..96eab72b8e 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h3.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h3.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h4.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h4.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h4.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h4.xml
index 85760ea08e..25d0baa26c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_h4.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_h4.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-07"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-07"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_m.xml
similarity index 66%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_m.xml
index b4f25ed240..a233580476 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_m.xml
@@ -13,17 +13,17 @@
         <animation file="mechanical/chariot_death.dae" name="Death" id="death2" speed="100"/>
         <animation file="mechanical/chariot_idle.dae" name="attack_ranged" speed="80"/>
       </animations>
-      <mesh>structural/pers_chariot_a.dae</mesh>
+      <mesh>structural/achae_chariot_a.dae</mesh>
       <props>
-        <prop actor="units/persians/chariot_archer_a_h1.xml" attachpoint="horse1"/>
-        <prop actor="units/persians/chariot_archer_a_h2.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_a_h3.xml" attachpoint="horse3"/>
-        <prop actor="units/persians/chariot_archer_a_h4.xml" attachpoint="horse4"/>
-        <prop actor="units/persians/chariot_archer_a_r.xml" attachpoint="rider1"/>
-        <prop actor="units/persians/chariot_archer_a_d.xml" attachpoint="driver1"/>
+        <prop actor="units/achaemenids/chariot_archer_a_h1.xml" attachpoint="horse1"/>
+        <prop actor="units/achaemenids/chariot_archer_a_h2.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_a_h3.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_a_h4.xml" attachpoint="horse4"/>
+        <prop actor="units/achaemenids/chariot_archer_a_r.xml" attachpoint="rider1"/>
+        <prop actor="units/achaemenids/chariot_archer_a_d.xml" attachpoint="driver1"/>
       </props>
       <textures>
-        <texture file="structural/pers_chariot_a.png" name="baseTex"/>
+        <texture file="structural/achae_chariot_a.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_r.xml
similarity index 64%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_r.xml
index cd18a087e7..bf7cb6f5fa 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_a_r.xml
@@ -5,15 +5,15 @@
     <variant file="biped/base_archer_chariot_ready.xml">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_L"/>
         <prop actor="props/units/quiver_hip.xml" attachpoint="sheath_L"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_pelta_e_reverse.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_02_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_02_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -21,37 +21,37 @@
   <group>
     <variant frequency="1" name="scale-2a">
       <textures>
-        <texture file="skeletal/pers/scale_02_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2b">
       <textures>
-        <texture file="skeletal/pers/scale_02_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2c">
       <textures>
-        <texture file="skeletal/pers/scale_02_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2d">
       <textures>
-        <texture file="skeletal/pers/scale_02_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2e">
       <textures>
-        <texture file="skeletal/pers/scale_02_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2f">
       <textures>
-        <texture file="skeletal/pers/scale_02_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2g">
       <textures>
-        <texture file="skeletal/pers/scale_02_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_07.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_h1.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_h1.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_h1.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_h1.xml
index 320d7e1915..00d7c0f6e2 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_h1.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_h1.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_cloth.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-04"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_cloth.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-04"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_h2.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_h2.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_h2.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_h2.xml
index 041f3e9a52..5a5e86c7ec 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_h2.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_h2.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_cloth.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-07"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_cloth.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-07"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_m.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_m.xml
index dee3d85525..47309dc64b 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_m.xml
@@ -13,14 +13,14 @@
         <animation file="mechanical/chariot_death.dae" name="Death" id="death2" speed="100"/>
         <animation file="mechanical/chariot_idle.dae" name="attack_ranged" speed="80"/>
       </animations>
-      <mesh>structural/pers_chariot_b.dae</mesh>
+      <mesh>structural/achae_chariot_b.dae</mesh>
       <props>
-        <prop actor="units/persians/chariot_archer_b_r.xml" attachpoint="rider1"/>
-        <prop actor="units/persians/chariot_archer_b_h1.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_b_h2.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_b_r.xml" attachpoint="rider1"/>
+        <prop actor="units/achaemenids/chariot_archer_b_h1.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_b_h2.xml" attachpoint="horse3"/>
       </props>
       <textures>
-        <texture file="structural/pers_chariot_b.png" name="baseTex"/>
+        <texture file="structural/achae_chariot_b.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_r.xml
similarity index 69%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_r.xml
index 80d1b99e9e..6e89a8ca50 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_b_r.xml
@@ -5,8 +5,8 @@
     <variant file="biped/base_archer_chariot_ready.xml">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_L"/>
         <prop actor="props/units/quiver_hip.xml" attachpoint="sheath_L"/>
@@ -16,37 +16,37 @@
   <group>
     <variant frequency="1" name="tunic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_07.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_d.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_d.xml
similarity index 63%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_d.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_d.xml
index 86ce4796bc..a0294a94cc 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_d.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_d.xml
@@ -5,11 +5,11 @@
     <variant file="biped/base_driver_chariot.xml">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_all.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_all.xml" attachpoint="helmet"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_02_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_02_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -17,37 +17,37 @@
   <group>
     <variant frequency="1" name="scale-2a">
       <textures>
-        <texture file="skeletal/pers/scale_02_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2b">
       <textures>
-        <texture file="skeletal/pers/scale_02_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2c">
       <textures>
-        <texture file="skeletal/pers/scale_02_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2d">
       <textures>
-        <texture file="skeletal/pers/scale_02_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2e">
       <textures>
-        <texture file="skeletal/pers/scale_02_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2f">
       <textures>
-        <texture file="skeletal/pers/scale_02_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2g">
       <textures>
-        <texture file="skeletal/pers/scale_02_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_07.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h1.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h1.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h1.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h1.xml
index 7a0c2fdec7..a371655d09 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h1.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h1.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_back_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-07"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_back_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-07"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h2.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h2.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h2.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h2.xml
index c6e609b76a..ee76a40c90 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h2.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h2.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_back_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_back_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h3.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h3.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h3.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h3.xml
index 597a1e2436..d74980882c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h3.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h3.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_back_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-04"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_back_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-04"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h4.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h4.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h4.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h4.xml
index 8191066041..906da12a35 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_h4.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_h4.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="props/horse/cav_blanket_back_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-03"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-05"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-06"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-07"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="props/horse/cav_blanket_back_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="horse-03"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="horse-05"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="horse-06"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="horse-07"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="horse-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_chariot.xml" name="Chariot-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_m.xml
similarity index 64%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_m.xml
index 779d2832c8..1913155909 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_m.xml
@@ -13,18 +13,18 @@
         <animation file="mechanical/chariot_death.dae" name="Death" id="death2" speed="100"/>
         <animation file="mechanical/chariot_idle.dae" name="attack_ranged" speed="80"/>
       </animations>
-      <mesh>structural/pers_chariot_e.dae</mesh>
+      <mesh>structural/achae_chariot_e.dae</mesh>
       <props>
-        <prop actor="props/units/pers_chariot_e_emblem.xml" attachpoint="root"/>
-        <prop actor="units/persians/chariot_archer_e_h1.xml" attachpoint="horse1"/>
-        <prop actor="units/persians/chariot_archer_e_h2.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_e_h3.xml" attachpoint="horse3"/>
-        <prop actor="units/persians/chariot_archer_e_h4.xml" attachpoint="horse4"/>
-        <prop actor="units/persians/chariot_archer_e_r.xml" attachpoint="rider1"/>
-        <prop actor="units/persians/chariot_archer_e_d.xml" attachpoint="driver1"/>
+        <prop actor="props/units/achae_chariot_e_emblem.xml" attachpoint="root"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h1.xml" attachpoint="horse1"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h2.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h3.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h4.xml" attachpoint="horse4"/>
+        <prop actor="units/achaemenids/chariot_archer_e_r.xml" attachpoint="rider1"/>
+        <prop actor="units/achaemenids/chariot_archer_e_d.xml" attachpoint="driver1"/>
       </props>
       <textures>
-        <texture file="structural/pers_chariot_e.png" name="baseTex"/>
+        <texture file="structural/achae_chariot_e.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_r.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_r.xml
index 771bfb4fd5..5311bbcf48 100644
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/chariot_archer_e_r.xml
@@ -5,74 +5,74 @@
     <variant file="biped/base_archer_chariot_ready.xml">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_L"/>
         <prop actor="props/units/quiver_hip.xml" attachpoint="sheath_L"/>
-        <prop actor="props/units/shields/pers_pelta_a_b_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_pelta_a_b_reverse.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="scale-armband-1a">
       <textures>
-        <texture file="skeletal/pers/scale_armband_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze_archer.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze_archer.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-armband-1b">
       <textures>
-        <texture file="skeletal/pers/scale_armband_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron_archer.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron_archer.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-armband-full-1a">
       <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze_archer.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze_archer.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-armband-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_armband_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron_archer.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron_archer.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1a">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze_archer.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_bronze_archer.xml" attachpoint="root"/>
       </props>
     </variant>
     <variant frequency="1" name="scale-sleeve-full-1b">
       <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_sleeve_full_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
       <props>
-        <prop actor="props/units/armor/pers_neckguard_iron_archer.xml" attachpoint="root"/>
+        <prop actor="props/units/armor/achae_neckguard_iron_archer.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/citizen_female.xml b/binaries/data/mods/public/art/actors/units/achaemenids/citizen_female.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/units/persians/citizen_female.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/citizen_female.xml
index 958ab25038..070e6e39d3 100644
--- a/binaries/data/mods/public/art/actors/units/persians/citizen_female.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/citizen_female.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/f_dress.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_fem_1.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_fem_1.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
@@ -16,23 +16,23 @@
   <group>
     <variant frequency="1" name="Dress-01">
       <textures>
-        <texture file="skeletal/pers/dress_female_01_01.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_01.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Dress-02">
       <textures>
-        <texture file="skeletal/pers/dress_female_01_02.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_02.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Dress-03">
       <textures>
-        <texture file="skeletal/pers/dress_female_01_03.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_03.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Dress-03">
       <mesh>skeletal/new/f_armor_dress.dae</mesh>
       <textures>
-        <texture file="skeletal/pers/dress_female_full_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_full_01.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/citizen_male.xml b/binaries/data/mods/public/art/actors/units/achaemenids/citizen_male.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/units/persians/citizen_male.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/citizen_male.xml
index 4741636379..b3e97c9e83 100644
--- a/binaries/data/mods/public/art/actors/units/persians/citizen_male.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/citizen_male.xml
@@ -4,7 +4,7 @@
   <group>
     <variant frequency="1" name="Base">
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
@@ -15,42 +15,42 @@
   <group>
     <variant frequency="1" name="tunic-basic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/elephantry_c_d.xml b/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_d.xml
similarity index 93%
rename from binaries/data/mods/public/art/actors/units/persians/elephantry_c_d.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_d.xml
index 13d86ae9de..1f1cab2bcd 100644
--- a/binaries/data/mods/public/art/actors/units/persians/elephantry_c_d.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_d.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_maur_short_hair.xml" attachpoint="head"/>
         <prop actor="props/units/heads/maur_maiden_big_turban.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/axe_single.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_arm"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_arm"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/elephantry_c_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_m.xml
similarity index 82%
rename from binaries/data/mods/public/art/actors/units/persians/elephantry_c_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_m.xml
index 6a591295fa..12a7f5431c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/elephantry_c_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_m.xml
@@ -5,8 +5,8 @@
     <variant file="quadraped/base_elephant_asian.xml">
       <mesh>skeletal/elephant_asian_armored_01.dae</mesh>
       <props>
-        <prop actor="units/persians/elephantry_c_d.xml" attachpoint="rider"/>
-        <prop actor="units/persians/elephantry_c_r.xml" attachpoint="rider1"/>
+        <prop actor="units/achaemenids/elephantry_c_d.xml" attachpoint="rider"/>
+        <prop actor="units/achaemenids/elephantry_c_r.xml" attachpoint="rider1"/>
       </props>
       <textures>
         <texture file="skeletal/maur/elephant_archer.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_r.xml
new file mode 100644
index 0000000000..f83d228229
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/elephantry_c_r.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_elephant_rider_relax.xml" frequency="100" name="Base">
+      <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_pilos_crested.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
+        <prop actor="props/units/shields/gerron_x.xml" attachpoint="shield_arm"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="achae_isp_a_linothorax_1a">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1b">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1c">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1d">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_04.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1e">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_05.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_linothorax_1f">
+      <textures>
+        <texture file="skeletal/achae/linothorax_01_06.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1a">
+      <textures>
+        <texture file="skeletal/achae/padded_01_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1b">
+      <textures>
+        <texture file="skeletal/achae/padded_01_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1c">
+      <textures>
+        <texture file="skeletal/achae/padded_01_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1d">
+      <textures>
+        <texture file="skeletal/achae/padded_01_04.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1e">
+      <textures>
+        <texture file="skeletal/achae/padded_01_05.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1f">
+      <textures>
+        <texture file="skeletal/achae/padded_01_06.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1g">
+      <textures>
+        <texture file="skeletal/achae/padded_01_07.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1h">
+      <textures>
+        <texture file="skeletal/achae/padded_01_08.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="achae_isp_a_padded_1i">
+      <textures>
+        <texture file="skeletal/achae/padded_01_09.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/achaemenids/female_citizen.xml
similarity index 88%
rename from binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/female_citizen.xml
index 46d91d25d4..230d792c44 100644
--- a/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/female_citizen.xml
@@ -4,7 +4,7 @@
   <group>
     <variant>
       <props>
-        <prop actor="props/units/heads/new/head_pers_fem_1.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_fem_1.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
@@ -16,19 +16,19 @@
     <variant frequency="1" name="Dress-01">
       <mesh>skeletal/new/f_dress.dae</mesh>
       <textures>
-        <texture file="skeletal/pers/dress_female_01_01.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_01.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Dress-02">
       <mesh>skeletal/new/f_dress.dae</mesh>
       <textures>
-        <texture file="skeletal/pers/dress_female_01_02.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_02.dds" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Dress-03">
       <mesh>skeletal/new/f_dress.dae</mesh>
       <textures>
-        <texture file="skeletal/pers/dress_female_01_03.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_03.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/fisherman.xml b/binaries/data/mods/public/art/actors/units/achaemenids/fisherman.xml
similarity index 63%
rename from binaries/data/mods/public/art/actors/units/persians/fisherman.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/fisherman.xml
index ccbab8817a..bcfc2216f2 100644
--- a/binaries/data/mods/public/art/actors/units/persians/fisherman.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/fisherman.xml
@@ -5,55 +5,59 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="tunic-basic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
-    <variant file="biped/fisher/base_pers.xml"/>
-    <variant file="biped/fisher/carry_pers.xml"/>
+    <variant file="biped/fisher/base_achae.xml"/>
+    <variant file="biped/fisher/carry_achae.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
@@ -61,13 +65,5 @@
     <variant file="biped/fisher/walk.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/healer.xml b/binaries/data/mods/public/art/actors/units/achaemenids/healer.xml
similarity index 72%
rename from binaries/data/mods/public/art/actors/units/persians/healer.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/healer.xml
index c2a74ebf90..347f9edb3f 100644
--- a/binaries/data/mods/public/art/actors/units/persians/healer.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/healer.xml
@@ -5,12 +5,12 @@
     <variant file="biped/base_healer_male.xml">
       <mesh>skeletal/new/m_dress_sleeves.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_mouth.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara_mouth.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
         <prop actor="props/units/staff.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/robes_healer_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/robes_healer_01.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_cavalry_spearman_cyrus_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_cavalry_spearman_cyrus_m.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/units/persians/hero_cavalry_spearman_cyrus_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_cavalry_spearman_cyrus_m.xml
index b81d20889e..f8bd8cc1e7 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_cavalry_spearman_cyrus_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_cavalry_spearman_cyrus_m.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/hero_cavalry_spearman_cyrus_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers_hero.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/achaemenids/hero_cavalry_spearman_cyrus_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae_hero.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/achaemenids/hero_cavalry_spearman_cyrus_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_cavalry_spearman_cyrus_r.xml
new file mode 100644
index 0000000000..9263d967a7
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_cavalry_spearman_cyrus_r.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/new/m_armor_pants.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_achae_hero_1.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_royal_loose.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/spear_lance_achaemenid.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/achae_taka_cyrus.xml" attachpoint="shield_arm"/>
+        <prop actor="props/units/achae_quiver_hip.xml" attachpoint="sheath_L"/>
+        <prop actor="props/units/achae_bactrian_arm_left_bronze.xml" attachpoint="shoulderpad_L"/>
+        <prop actor="props/units/achae_bactrian_arm_right_bronze.xml" attachpoint="shoulderpad_R"/>
+        <prop actor="props/units/capes/rider/cape_long_player.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="skeletal/achae/scale_05_01.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/rider/cavalry/base_spearman_ready.xml" name="Spearman-Ready" frequency="1"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_darius_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_darius_m.xml
similarity index 62%
rename from binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_darius_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_darius_m.xml
index fd0d2b4338..f629169fe4 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_darius_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_darius_m.xml
@@ -13,19 +13,19 @@
         <animation file="mechanical/chariot_death.dae" name="Death" id="death2" speed="100"/>
         <animation file="mechanical/chariot_idle.dae" name="attack_ranged" speed="80"/>
       </animations>
-      <mesh>structural/pers_chariot_e.dae</mesh>
+      <mesh>structural/achae_chariot_e.dae</mesh>
       <props>
-        <prop actor="props/units/pers_chariot_hero_emblem.xml" attachpoint="root"/>
-        <prop actor="units/persians/chariot_archer_e_h2.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_e_h3.xml" attachpoint="horse3"/>
-        <prop actor="units/persians/chariot_archer_e_h4.xml" attachpoint="horse4"/>
-        <prop actor="units/persians/chariot_archer_e_h1.xml" attachpoint="horse1"/>
-        <prop actor="units/persians/hero_chariot_archer_darius_r.xml" attachpoint="rider1"/>
-        <prop actor="units/persians/chariot_archer_e_d.xml" attachpoint="driver1"/>
+        <prop actor="props/units/achae_chariot_hero_emblem.xml" attachpoint="root"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h2.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h3.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h4.xml" attachpoint="horse4"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h1.xml" attachpoint="horse1"/>
+        <prop actor="units/achaemenids/hero_chariot_archer_darius_r.xml" attachpoint="rider1"/>
+        <prop actor="units/achaemenids/chariot_archer_e_d.xml" attachpoint="driver1"/>
       </props>
       <textures>
-        <texture file="structural/pers_chariot_darius.png" name="baseTex"/>
-        <texture file="structural/pers_chariot_hero_spec.png" name="specTex"/>
+        <texture file="structural/achae_chariot_darius.png" name="baseTex"/>
+        <texture file="structural/achae_chariot_hero_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_darius_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_darius_r.xml
similarity index 72%
rename from binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_darius_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_darius_r.xml
index 65bb468dda..2fd341067c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_darius_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_darius_r.xml
@@ -5,17 +5,17 @@
     <variant file="biped/base_archer_chariot_ready.xml">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_darius.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_crown.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/pers_hair_xerxes.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_darius.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_crown.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/achae_hair_xerxes.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/quiver_hip.xml" attachpoint="sheath_L"/>
         <prop actor="props/units/capes/rider/bow_chariot_hip.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_kardakes_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_d.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_d.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_d.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_d.xml
index a9bc21b765..9f970a49ac 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_d.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_d.xml
@@ -5,12 +5,12 @@
     <variant file="biped/base_driver_chariot.xml">
       <mesh>skeletal/new/m_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_yellow.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_yellow.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_pelta_e_reverse.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/tunic_basic_03_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_03_02.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_m.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_m.xml
similarity index 62%
rename from binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_m.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_m.xml
index 0324743661..1e2ec1940c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_m.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_m.xml
@@ -13,19 +13,19 @@
         <animation file="mechanical/chariot_death.dae" name="Death" id="death2" speed="100"/>
         <animation file="mechanical/chariot_idle.dae" name="attack_ranged" speed="80"/>
       </animations>
-      <mesh>structural/pers_chariot_e.dae</mesh>
+      <mesh>structural/achae_chariot_e.dae</mesh>
       <props>
-        <prop actor="props/units/pers_chariot_hero_emblem.xml" attachpoint="root"/>
-        <prop actor="units/persians/chariot_archer_e_h2.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_e_h3.xml" attachpoint="horse3"/>
-        <prop actor="units/persians/chariot_archer_e_h4.xml" attachpoint="horse4"/>
-        <prop actor="units/persians/chariot_archer_e_h1.xml" attachpoint="horse1"/>
-        <prop actor="units/persians/hero_chariot_archer_xerxes_r.xml" attachpoint="rider1"/>
-        <prop actor="units/persians/hero_chariot_archer_xerxes_d.xml" attachpoint="driver1"/>
+        <prop actor="props/units/achae_chariot_hero_emblem.xml" attachpoint="root"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h2.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h3.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h4.xml" attachpoint="horse4"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h1.xml" attachpoint="horse1"/>
+        <prop actor="units/achaemenids/hero_chariot_archer_xerxes_r.xml" attachpoint="rider1"/>
+        <prop actor="units/achaemenids/hero_chariot_archer_xerxes_d.xml" attachpoint="driver1"/>
       </props>
       <textures>
-        <texture file="structural/pers_chariot_xerxes.png" name="baseTex"/>
-        <texture file="structural/pers_chariot_hero_spec.png" name="specTex"/>
+        <texture file="structural/achae_chariot_xerxes.png" name="baseTex"/>
+        <texture file="structural/achae_chariot_hero_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_r.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_r.xml
similarity index 68%
rename from binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_r.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_r.xml
index 1f450bc91d..2f6e869004 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_chariot_archer_xerxes_r.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_chariot_archer_xerxes_r.xml
@@ -5,15 +5,15 @@
     <variant file="biped/base_archer_chariot_ready.xml">
       <mesh>skeletal/new/m_dress_sleeves.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_xerxes.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_crown.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/pers_hair_xerxes.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_xerxes.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_crown.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/achae_hair_xerxes.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/pers_quiver_xerxes.xml" attachpoint="back"/>
+        <prop actor="props/units/achae_quiver_xerxes.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/robes_royal_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/robes_royal_01.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_infantry_archer_xerxes.xml b/binaries/data/mods/public/art/actors/units/achaemenids/hero_infantry_archer_xerxes.xml
similarity index 69%
rename from binaries/data/mods/public/art/actors/units/persians/hero_infantry_archer_xerxes.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/hero_infantry_archer_xerxes.xml
index 504ef85019..d26c19f7c6 100644
--- a/binaries/data/mods/public/art/actors/units/persians/hero_infantry_archer_xerxes.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/hero_infantry_archer_xerxes.xml
@@ -5,15 +5,15 @@
     <variant file="biped/base_archer_ready.xml">
       <mesh>skeletal/new/m_dress_sleeves.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_xerxes.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_crown.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/pers_hair_xerxes.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_xerxes.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_crown.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/achae_hair_xerxes.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/pers_quiver_xerxes.xml" attachpoint="back"/>
+        <prop actor="props/units/achae_quiver_xerxes.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/robes_royal_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/robes_royal_01.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_a.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_archer_a.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_a.xml
index 14754aa56c..60f3b8f243 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_a.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_a.xml
@@ -5,49 +5,49 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_all.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_all.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/quiver_hip.xml" attachpoint="sheath_L"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_pelta_e_reverse.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="tunic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_advanced_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_advanced_01_07.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_b.xml
similarity index 92%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_archer_b.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_b.xml
index ae94009ef2..06cb34880d 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_b.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/hele_thracian_cap_leather.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
@@ -31,12 +31,12 @@
     </variant>
     <variant frequency="3" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_c.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_c.xml
similarity index 62%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_archer_c.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_c.xml
index e85915c6aa..0f84f84e22 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_c.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_c.xml
@@ -5,14 +5,14 @@
     <variant>
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/quivers/pers_back.xml" attachpoint="back"/>
+        <prop actor="props/units/quivers/achae_back.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -20,56 +20,56 @@
   <group>
     <variant frequency="1" name="Armor Bronze Scales">
       <textures>
-        <texture file="skeletal/pers/scale_04_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_04_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_04_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_04_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="Armor Iron Scales">
       <textures>
-        <texture file="skeletal/pers/scale_03_01.dds" name="baseTex"/>
-        <texture file="skeletal/pers/scale_04_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_03_01.dds" name="baseTex"/>
+        <texture file="skeletal/achae/scale_04_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="scale-1a">
       <textures>
-        <texture file="skeletal/pers/scale_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1b">
       <textures>
-        <texture file="skeletal/pers/scale_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="scale-1c">
       <textures>
-        <texture file="skeletal/pers/scale_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1d">
       <textures>
-        <texture file="skeletal/pers/scale_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1e">
       <textures>
-        <texture file="skeletal/pers/scale_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="scale-1f">
       <textures>
-        <texture file="skeletal/pers/scale_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1g">
       <textures>
-        <texture file="skeletal/pers/scale_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1h">
       <textures>
-        <texture file="skeletal/pers/scale_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_e.xml
similarity index 77%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_archer_e.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_e.xml
index aa649fbb18..afb51e147a 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_archer_e.xml
@@ -5,16 +5,16 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/pers_hair.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/achae_hair.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/quiver_hip.xml" attachpoint="sheath_L"/>
-        <prop actor="props/units/shields/pers_pelta_a_b_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/achae_pelta_a_b_reverse.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_02_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_02_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -22,22 +22,22 @@
   <group>
     <variant frequency="1" name="scale-2a">
       <textures>
-        <texture file="skeletal/pers/scale_02_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2b">
       <textures>
-        <texture file="skeletal/pers/scale_02_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2c">
       <textures>
-        <texture file="skeletal/pers/scale_02_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2f">
       <textures>
-        <texture file="skeletal/pers/scale_02_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_06.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_a.xml
similarity index 82%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_a.xml
index 127eb19e6e..54c1e0c2d8 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_a.xml
@@ -5,8 +5,8 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_tan.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_tan.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/pelta_thra_basic.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
@@ -16,27 +16,27 @@
   <group>
     <variant frequency="1" name="tunic_coat_01_01">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_02">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_03">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_04">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic_coat_01_05">
       <textures>
-        <texture file="skeletal/pers/tunic_coat_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_coat_01_05.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_b.xml
similarity index 90%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_b.xml
index df6a11ba5b..a356a72943 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_b.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/pelta_thra_basic.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
@@ -15,12 +15,12 @@
   <group>
     <variant frequency="1" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_c.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_c.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_c.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_c.xml
index c2662f5b46..2950ab04a3 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_c.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_c.xml
@@ -5,15 +5,15 @@
     <variant>
       <mesh>skeletal/new/m_pants_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_elite.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_yellow.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_taka_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/new/head_achae_elite.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_yellow.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_taka_e.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/capes/cape_long_player_skirmisher.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -21,12 +21,12 @@
   <group>
     <variant frequency="1" name="Mail Iron">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Mail Bronze">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_e.xml
similarity index 82%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_e.xml
index 5c75c88b3b..42534ac0aa 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_javelinist_e.xml
@@ -5,9 +5,9 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_taka_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_taka_e.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/capes/cape_long_player_skirmisher.xml" attachpoint="root"/>
@@ -17,22 +17,22 @@
   <group>
     <variant frequency="1" name="padded_01_01">
       <textures>
-        <texture file="skeletal/pers/padded_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_01_06">
       <textures>
-        <texture file="skeletal/pers/padded_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_01_07">
       <textures>
-        <texture file="skeletal/pers/padded_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_01_08">
       <textures>
-        <texture file="skeletal/pers/padded_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_a.xml
similarity index 54%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_spearman_a.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_a.xml
index 239b7ee8aa..45d8184745 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_a.xml
@@ -5,87 +5,87 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_all.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_tower_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_all.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_tower_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="pers_isp_a_linothorax_1a">
+    <variant frequency="1" name="achae_isp_a_linothorax_1a">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_01.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1b">
+    <variant frequency="1" name="achae_isp_a_linothorax_1b">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1c">
+    <variant frequency="1" name="achae_isp_a_linothorax_1c">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1d">
+    <variant frequency="1" name="achae_isp_a_linothorax_1d">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_04.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1e">
+    <variant frequency="1" name="achae_isp_a_linothorax_1e">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_05.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1f">
+    <variant frequency="1" name="achae_isp_a_linothorax_1f">
       <textures>
-        <texture file="skeletal/pers/linothorax_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/linothorax_01_06.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1a">
+    <variant frequency="1" name="achae_isp_a_padded_1a">
       <textures>
-        <texture file="skeletal/pers/padded_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_01.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1b">
+    <variant frequency="1" name="achae_isp_a_padded_1b">
       <textures>
-        <texture file="skeletal/pers/padded_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1c">
+    <variant frequency="1" name="achae_isp_a_padded_1c">
       <textures>
-        <texture file="skeletal/pers/padded_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1d">
+    <variant frequency="1" name="achae_isp_a_padded_1d">
       <textures>
-        <texture file="skeletal/pers/padded_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_04.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1e">
+    <variant frequency="1" name="achae_isp_a_padded_1e">
       <textures>
-        <texture file="skeletal/pers/padded_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_05.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1f">
+    <variant frequency="1" name="achae_isp_a_padded_1f">
       <textures>
-        <texture file="skeletal/pers/padded_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_06.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1g">
+    <variant frequency="1" name="achae_isp_a_padded_1g">
       <textures>
-        <texture file="skeletal/pers/padded_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_07.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1h">
+    <variant frequency="1" name="achae_isp_a_padded_1h">
       <textures>
-        <texture file="skeletal/pers/padded_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_08.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1i">
+    <variant frequency="1" name="achae_isp_a_padded_1i">
       <textures>
-        <texture file="skeletal/pers/padded_01_09.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_01_09.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_b.xml
similarity index 71%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_spearman_b.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_b.xml
index 9ee35c1984..0d79ee80f8 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_b.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/achae_tower.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
@@ -13,66 +13,66 @@
   <group>
     <variant name="kidaris-tied-yellow-a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_y.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied_yellow.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara_y.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied_yellow.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="kidaris-tied-yellow-b">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_y.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_tiara_y.xml" attachpoint="head"/>
       </props>
     </variant>
     <variant name="kidaris-tied-white-a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="kidaris-tied-white-b">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="tunic-basic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c.xml
similarity index 74%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c.xml
index 94a595d314..8cf9eb5253 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c.xml
@@ -5,15 +5,15 @@
     <variant>
       <mesh>skeletal/new/m_dress_sleeves.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/pers_hair_xerxes.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/achae_hair_xerxes.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/quivers/pers_back.xml" attachpoint="back"/>
+        <prop actor="props/units/quivers/achae_back.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/robes_royal_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/robes_royal_02.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c2.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c2.xml
similarity index 61%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c2.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c2.xml
index 7230756a3a..6a1544be43 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c2.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c2.xml
@@ -5,14 +5,14 @@
     <variant>
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/pers_quiver_back.xml" attachpoint="back"/>
+        <prop actor="props/units/achae_quiver_back.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -20,56 +20,56 @@
   <group>
     <variant frequency="1" name="Armor Bronze Scales">
       <textures>
-        <texture file="skeletal/pers/scale_04_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_04_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_04_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_04_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="Armor Iron Scales">
       <textures>
-        <texture file="skeletal/pers/scale_03_01.dds" name="baseTex"/>
-        <texture file="skeletal/pers/scale_04_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_03_01.dds" name="baseTex"/>
+        <texture file="skeletal/achae/scale_04_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="scale-1a">
       <textures>
-        <texture file="skeletal/pers/scale_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1b">
       <textures>
-        <texture file="skeletal/pers/scale_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="scale-1c">
       <textures>
-        <texture file="skeletal/pers/scale_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1d">
       <textures>
-        <texture file="skeletal/pers/scale_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1e">
       <textures>
-        <texture file="skeletal/pers/scale_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="scale-1f">
       <textures>
-        <texture file="skeletal/pers/scale_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1g">
       <textures>
-        <texture file="skeletal/pers/scale_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="scale-1h">
       <textures>
-        <texture file="skeletal/pers/scale_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c3.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c3.xml
similarity index 70%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c3.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c3.xml
index e1cd8926c3..696e9bdb8f 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_c3.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_c3.xml
@@ -5,13 +5,13 @@
     <variant>
       <mesh>skeletal/new/m_armor_pants_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_all.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/aspis_pers_kardakes.xml" attachpoint="shield_arm"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_all.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/aspis_achae_kardakes.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -19,12 +19,12 @@
   <group>
     <variant frequency="1" name="Mail Iron">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Mail Bronze">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_e.xml
similarity index 74%
rename from binaries/data/mods/public/art/actors/units/persians/infantry_spearman_e.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_e.xml
index 40928c36bf..be500f2449 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/infantry_spearman_e.xml
@@ -5,13 +5,13 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_tower_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/achae_tower_e.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_02_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_02_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -19,37 +19,37 @@
   <group>
     <variant frequency="1" name="scale-2a">
       <textures>
-        <texture file="skeletal/pers/scale_02_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2b">
       <textures>
-        <texture file="skeletal/pers/scale_02_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2c">
       <textures>
-        <texture file="skeletal/pers/scale_02_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2d">
       <textures>
-        <texture file="skeletal/pers/scale_02_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2e">
       <textures>
-        <texture file="skeletal/pers/scale_02_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2f">
       <textures>
-        <texture file="skeletal/pers/scale_02_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="scale-2g">
       <textures>
-        <texture file="skeletal/pers/scale_02_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_02_07.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/trader.xml b/binaries/data/mods/public/art/actors/units/achaemenids/trader.xml
similarity index 94%
rename from binaries/data/mods/public/art/actors/units/persians/trader.xml
rename to binaries/data/mods/public/art/actors/units/achaemenids/trader.xml
index a0a4cf90cc..377810b98b 100644
--- a/binaries/data/mods/public/art/actors/units/persians/trader.xml
+++ b/binaries/data/mods/public/art/actors/units/achaemenids/trader.xml
@@ -5,7 +5,7 @@
     <variant frequency="100" file="quadraped/base_camel_trader.xml">
       <mesh>skeletal/camel.dae</mesh>
       <props>
-        <prop actor="props/units/pers_camel_props.xml" attachpoint="rider"/>
+        <prop actor="props/units/achae_camel_props.xml" attachpoint="rider"/>
         <prop actor="props/camel/teeths.xml" attachpoint="mouth_bot"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml
index 39432a88e4..394237b38f 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/helmets/pers_kidaris_loose_all.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_kidaris_loose_all.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_thrace.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_a.xml
index d7f1efefdc..fc8c78bfc4 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_a.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_b.xml
index 90143da4cf..b1380ff5dd 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/ballista_infantry_b.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
       <textures>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_e_r.xml
index f47b45ae7e..e240c8ce77 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_e_r.xml
@@ -6,7 +6,7 @@
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_numid_all.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/shields/kush_nubian_thureos.xml" attachpoint="shield"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_c_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_c_r.xml
index 0aa8636965..8651c146a1 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_c_r.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/capes/rider/cape_long_player.xml" attachpoint="root"/>
         <prop actor="props/units/armor/greave_02_white_r.xml" attachpoint="leg_R"/>
@@ -20,7 +20,7 @@
   <group>
     <variant frequency="3" name="Helmet-Conical-01">
       <props>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant frequency="1" name="Helmet-Thracian-01">
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a.xml
index 07a9f15564..2d39b29b39 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a.xml
@@ -8,7 +8,7 @@
         <prop actor="units/carthaginians/cavalry_spearman_punic_a_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers_basic.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae_basic.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a_r.xml
index ddf71e490e..1dc1a5aa02 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_a_r.xml
@@ -5,7 +5,7 @@
     <variant frequency="100" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/spear_lance_cavalry.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/aspis_kart_a.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/capes/rider/cape_long_player.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_e.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_e.xml
index 2c8ff05f24..4c0d9c328d 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_e.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_punic_e.xml
@@ -8,7 +8,7 @@
         <prop actor="units/carthaginians/cavalry_spearman_punic_e_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml b/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml
index c25c014b15..a139848bbb 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml
index 459309b686..79639872ea 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/units/shields/pelte_cart_c.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml
index 09fa218c7a..815818a210 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml
@@ -6,7 +6,7 @@
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_kush_nubian.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/buckler_small_cart_leather.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_javelinist_e.xml
index 7f99913b50..78f9af5c67 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_javelinist_e.xml
@@ -15,12 +15,12 @@
   <group>
     <variant frequency="1" name="helmet-persian-conical-plume">
       <props>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant frequency="1" name="helmet-persian-conical-no-plume">
       <props>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_pikeman_c.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_pikeman_c.xml
index 2d27f36538..c321761d87 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_pikeman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_pikeman_c.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/units/shields/pelte_cart_c.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/armor/greave_02_white_r.xml" attachpoint="leg_R"/>
         <prop actor="props/units/armor/greave_02_white_l.xml" attachpoint="leg_L"/>
       </props>
@@ -43,9 +43,9 @@
         <prop actor="props/units/helmets/hele_phrygian_b10.xml" attachpoint="helmet"/>
       </props>
     </variant>
-    <variant frequency="1" name="Helmet-Persian-Conical">
+    <variant frequency="1" name="Helmet-Achaemenid-Conical">
       <props>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_a.xml
index de2a28a587..7f345825b0 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_a.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/units/shields/aspis_kart_a.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/hele/linothorax_01_spec.png" name="specTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_b.xml
index 485cdbabd8..bb8d6c259c 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_b.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/units/shields/aspis_kart_b.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_c.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_c.xml
index 06c24804fd..044af1c023 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_c.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/aspis_kart_c.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/sheath_xiphos.xml" attachpoint="sheath_02_L"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_e.xml
index 39d6b17666..3f68682114 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_e.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/units/shields/aspis_kart_e.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
@@ -62,9 +62,9 @@
         <prop actor="props/units/helmets/hele_phrygian_b10.xml" attachpoint="helmet"/>
       </props>
     </variant>
-    <variant frequency="1" name="Helmet-Persian-Conical">
+    <variant frequency="1" name="Helmet-Achaemenid-Conical">
       <props>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_a.xml
index 8a2dfe63cd..072639e46e 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_a.xml
@@ -4,7 +4,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_b.xml
index 55be764ad6..ade54acb1c 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_b.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_L"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_c.xml b/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_c.xml
index 5844885989..47bf138373 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_c.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/lithobolos_med_infantry_c.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/hele/linothorax_01_spec.png" name="specTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_a.xml
index aaae888a80..cde22eda7e 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_a.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_b.xml
index 62c71cd4b8..a882173b16 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/oxybeles_infantry_b.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_citizen_soldier.xml">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_L"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/han/trader.xml b/binaries/data/mods/public/art/actors/units/han/trader.xml
index 68eff88b69..8fc5008624 100644
--- a/binaries/data/mods/public/art/actors/units/han/trader.xml
+++ b/binaries/data/mods/public/art/actors/units/han/trader.xml
@@ -5,7 +5,7 @@
     <variant file="quadraped/base_camel_trader.xml" frequency="100">
       <mesh>skeletal/camel.dae</mesh>
       <props>
-        <prop actor="props/units/pers_camel_props.xml" attachpoint="rider"/>
+        <prop actor="props/units/achae_camel_props.xml" attachpoint="rider"/>
         <prop actor="props/camel/teeths.xml" attachpoint="mouth_bot"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml b/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml
index 7862f38c56..5d43ddb4aa 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/f_dress.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_fem_1.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_fem_1.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/iber_helmet_02.xml" attachpoint="helmet"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
index 4b02788e18..de0f385d36 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/f_dress.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_fem_1.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_fem_1.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/iber_helmet_02.xml" attachpoint="helmet"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/mauryas/chariot_archer_c_m.xml b/binaries/data/mods/public/art/actors/units/mauryas/chariot_archer_c_m.xml
index 7bea3bd1c7..0990c1323c 100644
--- a/binaries/data/mods/public/art/actors/units/mauryas/chariot_archer_c_m.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryas/chariot_archer_c_m.xml
@@ -17,8 +17,8 @@
       <props>
         <prop actor="units/mauryas/chariot_archer_c_d.xml" attachpoint="driver2"/>
         <prop actor="units/mauryas/chariot_archer_c_r.xml" attachpoint="rider2"/>
-        <prop actor="units/persians/chariot_archer_b_h1.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_b_h2.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_b_h1.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_b_h2.xml" attachpoint="horse3"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml b/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml
index 5d22764568..8111d2d839 100644
--- a/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_female_d.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/dress_female_01_03.dds" name="baseTex"/>
+        <texture file="skeletal/achae/dress_female_01_03.dds" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
         <texture file="null_black.dds" name="specTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/mauryas/hero_chariot_archer_ashoka_m.xml b/binaries/data/mods/public/art/actors/units/mauryas/hero_chariot_archer_ashoka_m.xml
index aea42b8834..f74fb3682d 100644
--- a/binaries/data/mods/public/art/actors/units/mauryas/hero_chariot_archer_ashoka_m.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryas/hero_chariot_archer_ashoka_m.xml
@@ -12,10 +12,10 @@
       </animations>
       <mesh>structural/maur_hero_chariot.dae</mesh>
       <props>
-        <prop actor="units/persians/chariot_archer_e_h1.xml" attachpoint="horse1"/>
-        <prop actor="units/persians/chariot_archer_e_h2.xml" attachpoint="horse2"/>
-        <prop actor="units/persians/chariot_archer_e_h3.xml" attachpoint="horse3"/>
-        <prop actor="units/persians/chariot_archer_e_h4.xml" attachpoint="horse4"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h1.xml" attachpoint="horse1"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h2.xml" attachpoint="horse2"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h3.xml" attachpoint="horse3"/>
+        <prop actor="units/achaemenids/chariot_archer_e_h4.xml" attachpoint="horse4"/>
         <prop actor="units/mauryas/hero_chariot_archer_ashoka_r.xml" attachpoint="rider1"/>
         <prop actor="units/mauryas/hero_chariot_archer_ashoka_d.xml" attachpoint="rider2"/>
         <prop actor="units/mauryas/hero_chariot_archer_ashoka_r_parasol.xml" attachpoint="rider3"/>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_c_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_c_r.xml
deleted file mode 100644
index c653888e85..0000000000
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_c_r.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/new/m_armor_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/spear_lance_cavalry_reverse.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/pers_quiver_hip.xml" attachpoint="sheath_L"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Rider-Armour-Iron">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="Rider-Armour-Bronze">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-full-1a">
-      <textures>
-        <texture file="skeletal/scyth/scale_03_01.png" name="baseTex"/>
-        <texture file="skeletal/scyth/scale_03_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-full-1b">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-armband-full-1a">
-      <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-armband-full-1b">
-      <textures>
-        <texture file="skeletal/pers/scale_armband_full_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_armband_full_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-top-1a">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-top-1b">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_top_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_top_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-bottom-1a">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_01.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_full_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_bronze.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-bottom-1b">
-      <textures>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_02.png" name="baseTex"/>
-        <texture file="skeletal/pers/scale_sleeve_bottom_01_spec.png" name="specTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-      </textures>
-      <props>
-        <prop actor="props/units/armor/pers_neckguard_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Arm Guards Iron">
-      <props>
-        <prop actor="props/units/pers_bactrian_arm_left_iron.xml" attachpoint="shoulderpad_L"/>
-        <prop actor="props/units/pers_bactrian_arm_right_iron.xml" attachpoint="shoulderpad_R"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="Arm Guards Bronze">
-      <props>
-        <prop actor="props/units/pers_bactrian_arm_left_bronze.xml" attachpoint="shoulderpad_L"/>
-        <prop actor="props/units/pers_bactrian_arm_right_bronze.xml" attachpoint="shoulderpad_R"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/rider/cavalry/base_spearman_2h_fast_relax.xml" name="Spearman-2h-Fast-Relax" frequency="1"/>
-    <variant file="biped/rider/death_2h.xml"/>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_d.xml b/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_d.xml
deleted file mode 100644
index 880fc85204..0000000000
--- a/binaries/data/mods/public/art/actors/units/persians/chariot_archer_a_d.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_driver_chariot.xml">
-      <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_y.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied_yellow.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers_isp_a_linothorax_1a">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_01.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1b">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_02.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1c">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_03.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1d">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_04.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1e">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_05.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1f">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_06.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1a">
-      <textures>
-        <texture file="skeletal/pers/padded_01_01.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1b">
-      <textures>
-        <texture file="skeletal/pers/padded_01_02.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1c">
-      <textures>
-        <texture file="skeletal/pers/padded_01_03.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1d">
-      <textures>
-        <texture file="skeletal/pers/padded_01_04.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1e">
-      <textures>
-        <texture file="skeletal/pers/padded_01_05.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1f">
-      <textures>
-        <texture file="skeletal/pers/padded_01_06.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1g">
-      <textures>
-        <texture file="skeletal/pers/padded_01_07.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1h">
-      <textures>
-        <texture file="skeletal/pers/padded_01_08.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1i">
-      <textures>
-        <texture file="skeletal/pers/padded_01_09.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/persians/elephantry_c_r.xml
deleted file mode 100644
index fe7cb5b077..0000000000
--- a/binaries/data/mods/public/art/actors/units/persians/elephantry_c_r.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_elephant_rider_relax.xml" frequency="100" name="Base">
-      <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_pilos_crested.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
-        <prop actor="props/units/shields/gerron_x.xml" attachpoint="shield_arm"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers_isp_a_linothorax_1a">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_01.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1b">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_02.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1c">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_03.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1d">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_04.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1e">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_05.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1f">
-      <textures>
-        <texture file="skeletal/pers/linothorax_01_06.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1a">
-      <textures>
-        <texture file="skeletal/pers/padded_01_01.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1b">
-      <textures>
-        <texture file="skeletal/pers/padded_01_02.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1c">
-      <textures>
-        <texture file="skeletal/pers/padded_01_03.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1d">
-      <textures>
-        <texture file="skeletal/pers/padded_01_04.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1e">
-      <textures>
-        <texture file="skeletal/pers/padded_01_05.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1f">
-      <textures>
-        <texture file="skeletal/pers/padded_01_06.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1g">
-      <textures>
-        <texture file="skeletal/pers/padded_01_07.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1h">
-      <textures>
-        <texture file="skeletal/pers/padded_01_08.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1i">
-      <textures>
-        <texture file="skeletal/pers/padded_01_09.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/hero_cavalry_spearman_cyrus_r.xml b/binaries/data/mods/public/art/actors/units/persians/hero_cavalry_spearman_cyrus_r.xml
deleted file mode 100644
index ba9fd1b134..0000000000
--- a/binaries/data/mods/public/art/actors/units/persians/hero_cavalry_spearman_cyrus_r.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/new/m_armor_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_hero_1.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_royal_loose.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/spear_lance_persian.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_taka_cyrus.xml" attachpoint="shield_arm"/>
-        <prop actor="props/units/pers_quiver_hip.xml" attachpoint="sheath_L"/>
-        <prop actor="props/units/pers_bactrian_arm_left_bronze.xml" attachpoint="shoulderpad_L"/>
-        <prop actor="props/units/pers_bactrian_arm_right_bronze.xml" attachpoint="shoulderpad_R"/>
-        <prop actor="props/units/capes/rider/cape_long_player.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="skeletal/pers/scale_05_01.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/rider/cavalry/base_spearman_ready.xml" name="Spearman-Ready" frequency="1"/>
-    <variant file="biped/rider/death.xml"/>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml
index b32f04a215..5607af967f 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml
@@ -5,9 +5,9 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml
index 3d2dfc0956..04cbd2e25d 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml
index a42b049d2b..49f69ded57 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml
@@ -5,8 +5,8 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="weapon_bow"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml b/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml
index 15059254ba..1a3d8ff4aa 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml
@@ -5,7 +5,7 @@
     <variant file="biped/base_slave_male.xml">
       <mesh>skeletal/new/m_dress.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/cart/toga_citizen_01.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_a.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_a.xml
index f10341809b..7e72ef2c4d 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_a.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_a.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/mace_sling_pouch.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_b.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_b.xml
index 8b62511c40..2160659c14 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_b.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/mace_sling_pouch.xml" attachpoint="sheath_L"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_e.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_e.xml
index 9f41baa075..c4441252c5 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_e.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_slinger_e.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/mace_sling_pouch.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_auxiliary_e_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_auxiliary_e_r.xml
index 73c034fbae..5618f29b01 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_auxiliary_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_auxiliary_e_r.xml
@@ -36,12 +36,12 @@
   <group>
     <variant frequency="1" name="Helmet Eastern a">
       <props>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant frequency="1" name="Helmet Eastern b">
       <props>
-        <prop actor="props/units/helmets/pers_conical_b1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_b1.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant frequency="1" name="Helmet Hellenic a">
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_spearman.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_spearman.xml
index bb38e3021e..d28c9cfdf9 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_spearman.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_spearman.xml
@@ -46,7 +46,7 @@
     <variant frequency="1" name="rome-gladiator-1-eastern">
       <mesh>skeletal/new/m_naked.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/rome/gladiator_01_eastern.png" name="baseTex"/>
@@ -71,7 +71,7 @@
     </variant>
     <variant frequency="1" name="rome-gladiator-2-eastern">
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
         <prop attachpoint="leg_R"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_swordsman.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_swordsman.xml
index 05faeec085..50faca24b3 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_swordsman.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_swordsman.xml
@@ -83,7 +83,7 @@
     <variant frequency="1" name="rome-gladiator-1-eastern">
       <mesh>skeletal/new/m_naked.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/rome/gladiator_01_eastern.png" name="baseTex"/>
@@ -108,7 +108,7 @@
     </variant>
     <variant frequency="1" name="rome-gladiator-2-eastern">
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
         <prop attachpoint="leg_R"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_servus.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_servus.xml
index 25fb1e59a1..1c0db87716 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_servus.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_servus.xml
@@ -99,7 +99,7 @@
     <variant frequency="1" name="rome-gladiator-1-eastern">
       <mesh>skeletal/new/m_naked.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/rome/gladiator_01_eastern.png" name="baseTex"/>
@@ -136,7 +136,7 @@
     </variant>
     <variant frequency="1" name="rome-servus-tunic-1-eastern">
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/rome/tunic_servus_01_eastern.png" name="baseTex"/>
@@ -173,7 +173,7 @@
     </variant>
     <variant frequency="1" name="rome-servus-tunic-2-eastern">
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
       </props>
       <textures>
         <texture file="skeletal/rome/tunic_servus_02_eastern.png" name="baseTex"/>
@@ -215,7 +215,7 @@
     </variant>
     <variant frequency="3" name="rome-servus-cardiopylax-1-eastern">
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
         <prop actor="props/units/armor/greave_06_bronze_l.xml" attachpoint="leg_L"/>
       </props>
       <textures>
@@ -262,7 +262,7 @@
     <variant frequency="1" name="rome-servus-chainmail-1-eastern">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
         <prop actor="props/units/armor/greave_06_bronze_l.xml" attachpoint="leg_L"/>
       </props>
       <textures>
@@ -306,7 +306,7 @@
     <variant frequency="1" name="rome-servus-scale-1-eastern">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
         <prop actor="props/units/armor/greave_06_bronze_l.xml" attachpoint="leg_L"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_m.xml b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_m.xml
index 00c6427057..23c3d72e87 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_m.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="units/seleucids/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers_basic.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae_basic.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_r.xml
index d4ac90c8c5..ffc8361426 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_a_r.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/hele_boeotian.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
@@ -14,17 +14,17 @@
   <group>
     <variant frequency="1" name="padded_02_01">
       <textures>
-        <texture file="skeletal/pers/padded_02_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_02_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_02_02">
       <textures>
-        <texture file="skeletal/pers/padded_02_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_02_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="padded_02_03">
       <textures>
-        <texture file="skeletal/pers/padded_02_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/padded_02_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -36,7 +36,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/cavalry/attack_ranged_javelin.xml"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_ranged.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_b_r.xml
index cf54924734..e0f19f8c19 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_b_r.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
@@ -14,66 +14,66 @@
   <group>
     <variant name="kidaris-tied-yellow-a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_y.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied_yellow.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara_y.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied_yellow.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="kidaris-tied-yellow-b">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara_y.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_tiara_y.xml" attachpoint="head"/>
       </props>
     </variant>
     <variant name="kidaris-tied-white-a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_tied.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/achae_kidaris_tied.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="kidaris-tied-white-b">
       <props>
-        <prop actor="props/units/heads/new/head_pers_tiara.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_tiara.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="tunic-basic-1a">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1b">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1c">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_03.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1d">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_04.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1e">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_05.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1f">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_06.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1g">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_07.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="tunic-basic-1h">
       <textures>
-        <texture file="skeletal/pers/tunic_basic_01_08.png" name="baseTex"/>
+        <texture file="skeletal/achae/tunic_basic_01_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -85,7 +85,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/cavalry/attack_ranged_javelin.xml"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_ranged.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_m.xml b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_m.xml
index c9a53f5030..a3307ff605 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_m.xml
@@ -7,8 +7,8 @@
       <props>
         <prop actor="units/seleucids/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_achae.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_iron.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_r.xml
index ba931073a9..bcb40bf577 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/cavalry_javelinist_e_r.xml
@@ -5,12 +5,12 @@
     <variant>
       <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_spec.png" name="specTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_spec.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
@@ -30,12 +30,12 @@
   <group>
     <variant frequency="1" name="Mail Iron">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_01.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Mail Bronze">
       <textures>
-        <texture file="skeletal/pers/scale_kardakes_01_02.png" name="baseTex"/>
+        <texture file="skeletal/achae/scale_kardakes_01_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -47,7 +47,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/cavalry/attack_ranged_javelin.xml"/>
     <variant file="biped/rider/promotion_shield.xml"/>
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_achae.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_ranged.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml b/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml
index 2e5dedbbf4..486a094dc9 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml
@@ -24,14 +24,14 @@
         <prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
       </props>
     </variant>
-    <variant frequency="1" name="head_pers_a">
+    <variant frequency="1" name="head_achae_a">
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
       </props>
     </variant>
-    <variant frequency="2" name="head_pers_b">
+    <variant frequency="2" name="head_achae_b">
       <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_b.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_swordsman_antiochus_IV_m.xml b/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_swordsman_antiochus_IV_m.xml
index 3bb34e8d48..e8747b7416 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_swordsman_antiochus_IV_m.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_swordsman_antiochus_IV_m.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="units/seleucids/hero_cavalry_swordsman_antiochus_IV_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/sele_crest.xml" attachpoint="head"/>
-        <prop actor="props/horse/cav_peytral_pers_bronze.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_achae_bronze.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_blanket_sele.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_a.xml
index 50c0726ca7..e73780030e 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_a.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/arab_round_01.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml
index 7bc92fae80..436cad5fd2 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml
index 97f5575d57..62b14f4b01 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml
@@ -5,7 +5,7 @@
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
       <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/new/head_achae_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/arab_oval_01.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
@@ -15,7 +15,7 @@
   <group>
     <variant frequency="1" name="helmet-persian-conical">
       <props>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/achae_conical_a1.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/animation/biped/fisher/pers_idle_a.dae b/binaries/data/mods/public/art/animation/biped/fisher/achae_idle_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/fisher/pers_idle_a.dae
rename to binaries/data/mods/public/art/animation/biped/fisher/achae_idle_a.dae
diff --git a/binaries/data/mods/public/art/animation/biped/fisher/pers_idle_b.dae b/binaries/data/mods/public/art/animation/biped/fisher/achae_idle_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/fisher/pers_idle_b.dae
rename to binaries/data/mods/public/art/animation/biped/fisher/achae_idle_b.dae
diff --git a/binaries/data/mods/public/art/animation/biped/fisher/pers_move.dae b/binaries/data/mods/public/art/animation/biped/fisher/achae_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/fisher/pers_move.dae
rename to binaries/data/mods/public/art/animation/biped/fisher/achae_move.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_bir_idle.dae b/binaries/data/mods/public/art/animation/mechanical/achae_bir_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_bir_idle.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_bir_idle.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_bir_move.dae b/binaries/data/mods/public/art/animation/mechanical/achae_bir_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_bir_move.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_bir_move.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_chariot_a_idle.dae b/binaries/data/mods/public/art/animation/mechanical/achae_chariot_a_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_chariot_a_idle.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_chariot_a_idle.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_chariot_a_move.dae b/binaries/data/mods/public/art/animation/mechanical/achae_chariot_a_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_chariot_a_move.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_chariot_a_move.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_chariot_b_idle.dae b/binaries/data/mods/public/art/animation/mechanical/achae_chariot_b_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_chariot_b_idle.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_chariot_b_idle.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_chariot_b_move.dae b/binaries/data/mods/public/art/animation/mechanical/achae_chariot_b_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_chariot_b_move.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_chariot_b_move.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_chariot_e_idle.dae b/binaries/data/mods/public/art/animation/mechanical/achae_chariot_e_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_chariot_e_idle.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_chariot_e_idle.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_chariot_e_move.dae b/binaries/data/mods/public/art/animation/mechanical/achae_chariot_e_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_chariot_e_move.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_chariot_e_move.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_ram.dae b/binaries/data/mods/public/art/animation/mechanical/achae_ram.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_ram.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_ram.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_ram_idle.dae b/binaries/data/mods/public/art/animation/mechanical/achae_ram_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_ram_idle.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_ram_idle.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_ram_walk.dae b/binaries/data/mods/public/art/animation/mechanical/achae_ram_walk.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_ram_walk.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_ram_walk.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_tri_idle.dae b/binaries/data/mods/public/art/animation/mechanical/achae_tri_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_tri_idle.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_tri_idle.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_tri_move.dae b/binaries/data/mods/public/art/animation/mechanical/achae_tri_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_tri_move.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_tri_move.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_closed.dae b/binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_closed.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_closed.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_closed.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_closing.dae b/binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_closing.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_closing.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_closing.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_open.dae b/binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_open.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_open.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_open.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_opening.dae b/binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_opening.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/mechanical/pers_wall_gate_opening.dae
rename to binaries/data/mods/public/art/animation/mechanical/achae_wall_gate_opening.dae
diff --git a/binaries/data/mods/public/art/animation/others/pers_sail_folded_idle.dae b/binaries/data/mods/public/art/animation/others/achae_sail_folded_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/others/pers_sail_folded_idle.dae
rename to binaries/data/mods/public/art/animation/others/achae_sail_folded_idle.dae
diff --git a/binaries/data/mods/public/art/animation/others/pers_sail_idle.dae b/binaries/data/mods/public/art/animation/others/achae_sail_idle.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/others/pers_sail_idle.dae
rename to binaries/data/mods/public/art/animation/others/achae_sail_idle.dae
diff --git a/binaries/data/mods/public/art/animation/others/pers_sail_move.dae b/binaries/data/mods/public/art/animation/others/achae_sail_move.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/others/pers_sail_move.dae
rename to binaries/data/mods/public/art/animation/others/achae_sail_move.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_01.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_01.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_01.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_01_big.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_01_big.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_01_big.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_01_big.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_01_prop.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_01_prop.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_01_prop.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_01_prop.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_02.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_02.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_02.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_02.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_02_prop.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_02_prop.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_02_prop.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_02_prop.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_03.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_03.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_03.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_03.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_03_prop.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_03_prop.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_03_prop.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_03_prop.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_04.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_04.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_04.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_04.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_05.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_05.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_05.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_05.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_05_baskets_a.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_05_baskets_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_05_baskets_a.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_05_baskets_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_05_baskets_b.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_05_baskets_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_05_baskets_b.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_05_baskets_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_alt_build_05_prop.dae b/binaries/data/mods/public/art/meshes/props/achae_alt_build_05_prop.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_alt_build_05_prop.dae
rename to binaries/data/mods/public/art/meshes/props/achae_alt_build_05_prop.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_barracks_shields.dae b/binaries/data/mods/public/art/meshes/props/achae_barracks_shields.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_barracks_shields.dae
rename to binaries/data/mods/public/art/meshes/props/achae_barracks_shields.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_bir_fence.dae b/binaries/data/mods/public/art/meshes/props/achae_bir_fence.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_bir_fence.dae
rename to binaries/data/mods/public/art/meshes/props/achae_bir_fence.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_bir_mast.dae b/binaries/data/mods/public/art/meshes/props/achae_bir_mast.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_bir_mast.dae
rename to binaries/data/mods/public/art/meshes/props/achae_bir_mast.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_bir_oars.dae b/binaries/data/mods/public/art/meshes/props/achae_bir_oars.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_bir_oars.dae
rename to binaries/data/mods/public/art/meshes/props/achae_bir_oars.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_bireme_sail.dae b/binaries/data/mods/public/art/meshes/props/achae_bireme_sail.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_bireme_sail.dae
rename to binaries/data/mods/public/art/meshes/props/achae_bireme_sail.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_camel_prop1.dae b/binaries/data/mods/public/art/meshes/props/achae_camel_prop1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_camel_prop1.dae
rename to binaries/data/mods/public/art/meshes/props/achae_camel_prop1.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_cav_lance.dae b/binaries/data/mods/public/art/meshes/props/achae_cav_lance.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_cav_lance.dae
rename to binaries/data/mods/public/art/meshes/props/achae_cav_lance.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_cc_pieces.dae b/binaries/data/mods/public/art/meshes/props/achae_cc_pieces.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_cc_pieces.dae
rename to binaries/data/mods/public/art/meshes/props/achae_cc_pieces.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_cc_props_a.dae b/binaries/data/mods/public/art/meshes/props/achae_cc_props_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_cc_props_a.dae
rename to binaries/data/mods/public/art/meshes/props/achae_cc_props_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_cc_props_b.dae b/binaries/data/mods/public/art/meshes/props/achae_cc_props_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_cc_props_b.dae
rename to binaries/data/mods/public/art/meshes/props/achae_cc_props_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_cc_rubble.dae b/binaries/data/mods/public/art/meshes/props/achae_cc_rubble.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_cc_rubble.dae
rename to binaries/data/mods/public/art/meshes/props/achae_cc_rubble.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_chariot_e_emblem.dae b/binaries/data/mods/public/art/meshes/props/achae_chariot_e_emblem.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_chariot_e_emblem.dae
rename to binaries/data/mods/public/art/meshes/props/achae_chariot_e_emblem.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_chariot_hero_emblem.dae b/binaries/data/mods/public/art/meshes/props/achae_chariot_hero_emblem.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_chariot_hero_emblem.dae
rename to binaries/data/mods/public/art/meshes/props/achae_chariot_hero_emblem.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_civic_props_a.dae b/binaries/data/mods/public/art/meshes/props/achae_civic_props_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_civic_props_a.dae
rename to binaries/data/mods/public/art/meshes/props/achae_civic_props_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_civic_props_b.dae b/binaries/data/mods/public/art/meshes/props/achae_civic_props_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_civic_props_b.dae
rename to binaries/data/mods/public/art/meshes/props/achae_civic_props_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_civic_shrub_a.dae b/binaries/data/mods/public/art/meshes/props/achae_civic_shrub_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_civic_shrub_a.dae
rename to binaries/data/mods/public/art/meshes/props/achae_civic_shrub_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_civic_shrub_b.dae b/binaries/data/mods/public/art/meshes/props/achae_civic_shrub_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_civic_shrub_b.dae
rename to binaries/data/mods/public/art/meshes/props/achae_civic_shrub_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_civic_shrub_c.dae b/binaries/data/mods/public/art/meshes/props/achae_civic_shrub_c.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_civic_shrub_c.dae
rename to binaries/data/mods/public/art/meshes/props/achae_civic_shrub_c.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_civic_shrub_d.dae b/binaries/data/mods/public/art/meshes/props/achae_civic_shrub_d.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_civic_shrub_d.dae
rename to binaries/data/mods/public/art/meshes/props/achae_civic_shrub_d.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_dock_rubble.dae b/binaries/data/mods/public/art/meshes/props/achae_dock_rubble.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_dock_rubble.dae
rename to binaries/data/mods/public/art/meshes/props/achae_dock_rubble.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_dock_rubble_struct.dae b/binaries/data/mods/public/art/meshes/props/achae_dock_rubble_struct.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_dock_rubble_struct.dae
rename to binaries/data/mods/public/art/meshes/props/achae_dock_rubble_struct.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_farmstead_cart.dae b/binaries/data/mods/public/art/meshes/props/achae_farmstead_cart.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_farmstead_cart.dae
rename to binaries/data/mods/public/art/meshes/props/achae_farmstead_cart.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_farmstead_cart_big.dae b/binaries/data/mods/public/art/meshes/props/achae_farmstead_cart_big.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_farmstead_cart_big.dae
rename to binaries/data/mods/public/art/meshes/props/achae_farmstead_cart_big.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fc.dae b/binaries/data/mods/public/art/meshes/props/achae_fc.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fc.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fc.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fishship_sail.dae b/binaries/data/mods/public/art/meshes/props/achae_fishship_sail.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fishship_sail.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fishship_sail.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fishship_sail_folded.dae b/binaries/data/mods/public/art/meshes/props/achae_fishship_sail_folded.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fishship_sail_folded.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fishship_sail_folded.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fortress_b_paintings.dae b/binaries/data/mods/public/art/meshes/props/achae_fortress_b_paintings.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fortress_b_paintings.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fortress_b_paintings.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fortress_b_shields.dae b/binaries/data/mods/public/art/meshes/props/achae_fortress_b_shields.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fortress_b_shields.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fortress_b_shields.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fortress_eagles.dae b/binaries/data/mods/public/art/meshes/props/achae_fortress_eagles.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fortress_eagles.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fortress_eagles.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fortress_paintings.dae b/binaries/data/mods/public/art/meshes/props/achae_fortress_paintings.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fortress_paintings.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fortress_paintings.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_fortress_shields.dae b/binaries/data/mods/public/art/meshes/props/achae_fortress_shields.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_fortress_shields.dae
rename to binaries/data/mods/public/art/meshes/props/achae_fortress_shields.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_house_a_plants.dae b/binaries/data/mods/public/art/meshes/props/achae_house_a_plants.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_house_a_plants.dae
rename to binaries/data/mods/public/art/meshes/props/achae_house_a_plants.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_house_c_plants.dae b/binaries/data/mods/public/art/meshes/props/achae_house_c_plants.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_house_c_plants.dae
rename to binaries/data/mods/public/art/meshes/props/achae_house_c_plants.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_house_d_plants.dae b/binaries/data/mods/public/art/meshes/props/achae_house_d_plants.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_house_d_plants.dae
rename to binaries/data/mods/public/art/meshes/props/achae_house_d_plants.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall1.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall1.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall1.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall2.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall2.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall2.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall3.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall3.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall3.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall3.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall4.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall4.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall4.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall4.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall5.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall5.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall5.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall5.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall6.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall6.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall6.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall6.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_a_stall7.dae b/binaries/data/mods/public/art/meshes/props/achae_market_a_stall7.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_a_stall7.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_a_stall7.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall1.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall1.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall1.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall2.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall2.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall2.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall3.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall3.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall3.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall3.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall4.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall4.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall4.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall4.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall5.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall5.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall5.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall5.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall6.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall6.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall6.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall6.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_b_stall7.dae b/binaries/data/mods/public/art/meshes/props/achae_market_b_stall7.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_b_stall7.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_b_stall7.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_market_props_a.dae b/binaries/data/mods/public/art/meshes/props/achae_market_props_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_market_props_a.dae
rename to binaries/data/mods/public/art/meshes/props/achae_market_props_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_merc_sail.dae b/binaries/data/mods/public/art/meshes/props/achae_merc_sail.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_merc_sail.dae
rename to binaries/data/mods/public/art/meshes/props/achae_merc_sail.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_quiver_arrows.dae b/binaries/data/mods/public/art/meshes/props/achae_quiver_arrows.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_quiver_arrows.dae
rename to binaries/data/mods/public/art/meshes/props/achae_quiver_arrows.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_quiver_back.dae b/binaries/data/mods/public/art/meshes/props/achae_quiver_back.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_quiver_back.dae
rename to binaries/data/mods/public/art/meshes/props/achae_quiver_back.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_quiver_hip.dae b/binaries/data/mods/public/art/meshes/props/achae_quiver_hip.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_quiver_hip.dae
rename to binaries/data/mods/public/art/meshes/props/achae_quiver_hip.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_sb1_props.dae b/binaries/data/mods/public/art/meshes/props/achae_sb1_props.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_sb1_props.dae
rename to binaries/data/mods/public/art/meshes/props/achae_sb1_props.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_storehouse_1.dae b/binaries/data/mods/public/art/meshes/props/achae_storehouse_1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_storehouse_1.dae
rename to binaries/data/mods/public/art/meshes/props/achae_storehouse_1.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_storehouse_2.dae b/binaries/data/mods/public/art/meshes/props/achae_storehouse_2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_storehouse_2.dae
rename to binaries/data/mods/public/art/meshes/props/achae_storehouse_2.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_temple_lions.dae b/binaries/data/mods/public/art/meshes/props/achae_temple_lions.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_temple_lions.dae
rename to binaries/data/mods/public/art/meshes/props/achae_temple_lions.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_tri_mast.dae b/binaries/data/mods/public/art/meshes/props/achae_tri_mast.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_tri_mast.dae
rename to binaries/data/mods/public/art/meshes/props/achae_tri_mast.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_tri_oars.dae b/binaries/data/mods/public/art/meshes/props/achae_tri_oars.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_tri_oars.dae
rename to binaries/data/mods/public/art/meshes/props/achae_tri_oars.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_trireme_sail.dae b/binaries/data/mods/public/art/meshes/props/achae_trireme_sail.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_trireme_sail.dae
rename to binaries/data/mods/public/art/meshes/props/achae_trireme_sail.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_wall_tower.dae b/binaries/data/mods/public/art/meshes/props/achae_wall_tower.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_wall_tower.dae
rename to binaries/data/mods/public/art/meshes/props/achae_wall_tower.dae
diff --git a/binaries/data/mods/public/art/meshes/props/pers_wall_tower_prop.dae b/binaries/data/mods/public/art/meshes/props/achae_wall_tower_prop.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/pers_wall_tower_prop.dae
rename to binaries/data/mods/public/art/meshes/props/achae_wall_tower_prop.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_conical_a.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_conical_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_conical_a.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_conical_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_conical_b.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_conical_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_conical_b.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_conical_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_hair.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_hair.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_hair.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_hair.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_loose.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_loose.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_loose.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_loose.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_royal_loose.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_royal_loose.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_royal_loose.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_royal_loose.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_royal_tied.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_royal_tied.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_royal_tied.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_royal_tied.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_tied.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_tied.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_kidaris_tied.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_kidaris_tied.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/pers_neckguard.dae b/binaries/data/mods/public/art/meshes/props/helmet/achae_neckguard.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/pers_neckguard.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/achae_neckguard.dae
diff --git a/binaries/data/mods/public/art/meshes/props/helmet/old/pers_crown.dae b/binaries/data/mods/public/art/meshes/props/helmet/old/achae_crown.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/helmet/old/pers_crown.dae
rename to binaries/data/mods/public/art/meshes/props/helmet/old/achae_crown.dae
diff --git a/binaries/data/mods/public/art/meshes/props/horse/armor_pers_winged_01.dae b/binaries/data/mods/public/art/meshes/props/horse/armor_achae_winged_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/horse/armor_pers_winged_01.dae
rename to binaries/data/mods/public/art/meshes/props/horse/armor_achae_winged_01.dae
diff --git a/binaries/data/mods/public/art/meshes/props/horse/armor_pers_winged_02.dae b/binaries/data/mods/public/art/meshes/props/horse/armor_achae_winged_02.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/horse/armor_pers_winged_02.dae
rename to binaries/data/mods/public/art/meshes/props/horse/armor_achae_winged_02.dae
diff --git a/binaries/data/mods/public/art/meshes/props/horse/armor_pers_winged_03.dae b/binaries/data/mods/public/art/meshes/props/horse/armor_achae_winged_03.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/horse/armor_pers_winged_03.dae
rename to binaries/data/mods/public/art/meshes/props/horse/armor_achae_winged_03.dae
diff --git a/binaries/data/mods/public/art/meshes/props/horse/blanket_pers.dae b/binaries/data/mods/public/art/meshes/props/horse/blanket_achae.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/horse/blanket_pers.dae
rename to binaries/data/mods/public/art/meshes/props/horse/blanket_achae.dae
diff --git a/binaries/data/mods/public/art/meshes/props/quivers/pers_back.dae b/binaries/data/mods/public/art/meshes/props/quivers/achae_back.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/quivers/pers_back.dae
rename to binaries/data/mods/public/art/meshes/props/quivers/achae_back.dae
diff --git a/binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_a_b.dae b/binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_a_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_a_b.dae
rename to binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_a_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_a_f.dae b/binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_a_f.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_a_f.dae
rename to binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_a_f.dae
diff --git a/binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_b_b.dae b/binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_b_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_b_b.dae
rename to binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_b_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_b_f.dae b/binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_b_f.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/shield/pelta_pers_back_b_f.dae
rename to binaries/data/mods/public/art/meshes/props/shield/pelta_achae_back_b_f.dae
diff --git a/binaries/data/mods/public/art/meshes/props/spear_blade_pers_a.dae b/binaries/data/mods/public/art/meshes/props/spear_blade_achae_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/spear_blade_pers_a.dae
rename to binaries/data/mods/public/art/meshes/props/spear_blade_achae_a.dae
diff --git a/binaries/data/mods/public/art/meshes/props/spear_blade_pers_b.dae b/binaries/data/mods/public/art/meshes/props/spear_blade_achae_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/spear_blade_pers_b.dae
rename to binaries/data/mods/public/art/meshes/props/spear_blade_achae_b.dae
diff --git a/binaries/data/mods/public/art/meshes/props/treasure_pers_1.dae b/binaries/data/mods/public/art/meshes/props/treasure_achae_1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/treasure_pers_1.dae
rename to binaries/data/mods/public/art/meshes/props/treasure_achae_1.dae
diff --git a/binaries/data/mods/public/art/meshes/props/treasure_pers_2.dae b/binaries/data/mods/public/art/meshes/props/treasure_achae_2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/treasure_pers_2.dae
rename to binaries/data/mods/public/art/meshes/props/treasure_achae_2.dae
diff --git a/binaries/data/mods/public/art/meshes/props/treasure_pers_3.dae b/binaries/data/mods/public/art/meshes/props/treasure_achae_3.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/treasure_pers_3.dae
rename to binaries/data/mods/public/art/meshes/props/treasure_achae_3.dae
diff --git a/binaries/data/mods/public/art/meshes/props/treasure_pers_4.dae b/binaries/data/mods/public/art/meshes/props/treasure_achae_4.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/treasure_pers_4.dae
rename to binaries/data/mods/public/art/meshes/props/treasure_achae_4.dae
diff --git a/binaries/data/mods/public/art/meshes/props/weapons/bow_recurve_pers.dae b/binaries/data/mods/public/art/meshes/props/weapons/bow_recurve_achae.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/weapons/bow_recurve_pers.dae
rename to binaries/data/mods/public/art/meshes/props/weapons/bow_recurve_achae.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ballista_tower.dae b/binaries/data/mods/public/art/meshes/structural/achae_ballista_tower.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ballista_tower.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ballista_tower.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_barracks.dae b/binaries/data/mods/public/art/meshes/structural/achae_barracks.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_barracks.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_barracks.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_bir.dae b/binaries/data/mods/public/art/meshes/structural/achae_bir.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_bir.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_bir.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_blacksmith.dae b/binaries/data/mods/public/art/meshes/structural/achae_blacksmith.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_blacksmith.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_blacksmith.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_blacksmith_props.dae b/binaries/data/mods/public/art/meshes/structural/achae_blacksmith_props.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_blacksmith_props.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_blacksmith_props.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_chariot_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_chariot_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_chariot_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_chariot_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_chariot_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_chariot_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_chariot_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_chariot_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_chariot_e.dae b/binaries/data/mods/public/art/meshes/structural/achae_chariot_e.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_chariot_e.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_chariot_e.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_civic.dae b/binaries/data/mods/public/art/meshes/structural/achae_civic.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_civic.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_civic.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_corral.dae b/binaries/data/mods/public/art/meshes/structural/achae_corral.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_corral.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_corral.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_dock.dae b/binaries/data/mods/public/art/meshes/structural/achae_dock.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_dock.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_dock.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_farmstead.dae b/binaries/data/mods/public/art/meshes/structural/achae_farmstead.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_farmstead.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_farmstead.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_fishship.dae b/binaries/data/mods/public/art/meshes/structural/achae_fishship.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_fishship.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_fishship.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_fortress.dae b/binaries/data/mods/public/art/meshes/structural/achae_fortress.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_fortress.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_fortress.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_fortress_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_fortress_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_fortress_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_fortress_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_dese_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_dese_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_dese_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_dese_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_desert_c.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_desert_c.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_desert_c.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_desert_c.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_lush_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_lush_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_lush_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_lush_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_tempe_la_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_tempe_la_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_tempe_la_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_tempe_la_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_tempe_la_b2.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_tempe_la_b2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_bush_tempe_la_b2.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_bush_tempe_la_b2.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_grass_field.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_grass_field.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_grass_field.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_grass_field.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_log_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_log_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_log_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_log_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_struct.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_struct.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_struct.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_struct.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_struct_nature.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_struct_nature.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_struct_nature.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_struct_nature.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_struct_transp.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_struct_transp.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_struct_transp.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_struct_transp.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_apple_bloom.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_apple_bloom.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_apple_bloom.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_apple_bloom.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_baobab_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_baobab_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_baobab_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_baobab_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_baobab_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_baobab_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_baobab_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_baobab_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_euro_beech_a_aut.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_euro_beech_a_aut.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_euro_beech_a_aut.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_euro_beech_a_aut.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_euro_beech_c.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_euro_beech_c.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_euro_beech_c.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_euro_beech_c.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_lumbardypoplar_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_lumbardypoplar_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_lumbardypoplar_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_lumbardypoplar_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_palmdate_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_palmdate_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_tree_palmdate_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_tree_palmdate_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_trunk_baobab.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_trunk_baobab.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_trunk_baobab.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_trunk_baobab.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_trunk_deciduous_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_trunk_deciduous_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_trunk_deciduous_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_trunk_deciduous_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_turf.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_turf.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_turf.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_turf.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_water.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_water.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_water.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_water.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_water_lillies.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_water_lillies.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_water_lillies.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_water_lillies.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_waterfall.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_waterfall.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_waterfall.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_waterfall.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_gardens_wrld_bush_b_2.dae b/binaries/data/mods/public/art/meshes/structural/achae_gardens_wrld_bush_b_2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_gardens_wrld_bush_b_2.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_gardens_wrld_bush_b_2.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_house_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_house_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_house_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_house_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_house_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_house_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_house_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_house_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_house_c.dae b/binaries/data/mods/public/art/meshes/structural/achae_house_c.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_house_c.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_house_c.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_house_d.dae b/binaries/data/mods/public/art/meshes/structural/achae_house_d.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_house_d.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_house_d.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ice_house_01.dae b/binaries/data/mods/public/art/meshes/structural/achae_ice_house_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ice_house_01.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ice_house_01.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ice_house_02.dae b/binaries/data/mods/public/art/meshes/structural/achae_ice_house_02.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ice_house_02.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ice_house_02.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ice_house_03.dae b/binaries/data/mods/public/art/meshes/structural/achae_ice_house_03.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ice_house_03.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ice_house_03.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ice_house_04.dae b/binaries/data/mods/public/art/meshes/structural/achae_ice_house_04.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ice_house_04.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ice_house_04.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ice_house_05.dae b/binaries/data/mods/public/art/meshes/structural/achae_ice_house_05.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ice_house_05.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ice_house_05.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ice_house_06.dae b/binaries/data/mods/public/art/meshes/structural/achae_ice_house_06.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ice_house_06.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ice_house_06.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ishtar.dae b/binaries/data/mods/public/art/meshes/structural/achae_ishtar.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ishtar.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ishtar.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_lamassu.dae b/binaries/data/mods/public/art/meshes/structural/achae_lamassu.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_lamassu.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_lamassu.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_lamassu_small.dae b/binaries/data/mods/public/art/meshes/structural/achae_lamassu_small.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_lamassu_small.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_lamassu_small.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_market.dae b/binaries/data/mods/public/art/meshes/structural/achae_market.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_market.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_market.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_market_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_market_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_market_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_market_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_market_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_market_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_market_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_market_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_merc.dae b/binaries/data/mods/public/art/meshes/structural/achae_merc.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_merc.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_merc.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_merc_rail.dae b/binaries/data/mods/public/art/meshes/structural/achae_merc_rail.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_merc_rail.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_merc_rail.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_palace.dae b/binaries/data/mods/public/art/meshes/structural/achae_palace.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_palace.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_palace.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_plinth.dae b/binaries/data/mods/public/art/meshes/structural/achae_plinth.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_plinth.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_plinth.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ram.dae b/binaries/data/mods/public/art/meshes/structural/achae_ram.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ram.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ram.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_range.dae b/binaries/data/mods/public/art/meshes/structural/achae_range.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_range.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_range.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_sb2.dae b/binaries/data/mods/public/art/meshes/structural/achae_sb2.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_sb2.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_sb2.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_sb_1.dae b/binaries/data/mods/public/art/meshes/structural/achae_sb_1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_sb_1.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_sb_1.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_sb_1_new.dae b/binaries/data/mods/public/art/meshes/structural/achae_sb_1_new.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_sb_1_new.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_sb_1_new.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_scout_tower_a.dae b/binaries/data/mods/public/art/meshes/structural/achae_scout_tower_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_scout_tower_a.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_scout_tower_a.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_scout_tower_b.dae b/binaries/data/mods/public/art/meshes/structural/achae_scout_tower_b.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_scout_tower_b.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_scout_tower_b.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ship_bireme.dae b/binaries/data/mods/public/art/meshes/structural/achae_ship_bireme.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ship_bireme.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ship_bireme.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_ship_trireme.dae b/binaries/data/mods/public/art/meshes/structural/achae_ship_trireme.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_ship_trireme.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_ship_trireme.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_shrine.dae b/binaries/data/mods/public/art/meshes/structural/achae_shrine.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_shrine.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_shrine.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_siege_ram.dae b/binaries/data/mods/public/art/meshes/structural/achae_siege_ram.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_siege_ram.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_siege_ram.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_stable.dae b/binaries/data/mods/public/art/meshes/structural/achae_stable.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_stable.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_stable.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_stable_elephant.dae b/binaries/data/mods/public/art/meshes/structural/achae_stable_elephant.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_stable_elephant.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_stable_elephant.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_storehouse.dae b/binaries/data/mods/public/art/meshes/structural/achae_storehouse.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_storehouse.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_storehouse.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_temple_1.dae b/binaries/data/mods/public/art/meshes/structural/achae_temple_1.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_temple_1.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_temple_1.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_tri.dae b/binaries/data/mods/public/art/meshes/structural/achae_tri.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_tri.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_tri.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_wall_gate.dae b/binaries/data/mods/public/art/meshes/structural/achae_wall_gate.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_wall_gate.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_wall_gate.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_wall_long.dae b/binaries/data/mods/public/art/meshes/structural/achae_wall_long.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_wall_long.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_wall_long.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/achae_wall_medium.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_wall_medium.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_wall_medium.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_wall_short.dae b/binaries/data/mods/public/art/meshes/structural/achae_wall_short.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_wall_short.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_wall_short.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_wall_tower.dae b/binaries/data/mods/public/art/meshes/structural/achae_wall_tower.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_wall_tower.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_wall_tower.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_wooden_tower.dae b/binaries/data/mods/public/art/meshes/structural/achae_wooden_tower.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_wooden_tower.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_wooden_tower.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_workshop.dae b/binaries/data/mods/public/art/meshes/structural/achae_workshop.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/pers_workshop.dae
rename to binaries/data/mods/public/art/meshes/structural/achae_workshop.dae
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_back_shield.png b/binaries/data/mods/public/art/textures/skins/props/achae_back_shield.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_back_shield.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_back_shield.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_back_shield_01_iron.png b/binaries/data/mods/public/art/textures/skins/props/achae_back_shield_01_iron.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_back_shield_01_iron.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_back_shield_01_iron.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_back_shield_01_norm.png b/binaries/data/mods/public/art/textures/skins/props/achae_back_shield_01_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_back_shield_01_norm.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_back_shield_01_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_back_shield_01_spec.png b/binaries/data/mods/public/art/textures/skins/props/achae_back_shield_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_back_shield_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_back_shield_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_bull_a.dds b/binaries/data/mods/public/art/textures/skins/props/achae_bull_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_bull_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/achae_bull_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_faravahar.png b/binaries/data/mods/public/art/textures/skins/props/achae_faravahar.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_faravahar.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_faravahar.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_prop_a.dds b/binaries/data/mods/public/art/textures/skins/props/achae_prop_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_prop_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/achae_prop_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_quiver_dark.png b/binaries/data/mods/public/art/textures/skins/props/achae_quiver_dark.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_quiver_dark.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_quiver_dark.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_quiver_light.png b/binaries/data/mods/public/art/textures/skins/props/achae_quiver_light.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_quiver_light.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_quiver_light.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_symbol.png b/binaries/data/mods/public/art/textures/skins/props/achae_symbol.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_symbol.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_symbol.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail.dds b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail.dds
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_1.png b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_1.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_1.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_1.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_2.png b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_2.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_2.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_3.png b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_3.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_3.png
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_3.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_b.dds b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_b.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_b.dds
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_b.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_c.dds b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_c.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_c.dds
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_c.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_d.dds b/binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_d.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/pers_trireme_sail_d.dds
rename to binaries/data/mods/public/art/textures/skins/props/achae_trireme_sail_d.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/ao/pers_cc_rubble.png b/binaries/data/mods/public/art/textures/skins/props/ao/achae_cc_rubble.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/ao/pers_cc_rubble.png
rename to binaries/data/mods/public/art/textures/skins/props/ao/achae_cc_rubble.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/ao/pers_dock_rubble_ao.png b/binaries/data/mods/public/art/textures/skins/props/ao/achae_dock_rubble_ao.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/ao/pers_dock_rubble_ao.png
rename to binaries/data/mods/public/art/textures/skins/props/ao/achae_dock_rubble_ao.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/banner_persian.png b/binaries/data/mods/public/art/textures/skins/props/banner_achaemenids.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/banner_persian.png
rename to binaries/data/mods/public/art/textures/skins/props/banner_achaemenids.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/garrison_pers.png b/binaries/data/mods/public/art/textures/skins/props/garrison_achae.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/garrison_pers.png
rename to binaries/data/mods/public/art/textures/skins/props/garrison_achae.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/garrison_pers_2.png b/binaries/data/mods/public/art/textures/skins/props/garrison_achae_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/garrison_pers_2.png
rename to binaries/data/mods/public/art/textures/skins/props/garrison_achae_2.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/garrison_pers_3.png b/binaries/data/mods/public/art/textures/skins/props/garrison_achae_3.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/garrison_pers_3.png
rename to binaries/data/mods/public/art/textures/skins/props/garrison_achae_3.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_a.png b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_a.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_a.png
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_a.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_b.png b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_b.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_b.png
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_b.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_c.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_c.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_c.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_c.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_d.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_d.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_d.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_d.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_e.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_e.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_e.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_e.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_f_y.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_f_y.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_f_y.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_f_y.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_g_y.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_g_y.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_g_y.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_g_y.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_h_mouth.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_h_mouth.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_h_mouth.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_h_mouth.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_i.png b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_i.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_i.png
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_i.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_face_j.png b/binaries/data/mods/public/art/textures/skins/props/head/achae_face_j.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_face_j.png
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_face_j.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_fem_a.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_fem_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_fem_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_fem_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_fem_b.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_fem_b.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_fem_b.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_fem_b.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/pers_fem_b_cin.dds b/binaries/data/mods/public/art/textures/skins/props/head/achae_fem_b_cin.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/pers_fem_b_cin.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/achae_fem_b_cin.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_conical_01_bronze.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_conical_01_bronze.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_conical_01_bronze.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_conical_01_bronze.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_conical_01_bronze_spec.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_conical_01_bronze_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_conical_01_bronze_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_conical_01_bronze_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_conical_01_norm.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_conical_01_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_conical_01_norm.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_conical_01_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_1.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_1.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_1.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_1.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_2.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_2.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_2.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_3.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_3.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_3.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_3.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_hero.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_hero.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_kidaris_hero.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_kidaris_hero.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_bronze.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_bronze.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_bronze.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_bronze.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_bronze_spec.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_bronze_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_bronze_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_bronze_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_iron.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_iron.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_iron.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_iron.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_norm.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_norm.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_spec.png b/binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/pers_neckguard_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/achae_neckguard_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/old/pers_crown.png b/binaries/data/mods/public/art/textures/skins/props/helmet/old/achae_crown.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/old/pers_crown.png
rename to binaries/data/mods/public/art/textures/skins/props/helmet/old/achae_crown.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/helmet/old/pers_f1.dds b/binaries/data/mods/public/art/textures/skins/props/helmet/old/achae_f1.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/helmet/old/pers_f1.dds
rename to binaries/data/mods/public/art/textures/skins/props/helmet/old/achae_f1.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers.png b/binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers_01.png b/binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers_01.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers_02.png b/binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers_02.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers_03.png b/binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/blanket_pers_03.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/blanket_achae_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_bronze.png b/binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_bronze.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_bronze.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_bronze.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_bronze_spec.png b/binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_bronze_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_bronze_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_bronze_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_iron.png b/binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_iron.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_iron.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_iron.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_norm.png b/binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_norm.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_spec.png b/binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/horse/peytral_pers_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/horse/peytral_achae_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/plac_head_pers.dds b/binaries/data/mods/public/art/textures/skins/props/plac_head_achae.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/plac_head_pers.dds
rename to binaries/data/mods/public/art/textures/skins/props/plac_head_achae.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/quivers/pers_back.png b/binaries/data/mods/public/art/textures/skins/props/quivers/achae_back.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/quivers/pers_back.png
rename to binaries/data/mods/public/art/textures/skins/props/quivers/achae_back.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/quivers/pers_back_norm.png b/binaries/data/mods/public/art/textures/skins/props/quivers/achae_back_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/quivers/pers_back_norm.png
rename to binaries/data/mods/public/art/textures/skins/props/quivers/achae_back_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/quivers/pers_back_spec.png b/binaries/data/mods/public/art/textures/skins/props/quivers/achae_back_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/quivers/pers_back_spec.png
rename to binaries/data/mods/public/art/textures/skins/props/quivers/achae_back_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_aspis_1.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_aspis_1.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_aspis_1.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_aspis_1.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_aspis_2.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_aspis_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_aspis_2.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_aspis_2.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_a.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_b.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_b.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_b.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_b.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_d.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_d.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_d.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_d.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_e.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_e.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_e.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_e.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_f.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_f.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_f.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_f.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_g.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_g.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_gerron_g.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_gerron_g.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_a.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_b.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_b.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_b.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_b.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_c.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_c.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_c.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_c.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_d.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_d.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_d.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_d.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_e.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_e.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_e.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_e.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_f.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_f.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_f.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_f.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_g.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_g.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_g.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_g.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_h.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_h.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_pelta_h.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_pelta_h.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_a.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_b.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_b.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_b.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_b.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_c.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_c.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_c.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_c.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_d.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_d.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_d.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_d.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_e.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_e.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_e.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_e.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_f.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_f.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_f.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_f.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_g.png b/binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_g.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_rect_g.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_rect_g.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_round_a.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_round_a.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_round_a.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_round_a.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_round_b.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_round_b.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_round_b.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_round_b.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_round_c.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_round_c.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_round_c.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_round_c.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_round_d.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_round_d.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_round_d.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_round_d.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_round_e.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_round_e.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_round_e.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_round_e.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/pers_round_f.dds b/binaries/data/mods/public/art/textures/skins/props/shield/achae_round_f.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/pers_round_f.dds
rename to binaries/data/mods/public/art/textures/skins/props/shield/achae_round_f.dds
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/aspis_pers_kardakes_01.png b/binaries/data/mods/public/art/textures/skins/props/shield/aspis_achae_kardakes_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/aspis_pers_kardakes_01.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/aspis_achae_kardakes_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/aspis_pers_kardakes_02.png b/binaries/data/mods/public/art/textures/skins/props/shield/aspis_achae_kardakes_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/aspis_pers_kardakes_02.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/aspis_achae_kardakes_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/aspis_pers_norm.png b/binaries/data/mods/public/art/textures/skins/props/shield/aspis_achae_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/shield/aspis_pers_norm.png
rename to binaries/data/mods/public/art/textures/skins/props/shield/aspis_achae_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/props/standards/pers_infantry_01.png b/binaries/data/mods/public/art/textures/skins/props/standards/achae_infantry_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/standards/pers_infantry_01.png
rename to binaries/data/mods/public/art/textures/skins/props/standards/achae_infantry_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_01_01.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_01_01.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_01_01.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_01_01.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_01_02.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_01_02.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_01_02.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_01_02.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_01_03.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_01_03.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_01_03.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_01_03.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_full_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_full_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_full_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/dress_female_full_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_06.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/linothorax_01_06.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/linothorax_01_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_06.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_06.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_07.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_07.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_07.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_07.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_08.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_08.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_08.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_08.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_09.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_09.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_01_09.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_01_09.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_02_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_02_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_02_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_02_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_02_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_02_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_02_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_02_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_02_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_02_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_02_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_02_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_03_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_03_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_03_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_03_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_03_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_03_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/padded_03_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/padded_03_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_healer_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_healer_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_healer_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_healer_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_royal_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_royal_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_royal_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_royal_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_royal_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_royal_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_royal_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_royal_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_royal_03.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_royal_03.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/robes_royal_03.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/robes_royal_03.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_06.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_06.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_07.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_07.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_07.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_07.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_08.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_08.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_08.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_08.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_norm.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_norm.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_06.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_06.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_07.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_07.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_07.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_07.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_02_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_02_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_03_01.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_03_01.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_03_01.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_03_01.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_03_02.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_03_02.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_03_02.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_03_02.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_04_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_04_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_04_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_04_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_04_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_04_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_04_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_04_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_04_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_04_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_04_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_04_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_05_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_05_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_05_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_05_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_full_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_full_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_full_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_full_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_full_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_full_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_full_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_full_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_full_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_full_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_armband_full_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_armband_full_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_kardakes_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_kardakes_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_kardakes_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_kardakes_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_kardakes_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_kardakes_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_kardakes_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_kardakes_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_kardakes_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_kardakes_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_kardakes_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_kardakes_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_bottom_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_bottom_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_bottom_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_bottom_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_bottom_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_bottom_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_bottom_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_bottom_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_bottom_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_bottom_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_bottom_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_bottom_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_full_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_full_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_top_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_top_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_top_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_top_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_top_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_top_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_top_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_top_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_top_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_top_01_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_sleeve_top_01_spec.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/scale_sleeve_top_01_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_06.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_06.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_07.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_07.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_01_07.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_01_07.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_02_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_02_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_02_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_02_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_02_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_02_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_02_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_02_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_02_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_02_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_advanced_02_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_advanced_02_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_06.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_06.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_07.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_07.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_07.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_07.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_08.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_08.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_01_08.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_01_08.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_02_01.dds b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_02_01.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_02_01.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_02_01.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_03_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_03_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_03_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_03_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_03_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_03_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_basic_03_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_basic_03_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_02.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_03.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_04.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_05.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_coat_01_05.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_coat_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_slave_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_slave_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_slave_01_01.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/achae/tunic_slave_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_bir.dds b/binaries/data/mods/public/art/textures/skins/structural/achae_bir.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_bir.dds
rename to binaries/data/mods/public/art/textures/skins/structural/achae_bir.dds
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_bireme.png b/binaries/data/mods/public/art/textures/skins/structural/achae_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_bireme.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_bireme.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_bireme_norm.png b/binaries/data/mods/public/art/textures/skins/structural/achae_bireme_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_bireme_norm.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_bireme_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_bireme_spec.png b/binaries/data/mods/public/art/textures/skins/structural/achae_bireme_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_bireme_spec.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_bireme_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_cc_staircase.png b/binaries/data/mods/public/art/textures/skins/structural/achae_cc_staircase.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_cc_staircase.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_cc_staircase.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_chariot_a.png b/binaries/data/mods/public/art/textures/skins/structural/achae_chariot_a.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_chariot_a.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_chariot_a.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_chariot_b.png b/binaries/data/mods/public/art/textures/skins/structural/achae_chariot_b.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_chariot_b.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_chariot_b.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_chariot_darius.png b/binaries/data/mods/public/art/textures/skins/structural/achae_chariot_darius.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_chariot_darius.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_chariot_darius.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_chariot_e.png b/binaries/data/mods/public/art/textures/skins/structural/achae_chariot_e.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_chariot_e.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_chariot_e.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_chariot_hero_spec.png b/binaries/data/mods/public/art/textures/skins/structural/achae_chariot_hero_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_chariot_hero_spec.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_chariot_hero_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_chariot_xerxes.png b/binaries/data/mods/public/art/textures/skins/structural/achae_chariot_xerxes.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_chariot_xerxes.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_chariot_xerxes.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_fishship.dds b/binaries/data/mods/public/art/textures/skins/structural/achae_fishship.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_fishship.dds
rename to binaries/data/mods/public/art/textures/skins/structural/achae_fishship.dds
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu.png b/binaries/data/mods/public/art/textures/skins/structural/achae_lamassu.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_lamassu.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_lamassu.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_dark.png b/binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_dark.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_dark.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_dark.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_norm.png b/binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_norm.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin.png b/binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_ruin.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_ruin.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin_norm.png b/binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_ruin_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin_norm.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_ruin_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_spec.png b/binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_spec.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_lamassu_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_merc.dds b/binaries/data/mods/public/art/textures/skins/structural/achae_merc.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_merc.dds
rename to binaries/data/mods/public/art/textures/skins/structural/achae_merc.dds
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_struct.png b/binaries/data/mods/public/art/textures/skins/structural/achae_struct.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_struct.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_struct.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_struct_norm.png b/binaries/data/mods/public/art/textures/skins/structural/achae_struct_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_struct_norm.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_struct_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_struct_spec.png b/binaries/data/mods/public/art/textures/skins/structural/achae_struct_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_struct_spec.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_struct_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_tower_01.dds b/binaries/data/mods/public/art/textures/skins/structural/achae_tower_01.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_tower_01.dds
rename to binaries/data/mods/public/art/textures/skins/structural/achae_tower_01.dds
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_tri.dds b/binaries/data/mods/public/art/textures/skins/structural/achae_tri.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_tri.dds
rename to binaries/data/mods/public/art/textures/skins/structural/achae_tri.dds
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_trireme.png b/binaries/data/mods/public/art/textures/skins/structural/achae_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_trireme.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_trireme.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_trireme_norm.png b/binaries/data/mods/public/art/textures/skins/structural/achae_trireme_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_trireme_norm.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_trireme_norm.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_trireme_spec.png b/binaries/data/mods/public/art/textures/skins/structural/achae_trireme_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/pers_trireme_spec.png
rename to binaries/data/mods/public/art/textures/skins/structural/achae_trireme_spec.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ballista_tower_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ballista_tower_AO.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ballista_tower_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ballista_tower_AO.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_barracks.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_barracks.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_barracks.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_barracks.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_bireme.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_bireme.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_bireme.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_blacksmith.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_blacksmith.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_blacksmith.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_blacksmith.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_civic.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_civic.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_civic.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_civic.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_civic_b.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_civic_b.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_civic_b.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_civic_b.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_corral.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_corral.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_corral.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_corral.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_defense_tower.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_defense_tower.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_defense_tower.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_defense_tower.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_dock.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_dock.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_dock.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_dock.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_farmstead.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_farmstead.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_farmstead.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_farmstead.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_fortress.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_fortress.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_fortress.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_fortress.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_fortress_b.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_fortress_b.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_fortress_b.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_fortress_b.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_gardens_ao.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_gardens_ao.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_gardens_ao.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_gardens_ao.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_a.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_a.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_a.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_a.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_b.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_b.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_b.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_b.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_c.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_c.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_c.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_c.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_d.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_d.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_house_d.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_house_d.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_01.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_01.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_02.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_02.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_03.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_03.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_04.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_04.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_05.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_05.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_06.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_ice_house_06.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_ice_house_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_lamassu.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_lamassu.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_lamassu.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_lamassu.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_market_a.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_market_a.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_market_a.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_market_a.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_market_b.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_market_b.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_market_b.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_market_b.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_palace.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_palace.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_palace.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_palace.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_range_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_range_AO.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_range_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_range_AO.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_scout_tower_02.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_scout_tower_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_scout_tower_02.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_scout_tower_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_shrine.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_shrine.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_shrine.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_shrine.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_stable.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_stable.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_stable.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_stable.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_stable_elephant.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_stable_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_stable_elephant.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_stable_elephant.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_storehouse.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_storehouse.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_storehouse.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_storehouse.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_temple.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_temple.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_temple.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_temple.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_trireme.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_trireme.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_trireme.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_wooden_tower_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_wooden_tower_AO.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_wooden_tower_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_wooden_tower_AO.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_workshop_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/achae_workshop_AO.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/pers_workshop_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/achae_workshop_AO.png
diff --git a/binaries/data/mods/public/art/textures/skins/temp/pers_tower_01.dds b/binaries/data/mods/public/art/textures/skins/temp/achae_tower_01.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/temp/pers_tower_01.dds
rename to binaries/data/mods/public/art/textures/skins/temp/achae_tower_01.dds
diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/bkg/background_circle_pers.png b/binaries/data/mods/public/art/textures/ui/session/icons/bkg/background_circle_achae.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/icons/bkg/background_circle_pers.png
rename to binaries/data/mods/public/art/textures/ui/session/icons/bkg/background_circle_achae.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_persians.png b/binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_achaemenids.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_persians.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_achaemenids.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/structures/pers_gate.png b/binaries/data/mods/public/art/textures/ui/session/portraits/structures/achae_gate.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/structures/pers_gate.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/structures/achae_gate.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/structures/pers_hall.png b/binaries/data/mods/public/art/textures/ui/session/portraits/structures/achae_hall.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/structures/pers_hall.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/structures/achae_hall.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/pers_hundred_columns.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/pers_hundred_columns.png
deleted file mode 100644
index 36b45cd3ce..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/pers_hundred_columns.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04efde26759f5974d962f51f8681bbb37a49d337889191803b52b951f5f9dfb8
-size 10890
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/arstibara.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/arstibara.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/arstibara.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/arstibara.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_axeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_axeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_axeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_axeman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_cavalry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_cavalry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/champion_infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/chariot_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/chariot_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/chariot_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/chariot_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_cyrus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/hero_cyrus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_cyrus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/hero_cyrus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_darius.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/hero_darius.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_darius.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/hero_darius.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_xerxes.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/hero_xerxes.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_xerxes.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/hero_xerxes.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/kardakes.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/kardakes.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes_skirmisher.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/kardakes_skirmisher.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes_skirmisher.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/kardakes_skirmisher.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_arrow.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_arrow.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_arrow.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_arrow.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_scout.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_scout.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_scout.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/ship_scout.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_civilian.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_civilian.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_civilian.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/achae/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/tips/persian_architecture.png b/binaries/data/mods/public/art/textures/ui/tips/achaemenid_architecture.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/tips/persian_architecture.png
rename to binaries/data/mods/public/art/textures/ui/tips/achaemenid_architecture.png
diff --git a/binaries/data/mods/public/art/textures/ui/tips/ranks_pers.png b/binaries/data/mods/public/art/textures/ui/tips/ranks_achae.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/tips/ranks_pers.png
rename to binaries/data/mods/public/art/textures/ui/tips/ranks_achae.png
diff --git a/binaries/data/mods/public/art/textures/ui/tips/temple_pers.png b/binaries/data/mods/public/art/textures/ui/tips/temple_achae.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/tips/temple_pers.png
rename to binaries/data/mods/public/art/textures/ui/tips/temple_achae.png
diff --git a/binaries/data/mods/public/art/variants/biped/fisher/base_achae.xml b/binaries/data/mods/public/art/variants/biped/fisher/base_achae.xml
new file mode 100644
index 0000000000..f8bd797852
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/fisher/base_achae.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/fisher/base.xml">
+  <animations>
+    <animation file="biped/fisher/achae_idle_a.dae" name="Idle" id="idle1" speed="35"/>
+    <animation file="biped/fisher/achae_idle_b.dae" name="Idle" id="idle2" speed="35"/>
+    <animation file="biped/fisher/achae_idle_a.dae" name="Idle" id="idle3" speed="35"/>
+    <animation file="biped/fisher/achae_move.dae" name="Walk" id="walk1" speed="8"/>
+    <animation file="biped/fisher/achae_move.dae" name="Run" id="run1" speed="8"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/fisher/base_pers.xml b/binaries/data/mods/public/art/variants/biped/fisher/base_pers.xml
deleted file mode 100644
index 09f4bf8490..0000000000
--- a/binaries/data/mods/public/art/variants/biped/fisher/base_pers.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant file="biped/fisher/base.xml">
-  <animations>
-    <animation file="biped/fisher/pers_idle_a.dae" name="Idle" id="idle1" speed="35"/>
-    <animation file="biped/fisher/pers_idle_b.dae" name="Idle" id="idle2" speed="35"/>
-    <animation file="biped/fisher/pers_idle_a.dae" name="Idle" id="idle3" speed="35"/>
-    <animation file="biped/fisher/pers_move.dae" name="Walk" id="walk1" speed="8"/>
-    <animation file="biped/fisher/pers_move.dae" name="Run" id="run1" speed="8"/>
-  </animations>
-</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/fisher/carry_pers.xml b/binaries/data/mods/public/art/variants/biped/fisher/carry_achae.xml
similarity index 68%
rename from binaries/data/mods/public/art/variants/biped/fisher/carry_pers.xml
rename to binaries/data/mods/public/art/variants/biped/fisher/carry_achae.xml
index 5aa8b4cbfd..3039dc55f5 100644
--- a/binaries/data/mods/public/art/variants/biped/fisher/carry_pers.xml
+++ b/binaries/data/mods/public/art/variants/biped/fisher/carry_achae.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="carry_fish">
   <animations>
-    <animation file="biped/fisher/pers_move.dae" name="Walk" speed="10"/>
-    <animation file="biped/fisher/pers_idle_a.dae" name="Idle" speed="35"/>
+    <animation file="biped/fisher/achae_move.dae" name="Walk" speed="10"/>
+    <animation file="biped/fisher/achae_idle_a.dae" name="Idle" speed="35"/>
   </animations>
   <props>
     <prop attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_pers.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_achae.xml
similarity index 100%
rename from binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_pers.xml
rename to binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_achae.xml
diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_pers.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_achae.xml
similarity index 100%
rename from binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_pers.xml
rename to binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_achae.xml
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_bireme_oars.xml b/binaries/data/mods/public/art/variants/others/ships/achae_bireme_oars.xml
similarity index 99%
rename from binaries/data/mods/public/art/variants/others/ships/pers_bireme_oars.xml
rename to binaries/data/mods/public/art/variants/others/ships/achae_bireme_oars.xml
index f22725b055..30d9b7218c 100644
--- a/binaries/data/mods/public/art/variants/others/ships/pers_bireme_oars.xml
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_bireme_oars.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="Base">
-    <props>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_001"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_002"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_003"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_004"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_005"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_006"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_007"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_008"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_009"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_010"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_011"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_012"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_013"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_001"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_002"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_003"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_004"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_005"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_006"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_007"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_008"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_009"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_010"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_011"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_012"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_001"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_002"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_003"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_004"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_005"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_006"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_007"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_008"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_009"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_010"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_011"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_012"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_001"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_002"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_003"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_004"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_005"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_006"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_007"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_008"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_009"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_010"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_011"/>
-        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_012"/>
-    </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base">
+    <props>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_001"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_002"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_003"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_004"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_005"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_006"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_007"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_008"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_009"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_010"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_011"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_012"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_s_R_013"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_001"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_002"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_003"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_004"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_005"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_006"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_007"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_008"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_009"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_010"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_011"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_right.xml" attachpoint="row_i_R_012"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_001"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_002"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_003"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_004"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_005"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_006"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_007"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_008"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_009"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_010"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_011"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_s_L_012"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_001"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_002"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_003"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_004"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_005"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_006"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_007"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_008"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_009"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_010"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_011"/>
+        <prop actor="props/structures/hellenes/ship_oar_short_middle_left.xml" attachpoint="row_i_L_012"/>
+    </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/achae_sail_01.xml b/binaries/data/mods/public/art/variants/others/ships/achae_sail_01.xml
new file mode 100644
index 0000000000..1472eb0035
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_sail_01.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant frequency="1" name="zoroaster" file="others/ships/achae_sail_base.xml">
+    <textures>
+        <texture file="props/achae_trireme_sail_1.png" name="baseTex"/>
+    </textures>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_sail_02.xml b/binaries/data/mods/public/art/variants/others/ships/achae_sail_02.xml
similarity index 59%
rename from binaries/data/mods/public/art/variants/others/ships/pers_sail_02.xml
rename to binaries/data/mods/public/art/variants/others/ships/achae_sail_02.xml
index 319bffebc8..b17603dbad 100644
--- a/binaries/data/mods/public/art/variants/others/ships/pers_sail_02.xml
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_sail_02.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant frequency="1" name="royal standard" file="others/ships/pers_sail_base.xml">
-    <textures>
-        <texture file="props/pers_trireme_sail_2.png" name="baseTex"/>
-    </textures>
-</variant>
+<?xml version="1.0" encoding="utf-8"?>
+<variant frequency="1" name="royal standard" file="others/ships/achae_sail_base.xml">
+    <textures>
+        <texture file="props/achae_trireme_sail_2.png" name="baseTex"/>
+    </textures>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/achae_sail_03.xml b/binaries/data/mods/public/art/variants/others/ships/achae_sail_03.xml
new file mode 100644
index 0000000000..8bfeb9fb2c
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_sail_03.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant frequency="1" name="standard" file="others/ships/achae_sail_base.xml">
+    <textures>
+        <texture file="props/achae_trireme_sail_3.png" name="baseTex"/>
+    </textures>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_sail_base.xml b/binaries/data/mods/public/art/variants/others/ships/achae_sail_base.xml
similarity index 80%
rename from binaries/data/mods/public/art/variants/others/ships/pers_sail_base.xml
rename to binaries/data/mods/public/art/variants/others/ships/achae_sail_base.xml
index 4d89467bb7..0e3bc67670 100644
--- a/binaries/data/mods/public/art/variants/others/ships/pers_sail_base.xml
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_sail_base.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant frequency="1" name="Persian Sail">
-    <textures>
-        <texture file="props/ptol_sail_norm.png" name="normTex"/>
-        <texture file="props/sail_spec_1.png" name="specTex"/>
-    </textures>
-</variant>
+<?xml version="1.0" encoding="utf-8"?>
+<variant frequency="1" name="Achaemenid Sail">
+    <textures>
+        <texture file="props/ptol_sail_norm.png" name="normTex"/>
+        <texture file="props/sail_spec_1.png" name="specTex"/>
+    </textures>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_trireme_oars.xml b/binaries/data/mods/public/art/variants/others/ships/achae_trireme_oars.xml
similarity index 98%
rename from binaries/data/mods/public/art/variants/others/ships/pers_trireme_oars.xml
rename to binaries/data/mods/public/art/variants/others/ships/achae_trireme_oars.xml
index 877bf3a779..5d337bf566 100644
--- a/binaries/data/mods/public/art/variants/others/ships/pers_trireme_oars.xml
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_trireme_oars.xml
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="Base">
-    <props>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_001"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_002"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_003"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_004"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_005"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_006"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_007"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_008"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_009"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_010"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_011"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_012"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_013"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_014"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_015"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_016"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_017"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_018"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_019"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_020"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_021"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_022"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_023"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_024"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_025"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_026"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_027"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_028"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_029"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_030"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_031"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_032"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_033"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_034"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_035"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_036"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_037"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_038"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_039"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_040"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_041"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_042"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_043"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_044"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_045"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_046"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_047"/>
-        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_048"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_001"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_002"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_003"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_004"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_005"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_006"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_007"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_008"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_009"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_010"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_011"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_012"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_013"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_014"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_015"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_016"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_017"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_018"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_019"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_020"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_021"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_022"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_023"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_024"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_025"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_026"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_027"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_028"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_029"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_030"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_031"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_032"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_033"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_034"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_035"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_036"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_037"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_038"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_039"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_040"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_041"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_042"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_043"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_044"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_045"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_046"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_047"/>
-        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_048"/>
-    </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base">
+    <props>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_001"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_002"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_003"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_004"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_005"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_006"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_007"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_008"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_009"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_010"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_011"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_012"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_013"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_014"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_015"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_016"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_017"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_018"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_019"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_020"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_021"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_022"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_023"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_024"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_025"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_026"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_027"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_028"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_029"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_030"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_031"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_032"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_033"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_034"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_035"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_036"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_037"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_038"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_039"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_040"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_041"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_042"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_043"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_044"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_045"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_046"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_047"/>
+        <prop actor="props/structures/hellenes/ship_oar_right.xml" attachpoint="row_R_048"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_001"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_002"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_003"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_004"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_005"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_006"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_007"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_008"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_009"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_010"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_011"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_012"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_013"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_014"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_015"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_016"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_017"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_018"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_019"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_020"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_021"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_022"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_023"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_024"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_025"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_026"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_027"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_028"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_029"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_030"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_031"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_032"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_033"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_034"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_035"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_036"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_037"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_038"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_039"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_040"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_041"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_042"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_043"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_044"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_045"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_046"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_047"/>
+        <prop actor="props/structures/hellenes/ship_oar_left.xml" attachpoint="row_L_048"/>
+    </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/achae_trireme_shields.xml b/binaries/data/mods/public/art/variants/others/ships/achae_trireme_shields.xml
new file mode 100644
index 0000000000..227cd6fc9b
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/others/ships/achae_trireme_shields.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base">
+    <props>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_001"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_002"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_003"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_004"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_005"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_006"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_007"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_008"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_009"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_010"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_011"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_012"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_013"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_014"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_015"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_016"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_017"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_018"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_019"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_020"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_021"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_022"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_023"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_024"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_025"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_026"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_027"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_028"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_029"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_030"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_031"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_032"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_033"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_034"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_R_035"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_001"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_002"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_003"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_004"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_005"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_006"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_007"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_008"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_009"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_010"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_011"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_012"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_013"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_014"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_015"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_016"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_017"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_018"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_019"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_020"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_021"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_022"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_023"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_024"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_025"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_026"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_027"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_028"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_029"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_030"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_031"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_032"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_033"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_034"/>
+        <prop actor="props/units/shields/achae_buckler_1.xml" attachpoint="shield_L_035"/>
+    </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_sail_01.xml b/binaries/data/mods/public/art/variants/others/ships/pers_sail_01.xml
deleted file mode 100644
index 938884d436..0000000000
--- a/binaries/data/mods/public/art/variants/others/ships/pers_sail_01.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant frequency="1" name="zoroaster" file="others/ships/pers_sail_base.xml">
-    <textures>
-        <texture file="props/pers_trireme_sail_1.png" name="baseTex"/>
-    </textures>
-</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_sail_03.xml b/binaries/data/mods/public/art/variants/others/ships/pers_sail_03.xml
deleted file mode 100644
index 1014adc5e7..0000000000
--- a/binaries/data/mods/public/art/variants/others/ships/pers_sail_03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant frequency="1" name="standard" file="others/ships/pers_sail_base.xml">
-    <textures>
-        <texture file="props/pers_trireme_sail_3.png" name="baseTex"/>
-    </textures>
-</variant>
diff --git a/binaries/data/mods/public/art/variants/others/ships/pers_trireme_shields.xml b/binaries/data/mods/public/art/variants/others/ships/pers_trireme_shields.xml
deleted file mode 100644
index 54b0f2ac8a..0000000000
--- a/binaries/data/mods/public/art/variants/others/ships/pers_trireme_shields.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="Base">
-    <props>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_001"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_002"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_003"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_004"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_005"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_006"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_007"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_008"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_009"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_010"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_011"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_012"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_013"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_014"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_015"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_016"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_017"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_018"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_019"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_020"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_021"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_022"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_023"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_024"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_025"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_026"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_027"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_028"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_029"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_030"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_031"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_032"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_033"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_034"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_R_035"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_001"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_002"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_003"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_004"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_005"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_006"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_007"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_008"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_009"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_010"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_011"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_012"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_013"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_014"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_015"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_016"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_017"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_018"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_019"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_020"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_021"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_022"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_023"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_024"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_025"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_026"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_027"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_028"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_029"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_030"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_031"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_032"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_033"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_034"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_L_035"/>
-    </props>
-</variant>
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae.xml
similarity index 50%
rename from binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers.xml
rename to binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae.xml
index d4f08c619d..16bc6efbb8 100644
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers.xml
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <variant frequency="1" name="base">
-  <mesh>props/horse/blanket_pers.dae</mesh>
+  <mesh>props/horse/blanket_achae.dae</mesh>
   <textures>
-    <texture file="props/horse/blanket_pers.png" name="baseTex"/>
+    <texture file="props/horse/blanket_achae.png" name="baseTex"/>
   </textures>
 </variant>
 
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_01.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_01.xml
new file mode 100644
index 0000000000..1033534f88
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_01.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant file="quadraped/horse/props/blanket_achae.xml">
+  <textures>
+    <texture file="props/horse/blanket_achae_01.png" name="baseTex"/>
+  </textures>
+</variant>
+
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_02.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_02.xml
new file mode 100644
index 0000000000..2d16d22556
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_02.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant file="quadraped/horse/props/blanket_achae.xml">
+  <textures>
+    <texture file="props/horse/blanket_achae_02.png" name="baseTex"/>
+  </textures>
+</variant>
+
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_03.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_03.xml
new file mode 100644
index 0000000000..5850f2f5f1
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_achae_03.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant file="quadraped/horse/props/blanket_achae.xml">
+  <textures>
+    <texture file="props/horse/blanket_achae_03.png" name="baseTex"/>
+  </textures>
+</variant>
+
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_01.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_01.xml
deleted file mode 100644
index 9a16b60be0..0000000000
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_01.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant file="quadraped/horse/props/blanket_pers.xml">
-  <textures>
-    <texture file="props/horse/blanket_pers_01.png" name="baseTex"/>
-  </textures>
-</variant>
-
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_02.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_02.xml
deleted file mode 100644
index 65b4e14286..0000000000
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_02.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant file="quadraped/horse/props/blanket_pers.xml">
-  <textures>
-    <texture file="props/horse/blanket_pers_02.png" name="baseTex"/>
-  </textures>
-</variant>
-
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_03.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_03.xml
deleted file mode 100644
index bf57b695aa..0000000000
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/blanket_pers_03.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant file="quadraped/horse/props/blanket_pers.xml">
-  <textures>
-    <texture file="props/horse/blanket_pers_03.png" name="baseTex"/>
-  </textures>
-</variant>
-
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_base.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_base.xml
similarity index 96%
rename from binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_base.xml
rename to binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_base.xml
index 36427fa87e..969ff097d8 100644
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_base.xml
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_base.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant frequency="1" name="base">
-  <mesh>props/horse/peytral_02.dae</mesh>
-</variant>
-
+<?xml version="1.0" encoding="utf-8"?>
+<variant frequency="1" name="base">
+  <mesh>props/horse/peytral_02.dae</mesh>
+</variant>
+
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_bronze_01.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_bronze_01.xml
new file mode 100644
index 0000000000..edd8b18a09
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_bronze_01.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant file="quadraped/horse/props/peytral_achae_base.xml">
+  <textures>
+    <texture file="props/horse/peytral_achae_01_bronze.png" name="baseTex"/>
+    <texture file="props/horse/peytral_achae_01_bronze_spec.png" name="specTex"/>
+    <texture file="props/horse/peytral_achae_01_norm.png" name="normTex"/>
+  </textures>
+</variant>
+
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_iron_01.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_iron_01.xml
new file mode 100644
index 0000000000..581ec244fd
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_achae_iron_01.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<variant file="quadraped/horse/props/peytral_achae_base.xml">
+  <textures>
+    <texture file="props/horse/peytral_achae_01_iron.png" name="baseTex"/>
+    <texture file="props/horse/peytral_achae_01_spec.png" name="specTex"/>
+    <texture file="props/horse/peytral_achae_01_norm.png" name="normTex"/>
+  </textures>
+</variant>
+
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_bronze_01.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_bronze_01.xml
deleted file mode 100644
index 10d865076c..0000000000
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_bronze_01.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant file="quadraped/horse/props/peytral_pers_base.xml">
-  <textures>
-    <texture file="props/horse/peytral_pers_01_bronze.png" name="baseTex"/>
-    <texture file="props/horse/peytral_pers_01_bronze_spec.png" name="specTex"/>
-    <texture file="props/horse/peytral_pers_01_norm.png" name="normTex"/>
-  </textures>
-</variant>
-
diff --git a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_iron_01.xml b/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_iron_01.xml
deleted file mode 100644
index d3913cbbc8..0000000000
--- a/binaries/data/mods/public/art/variants/quadraped/horse/props/peytral_pers_iron_01.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant file="quadraped/horse/props/peytral_pers_base.xml">
-  <textures>
-    <texture file="props/horse/peytral_pers_01_iron.png" name="baseTex"/>
-    <texture file="props/horse/peytral_pers_01_spec.png" name="specTex"/>
-    <texture file="props/horse/peytral_pers_01_norm.png" name="normTex"/>
-  </textures>
-</variant>
-
diff --git a/binaries/data/mods/public/gui/reference/tips/texts/achaemenid_architecture.txt b/binaries/data/mods/public/gui/reference/tips/texts/achaemenid_architecture.txt
new file mode 100644
index 0000000000..75b871b821
--- /dev/null
+++ b/binaries/data/mods/public/gui/reference/tips/texts/achaemenid_architecture.txt
@@ -0,0 +1,4 @@
+ACHAEMENID ARCHITECTURE
+Special technology exclusive to the Achaemenid Persians.
+Structures gain +25% health, but their build time lengthened by +20% as a consequence.
+Achaemenids also have access to a great number of other structural and defensive technologies.
diff --git a/binaries/data/mods/public/gui/reference/tips/texts/persian_architecture.txt b/binaries/data/mods/public/gui/reference/tips/texts/persian_architecture.txt
deleted file mode 100644
index 91ba2570d1..0000000000
--- a/binaries/data/mods/public/gui/reference/tips/texts/persian_architecture.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ACHAEMENID ARCHITECTURE
-Special technology exclusive to the Persians.
-Structures gain +25% health, but their build time lengthened by +20% as a consequence.
-Persians also have access to a great number of other structural and defensive technologies.
diff --git a/binaries/data/mods/public/gui/reference/tips/texts/war_elephants.txt b/binaries/data/mods/public/gui/reference/tips/texts/war_elephants.txt
index 38031e0561..f15b081df9 100644
--- a/binaries/data/mods/public/gui/reference/tips/texts/war_elephants.txt
+++ b/binaries/data/mods/public/gui/reference/tips/texts/war_elephants.txt
@@ -1,5 +1,5 @@
 WAR ELEPHANTS
-Available to the Carthaginians, Kushites, Mauryas, Persians, Ptolemies, and Seleucids.
+Available to the Achaemenids, Carthaginians, Kushites, Mauryas, Ptolemies, and Seleucids.
 Huge beasts from Africa and India, trained for war.
 High Food and Metal cost, but very powerful.
 Attack individual units, but also deal splash damage to others nearby. Use them to break apart tight formations.
diff --git a/binaries/data/mods/public/gui/reference/tips/tipfiles.json b/binaries/data/mods/public/gui/reference/tips/tipfiles.json
index caae995c86..b602f742c2 100644
--- a/binaries/data/mods/public/gui/reference/tips/tipfiles.json
+++ b/binaries/data/mods/public/gui/reference/tips/tipfiles.json
@@ -125,7 +125,7 @@
         "imageFiles": [
           "temple_gaul.png",
           "temple_greek.png",
-          "temple_pers.png"
+          "temple_achae.png"
         ]
       },
       {
@@ -212,7 +212,7 @@
       {
         "textFile": "experience.txt",
         "imageFiles": [
-          "ranks_pers.png",
+          "ranks_achae.png",
           "ranks_han.png"
         ]
       },
@@ -423,9 +423,9 @@
         ]
       },
       {
-        "textFile": "persian_architecture.txt",
+        "textFile": "achaemenid_architecture.txt",
         "imageFiles": [
-          "persian_architecture.png"
+          "achaemenid_architecture.png"
         ]
       },
       {
diff --git a/binaries/data/mods/public/maps/random/wild_lake_biomes.json b/binaries/data/mods/public/maps/random/wild_lake_biomes.json
index b85aa73f8b..7af70fe5e9 100644
--- a/binaries/data/mods/public/maps/random/wild_lake_biomes.json
+++ b/binaries/data/mods/public/maps/random/wild_lake_biomes.json
@@ -167,24 +167,24 @@
 				"Template": "structures/ptol/mercenary_camp"
 			},
 			{
-				"Template": "units/pers/infantry_javelineer_b",
+				"Template": "units/achae/infantry_javelineer_b",
 				"Count": 4
 			},
 			{
-				"Template": "units/pers/cavalry_axeman_e",
+				"Template": "units/achae/cavalry_axeman_e",
 				"Count": 3
 			},
 			{
-				"Template": "units/pers/infantry_archer_a",
+				"Template": "units/achae/infantry_archer_a",
 				"Count": 4
 			},
 			{
-				"Template": "units/pers/champion_infantry",
+				"Template": "units/achae/champion_infantry",
 				"Count": 3
 			}
 		],
 		"farmEntities": {
-			"building": "structures/pers/farmstead",
+			"building": "structures/achae/farmstead",
 			"animal": "gaia/fauna_camel"
 		}
 	},
diff --git a/binaries/data/mods/public/maps/scenarios/_default.xml b/binaries/data/mods/public/maps/scenarios/_default.xml
index d1dafec5a7..6ea2a96ee2 100644
--- a/binaries/data/mods/public/maps/scenarios/_default.xml
+++ b/binaries/data/mods/public/maps/scenarios/_default.xml
@@ -31,7 +31,13 @@
 		"PlayerData":
 		[
 			{
-				"Civ": "han"
+				"Civ": "achae"
+			},
+			{
+				"Civ": "athen"
+			},
+			{
+				"Civ": "brit"
 			},
 			{
 				"Civ": "cart"
@@ -39,20 +45,14 @@
 			{
 				"Civ": "gaul"
 			},
+			{
+				"Civ": "germ"
+			},
+			{
+				"Civ": "han"
+			},
 			{
 				"Civ": "iber"
-			},
-			{
-				"Civ": "pers"
-			},
-			{
-				"Civ": "ptol"
-			},
-			{
-				"Civ": "rome"
-			},
-			{
-				"Civ": "spart"
 			}
 		],
 		"CircularMap": true,
diff --git a/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml b/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml
index 92386b64bc..52cde01fd6 100644
--- a/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml
+++ b/binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml
@@ -72,7 +72,7 @@
     },
     {
       "AI": "",
-      "Civ": "pers"
+      "Civ": "achae"
     },
     {
       "AI": "",
diff --git a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
index 0e36930daf..18789a536e 100644
--- a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
@@ -53,7 +53,7 @@
   "PlayerData": [
     null,
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 0,
         "g": 128,
@@ -111,61 +111,61 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="150">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>1</Player>
 			<Position x="487.96749" z="869.59334"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="151">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="396.07621" z="869.2046"/>
 			<Orientation y="3.927"/>
 		</Entity>
 		<Entity uid="152">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="401.73304" z="863.54773"/>
 			<Orientation y="3.927"/>
 		</Entity>
 		<Entity uid="153">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="407.3899" z="857.89094"/>
 			<Orientation y="3.927"/>
 		</Entity>
 		<Entity uid="154">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="413.04673" z="852.23407"/>
 			<Orientation y="3.927"/>
 		</Entity>
 		<Entity uid="155">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="513.77375" z="880.2782"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="156">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="519.43061" z="885.93506"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="157">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="509.18068" z="882.32126"/>
 			<Orientation y="0.78541"/>
 		</Entity>
 		<Entity uid="158">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="503.52384" z="887.97812"/>
 			<Orientation y="0.78541"/>
 		</Entity>
 		<Entity uid="159">
-			<Template>units/pers/cavalry_javelineer_b</Template>
+			<Template>units/achae/cavalry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="470.99692" z="886.56391"/>
 			<Orientation y="-0.78541"/>
@@ -11232,42 +11232,42 @@
 			<Actor seed="54098"/>
 		</Entity>
 		<Entity uid="2182">
-			<Template>units/pers/hero_xerxes_i_chariot</Template>
+			<Template>units/achae/hero_xerxes_i_chariot</Template>
 			<Player>1</Player>
 			<Position x="502.18833" z="854.26935"/>
 			<Orientation y="-2.30327"/>
 			<Actor seed="55306"/>
 		</Entity>
 		<Entity uid="2186">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>0</Player>
 			<Position x="430.5318" z="836.68854"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24086"/>
 		</Entity>
 		<Entity uid="2187">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>0</Player>
 			<Position x="453.3827" z="813.30353"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5830"/>
 		</Entity>
 		<Entity uid="2188">
-			<Template>structures/pers/farmstead</Template>
+			<Template>structures/achae/farmstead</Template>
 			<Player>1</Player>
 			<Position x="403.7729" z="882.70069"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40098"/>
 		</Entity>
 		<Entity uid="2189">
-			<Template>structures/pers/market</Template>
+			<Template>structures/achae/market</Template>
 			<Player>1</Player>
 			<Position x="464.41733" z="850.11384"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57708"/>
 		</Entity>
 		<Entity uid="2190">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>1</Player>
 			<Position x="446.82486" z="894.69715"/>
 			<Orientation y="2.35621"/>
@@ -11337,273 +11337,273 @@
 			<Actor seed="170"/>
 		</Entity>
 		<Entity uid="2200">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="464.26978" z="901.75477"/>
 			<Orientation y="0.78542"/>
 			<Actor seed="158"/>
 		</Entity>
 		<Entity uid="2201">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="469.92664" z="896.09791"/>
 			<Orientation y="0.78542"/>
 			<Actor seed="157"/>
 		</Entity>
 		<Entity uid="2202">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="452.55738" z="913.37287"/>
 			<Orientation y="0.78542"/>
 			<Actor seed="158"/>
 		</Entity>
 		<Entity uid="2203">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="458.21424" z="907.71601"/>
 			<Orientation y="0.78542"/>
 			<Actor seed="157"/>
 		</Entity>
 		<Entity uid="2204">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="438.96369" z="917.9574"/>
 			<Orientation y="2.3653"/>
 			<Actor seed="154"/>
 		</Entity>
 		<Entity uid="2205">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="433.25565" z="912.35224"/>
 			<Orientation y="2.3653"/>
 			<Actor seed="153"/>
 		</Entity>
 		<Entity uid="2206">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="427.54764" z="906.74701"/>
 			<Orientation y="2.3653"/>
 			<Actor seed="152"/>
 		</Entity>
 		<Entity uid="2207">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="421.8396" z="901.14185"/>
 			<Orientation y="2.3653"/>
 			<Actor seed="151"/>
 		</Entity>
 		<Entity uid="2208">
-			<Template>structures/pers/barracks</Template>
+			<Template>structures/achae/barracks</Template>
 			<Player>1</Player>
 			<Position x="512.90247" z="826.51752"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31596"/>
 		</Entity>
 		<Entity uid="2209">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="500.41944" z="816.49341"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41828"/>
 		</Entity>
 		<Entity uid="2210">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="489.54249" z="806.5594"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58438"/>
 		</Entity>
 		<Entity uid="2211">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="525.37678" z="847.2074"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58696"/>
 		</Entity>
 		<Entity uid="2212">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="535.4007" z="837.58252"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60966"/>
 		</Entity>
 		<Entity uid="2213">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="543.95905" z="848.56171"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11064"/>
 		</Entity>
 		<Entity uid="2214">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="548.68012" z="828.64606"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36132"/>
 		</Entity>
 		<Entity uid="2215">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="544.89515" z="812.08558"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12500"/>
 		</Entity>
 		<Entity uid="2216">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="534.52295" z="802.23139"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="720"/>
 		</Entity>
 		<Entity uid="2217">
-			<Template>structures/pers/house_a</Template>
+			<Template>structures/achae/house_a</Template>
 			<Player>1</Player>
 			<Position x="560.03107" z="821.09583"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57168"/>
 		</Entity>
 		<Entity uid="2218">
-			<Template>structures/pers/inn</Template>
+			<Template>structures/achae/inn</Template>
 			<Player>1</Player>
 			<Position x="561.97846" z="845.62378"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27096"/>
 		</Entity>
 		<Entity uid="2219">
-			<Template>structures/pers/house_b</Template>
+			<Template>structures/achae/house_b</Template>
 			<Player>1</Player>
 			<Position x="520.02338" z="793.39008"/>
 			<Orientation y="-0.74247"/>
 			<Actor seed="53264"/>
 		</Entity>
 		<Entity uid="2220">
-			<Template>structures/pers/house_a</Template>
+			<Template>structures/achae/house_a</Template>
 			<Player>1</Player>
 			<Position x="476.83536" z="796.40082"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="65507"/>
 		</Entity>
 		<Entity uid="2221">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="490.72907" z="787.86994"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33212"/>
 		</Entity>
 		<Entity uid="2222">
-			<Template>structures/pers/forge</Template>
+			<Template>structures/achae/forge</Template>
 			<Player>1</Player>
 			<Position x="505.49479" z="776.6778"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28070"/>
 		</Entity>
 		<Entity uid="2223">
-			<Template>structures/pers/hall</Template>
+			<Template>structures/achae/hall</Template>
 			<Player>1</Player>
 			<Position x="515.86207" z="745.64307"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15752"/>
 		</Entity>
 		<Entity uid="2224">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="485.90766" z="744.10022"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39308"/>
 		</Entity>
 		<Entity uid="2225">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="473.6432" z="754.61078"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39780"/>
 		</Entity>
 		<Entity uid="2226">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="470.52585" z="775.17847"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34606"/>
 		</Entity>
 		<Entity uid="2227">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="460.86606" z="786.69965"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63158"/>
 		</Entity>
 		<Entity uid="2228">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="449.24393" z="776.26496"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31442"/>
 		</Entity>
 		<Entity uid="2229">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="530.3946" z="783.76764"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46140"/>
 		</Entity>
 		<Entity uid="2230">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="544.23328" z="792.95582"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32038"/>
 		</Entity>
 		<Entity uid="2231">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="437.58753" z="790.63337"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61396"/>
 		</Entity>
 		<Entity uid="2232">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="424.40857" z="802.07813"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10462"/>
 		</Entity>
 		<Entity uid="2233">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="415.97043" z="818.16755"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24164"/>
 		</Entity>
 		<Entity uid="2234">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="404.87122" z="829.60615"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57412"/>
 		</Entity>
 		<Entity uid="2235">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="551.72962" z="865.19068"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9780"/>
 		</Entity>
 		<Entity uid="2236">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="536.9676" z="881.00977"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="55568"/>
 		</Entity>
 		<Entity uid="2237">
-			<Template>structures/pers/storehouse</Template>
+			<Template>structures/achae/storehouse</Template>
 			<Player>1</Player>
 			<Position x="481.22477" z="929.16004"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2818"/>
 		</Entity>
 		<Entity uid="2238">
-			<Template>structures/pers/wall_gate</Template>
+			<Template>structures/achae/wall_gate</Template>
 			<Player>1</Player>
 			<Position x="540.84327" z="720.5741"/>
 			<Orientation y="5.54087"/>
@@ -11611,21 +11611,21 @@
 			<Actor seed="37588"/>
 		</Entity>
 		<Entity uid="2239">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="526.16224" z="705.87555"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63658"/>
 		</Entity>
 		<Entity uid="2240">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="556.26612" z="734.30774"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36512"/>
 		</Entity>
 		<Entity uid="2241">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="509.69312" z="691.78382"/>
 			<Orientation y="2.4607"/>
@@ -11633,14 +11633,14 @@
 			<Actor seed="57768"/>
 		</Entity>
 		<Entity uid="2242">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>0</Player>
 			<Position x="492.99808" z="678.44361"/>
 			<Orientation y="2.44794"/>
 			<Actor seed="43604"/>
 		</Entity>
 		<Entity uid="2243">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="571.01917" z="749.1172"/>
 			<Orientation y="2.35621"/>
@@ -11648,14 +11648,14 @@
 			<Actor seed="34346"/>
 		</Entity>
 		<Entity uid="2244">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="585.96937" z="763.80951"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43414"/>
 		</Entity>
 		<Entity uid="2245">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="597.54938" z="780.47992"/>
 			<Orientation y="2.16906"/>
@@ -11663,14 +11663,14 @@
 			<Actor seed="34346"/>
 		</Entity>
 		<Entity uid="2246">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="609.5047" z="797.6974"/>
 			<Orientation y="2.16906"/>
 			<Actor seed="43414"/>
 		</Entity>
 		<Entity uid="2247">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="616.26325" z="816.89289"/>
 			<Orientation y="1.873"/>
@@ -11678,14 +11678,14 @@
 			<Actor seed="34346"/>
 		</Entity>
 		<Entity uid="2248">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="622.675" z="836.8495"/>
 			<Orientation y="1.873"/>
 			<Actor seed="43414"/>
 		</Entity>
 		<Entity uid="2249">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="621.9643" z="857.43812"/>
 			<Orientation y="1.53162"/>
@@ -11693,42 +11693,42 @@
 			<Actor seed="28628"/>
 		</Entity>
 		<Entity uid="2250">
-			<Template>structures/pers/barracks</Template>
+			<Template>structures/achae/barracks</Template>
 			<Player>1</Player>
 			<Position x="507.86438" z="715.82837"/>
 			<Orientation y="1.26043"/>
 			<Actor seed="62212"/>
 		</Entity>
 		<Entity uid="2251">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="499.6507" z="732.25147"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24104"/>
 		</Entity>
 		<Entity uid="2252">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="484.53861" z="725.21741"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22288"/>
 		</Entity>
 		<Entity uid="2253">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="490.49991" z="710.10456"/>
 			<Orientation y="2.78264"/>
 			<Actor seed="51720"/>
 		</Entity>
 		<Entity uid="2254">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="468.2999" z="719.46454"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38258"/>
 		</Entity>
 		<Entity uid="2255">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="475.17737" z="676.52216"/>
 			<Orientation y="3.1219"/>
@@ -11736,14 +11736,14 @@
 			<Actor seed="57768"/>
 		</Entity>
 		<Entity uid="2256">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>0</Player>
 			<Position x="453.80896" z="676.24506"/>
 			<Orientation y="3.10914"/>
 			<Actor seed="43604"/>
 		</Entity>
 		<Entity uid="2257">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="434.75025" z="681.86994"/>
 			<Orientation y="3.51159"/>
@@ -11751,14 +11751,14 @@
 			<Actor seed="57768"/>
 		</Entity>
 		<Entity uid="2258">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>0</Player>
 			<Position x="414.87861" z="689.73145"/>
 			<Orientation y="3.49883"/>
 			<Actor seed="43604"/>
 		</Entity>
 		<Entity uid="2259">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="398.47477" z="702.05817"/>
 			<Orientation y="3.79947"/>
@@ -11766,7 +11766,7 @@
 			<Actor seed="57768"/>
 		</Entity>
 		<Entity uid="2260">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="381.65317" z="715.23841"/>
 			<Orientation y="3.78672"/>
@@ -13768,294 +13768,294 @@
 			<Actor seed="32624"/>
 		</Entity>
 		<Entity uid="2616">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="458.72797" z="863.68897"/>
 			<Orientation y="2.06174"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="2618">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="479.72315" z="843.31666"/>
 			<Orientation y="1.11573"/>
 			<Actor seed="15810"/>
 		</Entity>
 		<Entity uid="2619">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="472.61893" z="837.50635"/>
 			<Orientation y="2.58324"/>
 			<Actor seed="61260"/>
 		</Entity>
 		<Entity uid="2623">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="529.8827" z="832.11622"/>
 			<Orientation y="1.0954"/>
 			<Actor seed="434"/>
 		</Entity>
 		<Entity uid="2624">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="533.28693" z="829.51661"/>
 			<Orientation y="0.4503"/>
 			<Actor seed="53942"/>
 		</Entity>
 		<Entity uid="2626">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="500.4994" z="805.81562"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14714"/>
 		</Entity>
 		<Entity uid="2627">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="479.85801" z="787.7782"/>
 			<Orientation y="-3.04046"/>
 			<Actor seed="23034"/>
 		</Entity>
 		<Entity uid="2628">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="479.13865" z="785.95795"/>
 			<Orientation y="1.48609"/>
 			<Actor seed="23708"/>
 		</Entity>
 		<Entity uid="2630">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="481.12818" z="785.8896"/>
 			<Orientation y="-0.67304"/>
 			<Actor seed="44722"/>
 		</Entity>
 		<Entity uid="2631">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="518.2757" z="818.41785"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32514"/>
 		</Entity>
 		<Entity uid="2632">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="522.02222" z="821.77961"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10968"/>
 		</Entity>
 		<Entity uid="2633">
-			<Template>units/pers/infantry_javelineer_a</Template>
+			<Template>units/achae/infantry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="514.31379" z="824.99506"/>
 			<Orientation y="-2.2119"/>
 			<Actor seed="3730"/>
 		</Entity>
 		<Entity uid="2635">
-			<Template>units/pers/infantry_javelineer_a</Template>
+			<Template>units/achae/infantry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="514.3083" z="822.38465"/>
 			<Orientation y="-2.2251"/>
 			<Actor seed="47072"/>
 		</Entity>
 		<Entity uid="2646">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="517.28693" z="815.46528"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46970"/>
 		</Entity>
 		<Entity uid="2647">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="516.23188" z="814.07807"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17348"/>
 		</Entity>
 		<Entity uid="2648">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="515.2782" z="812.79334"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28198"/>
 		</Entity>
 		<Entity uid="2649">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="514.28998" z="811.42011"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21738"/>
 		</Entity>
 		<Entity uid="2650">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="513.19404" z="810.15754"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36024"/>
 		</Entity>
 		<Entity uid="2651">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="512.38331" z="809.09424"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18280"/>
 		</Entity>
 		<Entity uid="2658">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="500.19928" z="802.29383"/>
 			<Orientation y="1.96337"/>
 			<Actor seed="15900"/>
 		</Entity>
 		<Entity uid="2659">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="500.71296" z="800.0334"/>
 			<Orientation y="-0.37714"/>
 			<Actor seed="15054"/>
 		</Entity>
 		<Entity uid="2662">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="502.89905" z="801.58405"/>
 			<Orientation y="-1.78925"/>
 			<Actor seed="8982"/>
 		</Entity>
 		<Entity uid="2663">
-			<Template>units/pers/hero_cyrus_ii</Template>
+			<Template>units/achae/hero_cyrus_ii</Template>
 			<Player>1</Player>
 			<Position x="487.53135" z="764.43305"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18748"/>
 		</Entity>
 		<Entity uid="2664">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="481.81464" z="763.59058"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54934"/>
 		</Entity>
 		<Entity uid="2665">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="483.34513" z="765.07258"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54578"/>
 		</Entity>
 		<Entity uid="2666">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="486.4203" z="767.69532"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9434"/>
 		</Entity>
 		<Entity uid="2667">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="488.17246" z="769.46735"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25294"/>
 		</Entity>
 		<Entity uid="2668">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="489.94776" z="770.995"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29712"/>
 		</Entity>
 		<Entity uid="2669">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="479.98011" z="761.7444"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26956"/>
 		</Entity>
 		<Entity uid="2670">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="476.9784" z="766.21137"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61296"/>
 		</Entity>
 		<Entity uid="2671">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="479.32117" z="768.23316"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2270"/>
 		</Entity>
 		<Entity uid="2672">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="481.32911" z="769.84137"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41194"/>
 		</Entity>
 		<Entity uid="2673">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="482.79792" z="771.34314"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62498"/>
 		</Entity>
 		<Entity uid="2674">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="484.55158" z="773.16181"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53060"/>
 		</Entity>
 		<Entity uid="2675">
-			<Template>units/pers/cavalry_axeman_e_trireme</Template>
+			<Template>units/achae/cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="486.70212" z="775.2884"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51932"/>
 		</Entity>
 		<Entity uid="2694">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>1</Player>
 			<Position x="528.41364" z="737.05048"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33478"/>
 		</Entity>
 		<Entity uid="2695">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>1</Player>
 			<Position x="524.6067" z="733.45917"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12990"/>
 		</Entity>
 		<Entity uid="2696">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="535.32612" z="741.8567"/>
 			<Orientation y="-2.82958"/>
 			<Actor seed="6980"/>
 		</Entity>
 		<Entity uid="2697">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="538.01032" z="742.27948"/>
 			<Orientation y="-2.77645"/>
 			<Actor seed="53848"/>
 		</Entity>
 		<Entity uid="2698">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="540.6515" z="742.61799"/>
 			<Orientation y="-2.75406"/>
 			<Actor seed="33168"/>
 		</Entity>
 		<Entity uid="2701">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="543.23646" z="743.2574"/>
 			<Orientation y="-2.64477"/>
 			<Actor seed="23286"/>
 		</Entity>
 		<Entity uid="2702">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="545.93824" z="744.9502"/>
 			<Orientation y="-2.70696"/>
diff --git a/binaries/data/mods/public/maps/scenarios/demo_trading.xml b/binaries/data/mods/public/maps/scenarios/demo_trading.xml
index 9fd0b98335..b65bff5116 100644
--- a/binaries/data/mods/public/maps/scenarios/demo_trading.xml
+++ b/binaries/data/mods/public/maps/scenarios/demo_trading.xml
@@ -44,7 +44,7 @@
       "Team": 0
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 20,
         "g": 20,
@@ -94,13 +94,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>2</Player>
 			<Position x="744.82508" z="537.00538"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>structures/pers/market</Template>
+			<Template>structures/achae/market</Template>
 			<Player>2</Player>
 			<Position x="775.5876" z="506.4651"/>
 			<Orientation y="2.35621"/>
@@ -136,19 +136,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="26">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="339.16761" z="341.50831"/>
 			<Orientation y="1.10511"/>
 		</Entity>
 		<Entity uid="27">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="355.53483" z="361.31861"/>
 			<Orientation y="-2.13637"/>
 		</Entity>
 		<Entity uid="28">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="669.6482" z="210.24886"/>
 			<Orientation y="2.35621"/>
@@ -172,7 +172,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>structures/pers/dock</Template>
+			<Template>structures/achae/dock</Template>
 			<Player>2</Player>
 			<Position x="889.62293" z="494.06116"/>
 			<Orientation y="2.09946"/>
diff --git a/binaries/data/mods/public/maps/scenarios/fast_oasis.xml b/binaries/data/mods/public/maps/scenarios/fast_oasis.xml
index b5ce4489dd..476e9af1de 100644
--- a/binaries/data/mods/public/maps/scenarios/fast_oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/fast_oasis.xml
@@ -63,7 +63,7 @@
       "Team": -1
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 5,
         "g": 165,
@@ -6616,7 +6616,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8689">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>3</Player>
 			<Position x="112.22886" z="403.89072"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/fishing_demo.xml b/binaries/data/mods/public/maps/scenarios/fishing_demo.xml
index c7fcfc548b..64d4a5b28a 100644
--- a/binaries/data/mods/public/maps/scenarios/fishing_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/fishing_demo.xml
@@ -70,7 +70,7 @@
 			<Orientation y="2.65847"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>units/pers/ship_fishing</Template>
+			<Template>units/achae/ship_fishing</Template>
 			<Player>1</Player>
 			<Position x="192.14934" z="165.32908"/>
 			<Orientation y="2.11207"/>
diff --git a/binaries/data/mods/public/maps/scenarios/gorge.xml b/binaries/data/mods/public/maps/scenarios/gorge.xml
index d03b46f344..4efd8251e1 100644
--- a/binaries/data/mods/public/maps/scenarios/gorge.xml
+++ b/binaries/data/mods/public/maps/scenarios/gorge.xml
@@ -34,7 +34,7 @@
   "Name": "Gorge",
   "PlayerData": [
     {
-      "Civ": "pers"
+      "Civ": "achae"
     },
     {
       "Civ": "cart"
@@ -54,7 +54,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>1</Player>
 			<Position x="354.87638" z="830.6186"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/miletus.xml b/binaries/data/mods/public/maps/scenarios/miletus.xml
index d853b8f276..4c7a5e465f 100644
--- a/binaries/data/mods/public/maps/scenarios/miletus.xml
+++ b/binaries/data/mods/public/maps/scenarios/miletus.xml
@@ -5608,7 +5608,7 @@
 			<Orientation y="-2.5016"/>
 		</Entity>
 		<Entity uid="1282">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="731.64252" z="52.8734"/>
 			<Orientation y="-1.59856"/>
diff --git a/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml b/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
index c2f614942f..82da981053 100644
--- a/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
+++ b/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
@@ -48749,19 +48749,19 @@
 			<Actor seed="25416"/>
 		</Entity>
 		<Entity uid="11040">
-			<Template>actor|props/structures/persians/market_a_stall1.xml</Template>
+			<Template>actor|props/structures/achaemenids/market_a_stall1.xml</Template>
 			<Position x="1575.98194" z="1009.50165"/>
 			<Orientation y="1.236"/>
 			<Actor seed="21454"/>
 		</Entity>
 		<Entity uid="11041">
-			<Template>actor|props/structures/persians/market_a_stall2.xml</Template>
+			<Template>actor|props/structures/achaemenids/market_a_stall2.xml</Template>
 			<Position x="1567.74927" z="1010.19288"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26475"/>
 		</Entity>
 		<Entity uid="11042">
-			<Template>actor|props/structures/persians/market_a_stall3.xml</Template>
+			<Template>actor|props/structures/achaemenids/market_a_stall3.xml</Template>
 			<Position x="1568.63733" z="1015.59137"/>
 			<Orientation y="-3.1282"/>
 			<Actor seed="62781"/>
diff --git a/binaries/data/mods/public/maps/scenarios/road_demo.xml b/binaries/data/mods/public/maps/scenarios/road_demo.xml
index 08ecc21267..c65ffb1a85 100644
--- a/binaries/data/mods/public/maps/scenarios/road_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/road_demo.xml
@@ -454,7 +454,7 @@
 			<Orientation y="0.51355"/>
 		</Entity>
 		<Entity uid="116">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>1</Player>
 			<Position x="339.81162" z="395.43107"/>
 			<Orientation y="-2.06785"/>
@@ -520,13 +520,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="130">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>1</Player>
 			<Position x="235.01026" z="313.00052"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="131">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>1</Player>
 			<Position x="261.49714" z="287.48682"/>
 			<Orientation y="0.67197"/>
diff --git a/binaries/data/mods/public/maps/scenarios/saharan_oases.xml b/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
index 5d8355a81b..dc4e9adc60 100644
--- a/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
+++ b/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
@@ -62,7 +62,7 @@
       "Team": 0
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 20,
         "g": 20,
@@ -13522,25 +13522,25 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2703">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>2</Player>
 			<Position x="636.92768" z="228.12748"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2704">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>2</Player>
 			<Position x="644.37616" z="207.76775"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2705">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>2</Player>
 			<Position x="647.78138" z="211.27671"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2706">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>2</Player>
 			<Position x="651.38147" z="214.1368"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/sahel.xml b/binaries/data/mods/public/maps/scenarios/sahel.xml
index b5ccffd9ce..413188be84 100644
--- a/binaries/data/mods/public/maps/scenarios/sahel.xml
+++ b/binaries/data/mods/public/maps/scenarios/sahel.xml
@@ -77,7 +77,7 @@
       "Team": 1
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 5,
         "g": 165,
@@ -129,7 +129,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>3</Player>
 			<Position x="350.94834" z="907.67676"/>
 			<Orientation y="2.35621"/>
@@ -5633,63 +5633,63 @@
 			<Actor seed="26044"/>
 		</Entity>
 		<Entity uid="892">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="339.63398" z="886.48865"/>
 			<Orientation y="-2.15603"/>
 			<Actor seed="49886"/>
 		</Entity>
 		<Entity uid="893">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="333.70777" z="891.25593"/>
 			<Orientation y="-2.63059"/>
 			<Actor seed="43544"/>
 		</Entity>
 		<Entity uid="894">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="329.62403" z="894.84449"/>
 			<Orientation y="-2.41187"/>
 			<Actor seed="31174"/>
 		</Entity>
 		<Entity uid="895">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="325.20997" z="899.15723"/>
 			<Orientation y="-2.60616"/>
 			<Actor seed="18834"/>
 		</Entity>
 		<Entity uid="896">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="363.38984" z="886.89228"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54282"/>
 		</Entity>
 		<Entity uid="897">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="366.40378" z="889.88074"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64324"/>
 		</Entity>
 		<Entity uid="898">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>3</Player>
 			<Position x="371.88962" z="919.42573"/>
 			<Orientation y="0.85892"/>
 			<Actor seed="29392"/>
 		</Entity>
 		<Entity uid="899">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>3</Player>
 			<Position x="366.11182" z="925.85914"/>
 			<Orientation y="1.20652"/>
 			<Actor seed="19786"/>
 		</Entity>
 		<Entity uid="900">
-			<Template>units/pers/cavalry_javelineer_b</Template>
+			<Template>units/achae/cavalry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="327.32337" z="925.31977"/>
 			<Orientation y="-0.99422"/>
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_persians.pmp b/binaries/data/mods/public/maps/scenarios/sandbox_achaemenids.pmp
similarity index 100%
rename from binaries/data/mods/public/maps/scenarios/sandbox_persians.pmp
rename to binaries/data/mods/public/maps/scenarios/sandbox_achaemenids.pmp
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_achaemenids.xml
similarity index 74%
rename from binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
rename to binaries/data/mods/public/maps/scenarios/sandbox_achaemenids.xml
index f07cc6ce12..56a9379f94 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_achaemenids.xml
@@ -41,16 +41,15 @@
   "AISeed": 0,
   "AllyView": false,
   "CircularMap": true,
-  "Description": "A simple map showcasing the Persian civilization's assets in the game.",
+  "Description": "A simple map showcasing the achaemenid civilization's assets in the game.",
   "Keywords": [
     "demo"
   ],
   "LockTeams": false,
-  "Name": "Sandbox - The Achaemenid Persians",
+  "Name": "Sandbox - The Achaemenid achaemenids",
   "PlayerData": [
-    null,
     {
-      "Civ": "pers"
+      "Civ": "achae"
     }
   ],
   "Preview": "",
@@ -60,903 +59,903 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>units/pers/cavalry_archer_b</Template>
+			<Template>units/achae/cavalry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="295.74058" z="338.4274"/>
 			<Orientation y="0.26159"/>
 			<Actor seed="45217"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>units/pers/cavalry_archer_b</Template>
+			<Template>units/achae/cavalry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="298.55094" z="343.8451"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37638"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>units/pers/cavalry_archer_b</Template>
+			<Template>units/achae/cavalry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="301.77894" z="338.67908"/>
 			<Orientation y="-2.28737"/>
 			<Actor seed="60064"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>units/pers/cavalry_archer_a</Template>
+			<Template>units/achae/cavalry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="312.04514" z="343.66736"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8172"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>units/pers/cavalry_archer_a</Template>
+			<Template>units/achae/cavalry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="315.61722" z="338.3891"/>
 			<Orientation y="-2.20913"/>
 			<Actor seed="19467"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>units/pers/cavalry_archer_a</Template>
+			<Template>units/achae/cavalry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="308.98685" z="339.38187"/>
 			<Orientation y="0.34267"/>
 			<Actor seed="29327"/>
 		</Entity>
 		<Entity uid="17">
-			<Template>units/pers/cavalry_archer_e</Template>
+			<Template>units/achae/cavalry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="324.968" z="344.16407"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45606"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>units/pers/cavalry_archer_e</Template>
+			<Template>units/achae/cavalry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="330.99173" z="338.65961"/>
 			<Orientation y="-2.02205"/>
 			<Actor seed="4483"/>
 		</Entity>
 		<Entity uid="19">
-			<Template>units/pers/cavalry_archer_e</Template>
+			<Template>units/achae/cavalry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="322.42222" z="337.6006"/>
 			<Orientation y="0.41398"/>
 			<Actor seed="49301"/>
 		</Entity>
 		<Entity uid="20">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="301.51902" z="328.55662"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61214"/>
 		</Entity>
 		<Entity uid="21">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="304.87781" z="324.90677"/>
 			<Orientation y="-2.41124"/>
 			<Actor seed="64579"/>
 		</Entity>
 		<Entity uid="22">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="301.04194" z="324.60547"/>
 			<Orientation y="0.3553"/>
 			<Actor seed="60927"/>
 		</Entity>
 		<Entity uid="23">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="311.39603" z="328.58658"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38539"/>
 		</Entity>
 		<Entity uid="24">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="313.7703" z="325.90293"/>
 			<Orientation y="-2.43911"/>
 			<Actor seed="33837"/>
 		</Entity>
 		<Entity uid="25">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="310.77976" z="324.71396"/>
 			<Orientation y="0.49886"/>
 			<Actor seed="33027"/>
 		</Entity>
 		<Entity uid="26">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="323.18903" z="327.2913"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10144"/>
 		</Entity>
 		<Entity uid="27">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="326.29136" z="325.53544"/>
 			<Orientation y="-2.08474"/>
 			<Actor seed="2421"/>
 		</Entity>
 		<Entity uid="28">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="322.35987" z="324.09028"/>
 			<Orientation y="0.67188"/>
 			<Actor seed="11470"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="352.05912" z="327.21616"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12439"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="355.01996" z="325.25654"/>
 			<Orientation y="-2.31586"/>
 			<Actor seed="50677"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="351.89225" z="322.99643"/>
 			<Orientation y="0.20192"/>
 			<Actor seed="62553"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>units/pers/infantry_javelineer_a</Template>
+			<Template>units/achae/infantry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="365.20237" z="328.40473"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="7130"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>units/pers/infantry_javelineer_a</Template>
+			<Template>units/achae/infantry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="367.96122" z="325.9918"/>
 			<Orientation y="-2.10891"/>
 			<Actor seed="6374"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>units/pers/infantry_javelineer_a</Template>
+			<Template>units/achae/infantry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="364.69968" z="323.86921"/>
 			<Orientation y="0.16201"/>
 			<Actor seed="26087"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>units/pers/infantry_javelineer_e</Template>
+			<Template>units/achae/infantry_javelineer_e</Template>
 			<Player>1</Player>
 			<Position x="377.88392" z="328.82953"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29569"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>units/pers/infantry_javelineer_e</Template>
+			<Template>units/achae/infantry_javelineer_e</Template>
 			<Player>1</Player>
 			<Position x="380.6515" z="325.96732"/>
 			<Orientation y="-2.46122"/>
 			<Actor seed="16491"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>units/pers/infantry_javelineer_e</Template>
+			<Template>units/achae/infantry_javelineer_e</Template>
 			<Player>1</Player>
 			<Position x="377.18845" z="324.18503"/>
 			<Orientation y="0.5208"/>
 			<Actor seed="2494"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>units/pers/cavalry_javelineer_b</Template>
+			<Template>units/achae/cavalry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="352.65973" z="344.18128"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4350"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>units/pers/cavalry_javelineer_b</Template>
+			<Template>units/achae/cavalry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="355.6391" z="339.16398"/>
 			<Orientation y="-2.25884"/>
 			<Actor seed="5132"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>units/pers/cavalry_javelineer_b</Template>
+			<Template>units/achae/cavalry_javelineer_b</Template>
 			<Player>1</Player>
 			<Position x="350.1648" z="337.55057"/>
 			<Orientation y="0.59423"/>
 			<Actor seed="50034"/>
 		</Entity>
 		<Entity uid="42">
-			<Template>units/pers/cavalry_javelineer_a</Template>
+			<Template>units/achae/cavalry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="365.30262" z="343.94626"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21630"/>
 		</Entity>
 		<Entity uid="43">
-			<Template>units/pers/cavalry_javelineer_a</Template>
+			<Template>units/achae/cavalry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="369.62455" z="340.32444"/>
 			<Orientation y="-2.06962"/>
 			<Actor seed="20910"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>units/pers/cavalry_javelineer_a</Template>
+			<Template>units/achae/cavalry_javelineer_a</Template>
 			<Player>1</Player>
 			<Position x="363.45878" z="338.68204"/>
 			<Orientation y="0.89531"/>
 			<Actor seed="13143"/>
 		</Entity>
 		<Entity uid="45">
-			<Template>units/pers/cavalry_javelineer_e</Template>
+			<Template>units/achae/cavalry_javelineer_e</Template>
 			<Player>1</Player>
 			<Position x="378.69535" z="342.55802"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9354"/>
 		</Entity>
 		<Entity uid="46">
-			<Template>units/pers/cavalry_javelineer_e</Template>
+			<Template>units/achae/cavalry_javelineer_e</Template>
 			<Player>1</Player>
 			<Position x="382.87351" z="340.72416"/>
 			<Orientation y="-2.30271"/>
 			<Actor seed="21126"/>
 		</Entity>
 		<Entity uid="47">
-			<Template>units/pers/cavalry_javelineer_e</Template>
+			<Template>units/achae/cavalry_javelineer_e</Template>
 			<Player>1</Player>
 			<Position x="376.11078" z="338.55692"/>
 			<Orientation y="0.8776"/>
 			<Actor seed="48594"/>
 		</Entity>
 		<Entity uid="48">
-			<Template>units/pers/cavalry_spearman_b</Template>
+			<Template>units/achae/cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="402.46433" z="344.1525"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56053"/>
 		</Entity>
 		<Entity uid="49">
-			<Template>units/pers/cavalry_spearman_b</Template>
+			<Template>units/achae/cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.24143" z="341.64173"/>
 			<Orientation y="-2.24047"/>
 			<Actor seed="514"/>
 		</Entity>
 		<Entity uid="50">
-			<Template>units/pers/cavalry_spearman_b</Template>
+			<Template>units/achae/cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="401.55924" z="339.10013"/>
 			<Orientation y="0.74558"/>
 			<Actor seed="31409"/>
 		</Entity>
 		<Entity uid="51">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="417.06348" z="345.05195"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54925"/>
 		</Entity>
 		<Entity uid="52">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="421.40107" z="343.16688"/>
 			<Orientation y="-2.46677"/>
 			<Actor seed="38652"/>
 		</Entity>
 		<Entity uid="53">
-			<Template>units/pers/cavalry_spearman_a</Template>
+			<Template>units/achae/cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="415.33896" z="340.71897"/>
 			<Orientation y="0.75211"/>
 			<Actor seed="46025"/>
 		</Entity>
 		<Entity uid="54">
-			<Template>units/pers/cavalry_spearman_e</Template>
+			<Template>units/achae/cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="433.07792" z="345.18653"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27839"/>
 		</Entity>
 		<Entity uid="55">
-			<Template>units/pers/cavalry_spearman_e</Template>
+			<Template>units/achae/cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="437.42118" z="341.67908"/>
 			<Orientation y="-2.24173"/>
 			<Actor seed="38479"/>
 		</Entity>
 		<Entity uid="56">
-			<Template>units/pers/cavalry_spearman_e</Template>
+			<Template>units/achae/cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="430.74231" z="339.44062"/>
 			<Orientation y="0.60344"/>
 			<Actor seed="64236"/>
 		</Entity>
 		<Entity uid="57">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="402.05643" z="328.26282"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2642"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="404.60749" z="327.30347"/>
 			<Orientation y="-2.30468"/>
 			<Actor seed="6962"/>
 		</Entity>
 		<Entity uid="59">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="401.994" z="324.82947"/>
 			<Orientation y="0.61931"/>
 			<Actor seed="7232"/>
 		</Entity>
 		<Entity uid="60">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="416.91965" z="328.18769"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="6271"/>
 		</Entity>
 		<Entity uid="61">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="419.82184" z="325.96586"/>
 			<Orientation y="-2.39957"/>
 			<Actor seed="665"/>
 		</Entity>
 		<Entity uid="62">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="416.67838" z="324.37717"/>
 			<Orientation y="0.66437"/>
 			<Actor seed="55970"/>
 		</Entity>
 		<Entity uid="63">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="431.86368" z="328.71839"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3702"/>
 		</Entity>
 		<Entity uid="64">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="434.5571" z="326.03443"/>
 			<Orientation y="-2.25698"/>
 			<Actor seed="16990"/>
 		</Entity>
 		<Entity uid="65">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="431.32645" z="324.69935"/>
 			<Orientation y="0.5264"/>
 			<Actor seed="28160"/>
 		</Entity>
 		<Entity uid="66">
-			<Template>units/pers/cavalry_axeman_b</Template>
+			<Template>units/achae/cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="457.09165" z="346.63032"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36623"/>
 		</Entity>
 		<Entity uid="68">
-			<Template>units/pers/cavalry_axeman_b</Template>
+			<Template>units/achae/cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="455.3264" z="341.2992"/>
 			<Orientation y="0.32346"/>
 			<Actor seed="59493"/>
 		</Entity>
 		<Entity uid="69">
-			<Template>units/pers/cavalry_axeman_b</Template>
+			<Template>units/achae/cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="461.54477" z="341.96656"/>
 			<Orientation y="-2.07216"/>
 			<Actor seed="51956"/>
 		</Entity>
 		<Entity uid="70">
-			<Template>units/pers/cavalry_axeman_a</Template>
+			<Template>units/achae/cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="471.72904" z="345.56928"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="7265"/>
 		</Entity>
 		<Entity uid="71">
-			<Template>units/pers/cavalry_axeman_a</Template>
+			<Template>units/achae/cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="477.10605" z="344.28022"/>
 			<Orientation y="-2.30848"/>
 			<Actor seed="13457"/>
 		</Entity>
 		<Entity uid="72">
-			<Template>units/pers/cavalry_axeman_a</Template>
+			<Template>units/achae/cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="471.5228" z="340.05158"/>
 			<Orientation y="0.6999"/>
 			<Actor seed="38573"/>
 		</Entity>
 		<Entity uid="73">
-			<Template>units/pers/cavalry_axeman_e</Template>
+			<Template>units/achae/cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="486.88785" z="346.5922"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38477"/>
 		</Entity>
 		<Entity uid="74">
-			<Template>units/pers/cavalry_axeman_e</Template>
+			<Template>units/achae/cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="491.7154" z="344.26954"/>
 			<Orientation y="-2.394"/>
 			<Actor seed="43751"/>
 		</Entity>
 		<Entity uid="75">
-			<Template>units/pers/cavalry_axeman_e</Template>
+			<Template>units/achae/cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="484.5001" z="340.8783"/>
 			<Orientation y="0.95702"/>
 			<Actor seed="45926"/>
 		</Entity>
 		<Entity uid="76">
-			<Template>units/pers/arstibara</Template>
+			<Template>units/achae/arstibara</Template>
 			<Player>1</Player>
 			<Position x="509.84836" z="346.5849"/>
 			<Orientation y="-3.07128"/>
 			<Actor seed="19891"/>
 		</Entity>
 		<Entity uid="77">
-			<Template>units/pers/arstibara</Template>
+			<Template>units/achae/arstibara</Template>
 			<Player>1</Player>
 			<Position x="512.40912" z="345.3719"/>
 			<Orientation y="3.09797"/>
 			<Actor seed="36041"/>
 		</Entity>
 		<Entity uid="78">
-			<Template>units/pers/arstibara</Template>
+			<Template>units/achae/arstibara</Template>
 			<Player>1</Player>
 			<Position x="507.5518" z="344.03455"/>
 			<Orientation y="-3.90508"/>
 			<Actor seed="39095"/>
 		</Entity>
 		<Entity uid="79">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>1</Player>
 			<Position x="509.00657" z="331.30326"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23575"/>
 		</Entity>
 		<Entity uid="81">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>1</Player>
 			<Position x="508.67957" z="328.0811"/>
 			<Orientation y="0.39228"/>
 			<Actor seed="32609"/>
 		</Entity>
 		<Entity uid="82">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>1</Player>
 			<Position x="512.5829" z="328.5832"/>
 			<Orientation y="-2.06823"/>
 			<Actor seed="39855"/>
 		</Entity>
 		<Entity uid="83">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>1</Player>
 			<Position x="522.7718" z="345.36915"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58327"/>
 		</Entity>
 		<Entity uid="84">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>1</Player>
 			<Position x="528.1471" z="343.45365"/>
 			<Orientation y="-2.16367"/>
 			<Actor seed="31324"/>
 		</Entity>
 		<Entity uid="87">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>1</Player>
 			<Position x="521.79938" z="340.14603"/>
 			<Orientation y="0.71091"/>
 			<Actor seed="54966"/>
 		</Entity>
 		<Entity uid="88">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>1</Player>
 			<Position x="538.5824" z="346.03824"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45530"/>
 		</Entity>
 		<Entity uid="89">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>1</Player>
 			<Position x="543.88514" z="342.41691"/>
 			<Orientation y="-2.26645"/>
 			<Actor seed="22963"/>
 		</Entity>
 		<Entity uid="90">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>1</Player>
 			<Position x="536.9756" z="341.25657"/>
 			<Orientation y="0.8758"/>
 			<Actor seed="23973"/>
 		</Entity>
 		<Entity uid="92">
-			<Template>units/pers/champion_chariot</Template>
+			<Template>units/achae/champion_chariot</Template>
 			<Player>1</Player>
 			<Position x="526.1302" z="326.20875"/>
 			<Orientation y="2.19968"/>
 			<Actor seed="27438"/>
 		</Entity>
 		<Entity uid="93">
-			<Template>units/pers/champion_chariot</Template>
+			<Template>units/achae/champion_chariot</Template>
 			<Player>1</Player>
 			<Position x="538.17115" z="325.51282"/>
 			<Orientation y="-2.062"/>
 			<Actor seed="34147"/>
 		</Entity>
 		<Entity uid="95">
-			<Template>units/pers/champion_chariot</Template>
+			<Template>units/achae/champion_chariot</Template>
 			<Player>1</Player>
 			<Position x="531.97327" z="315.08933"/>
 			<Orientation y="-0.00527"/>
 			<Actor seed="20198"/>
 		</Entity>
 		<Entity uid="96">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>1</Player>
 			<Position x="468.33774" z="312.10773"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41840"/>
 		</Entity>
 		<Entity uid="97">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>1</Player>
 			<Position x="481.53977" z="313.36573"/>
 			<Orientation y="-2.08213"/>
 			<Actor seed="50314"/>
 		</Entity>
 		<Entity uid="98">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>1</Player>
 			<Position x="474.42817" z="300.99875"/>
 			<Orientation y="-0.03776"/>
 			<Actor seed="14396"/>
 		</Entity>
 		<Entity uid="99">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>1</Player>
 			<Position x="400.23264" z="312.30927"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15852"/>
 		</Entity>
 		<Entity uid="100">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>1</Player>
 			<Position x="403.12461" z="312.52063"/>
 			<Orientation y="-2.24151"/>
 			<Actor seed="4156"/>
 		</Entity>
 		<Entity uid="101">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>1</Player>
 			<Position x="400.94529" z="308.91617"/>
 			<Orientation y="0.33158"/>
 			<Actor seed="4156"/>
 		</Entity>
 		<Entity uid="102">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>1</Player>
 			<Position x="414.27683" z="312.52063"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58087"/>
 		</Entity>
 		<Entity uid="103">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>1</Player>
 			<Position x="417.35312" z="311.16822"/>
 			<Orientation y="-2.34865"/>
 			<Actor seed="29902"/>
 		</Entity>
 		<Entity uid="104">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>1</Player>
 			<Position x="414.1265" z="308.73826"/>
 			<Orientation y="0.2754"/>
 			<Actor seed="1470"/>
 		</Entity>
 		<Entity uid="105">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="430.90986" z="312.31281"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32727"/>
 		</Entity>
 		<Entity uid="106">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="433.55842" z="312.80054"/>
 			<Orientation y="-2.38338"/>
 			<Actor seed="9645"/>
 		</Entity>
 		<Entity uid="107">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>1</Player>
 			<Position x="431.92716" z="308.9758"/>
 			<Orientation y="0.23427"/>
 			<Actor seed="24797"/>
 		</Entity>
 		<Entity uid="108">
-			<Template>units/pers/support_healer_b</Template>
+			<Template>units/achae/support_healer_b</Template>
 			<Player>1</Player>
 			<Position x="448.22202" z="314.10157"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59549"/>
 		</Entity>
 		<Entity uid="109">
-			<Template>units/pers/support_healer_b</Template>
+			<Template>units/achae/support_healer_b</Template>
 			<Player>1</Player>
 			<Position x="451.94138" z="312.45115"/>
 			<Orientation y="-2.28278"/>
 			<Actor seed="46196"/>
 		</Entity>
 		<Entity uid="110">
-			<Template>units/pers/support_healer_b</Template>
+			<Template>units/achae/support_healer_b</Template>
 			<Player>1</Player>
 			<Position x="448.87223" z="309.15564"/>
 			<Orientation y="0.23501"/>
 			<Actor seed="24647"/>
 		</Entity>
 		<Entity uid="111">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="438.89786" z="300.46021"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45543"/>
 		</Entity>
 		<Entity uid="112">
-			<Template>units/pers/support_trader</Template>
+			<Template>units/achae/support_trader</Template>
 			<Player>1</Player>
 			<Position x="438.41611" z="293.47611"/>
 			<Orientation y="-0.7138"/>
 			<Actor seed="34903"/>
 		</Entity>
 		<Entity uid="113">
-			<Template>units/pers/hero_cyrus_ii</Template>
+			<Template>units/achae/hero_cyrus_ii</Template>
 			<Player>1</Player>
 			<Position x="501.20374" z="377.1566"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58066"/>
 		</Entity>
 		<Entity uid="114">
-			<Template>units/pers/hero_cyrus_ii</Template>
+			<Template>units/achae/hero_cyrus_ii</Template>
 			<Player>1</Player>
 			<Position x="507.19935" z="376.92148"/>
 			<Orientation y="-2.08855"/>
 			<Actor seed="16248"/>
 		</Entity>
 		<Entity uid="115">
-			<Template>units/pers/hero_cyrus_ii</Template>
+			<Template>units/achae/hero_cyrus_ii</Template>
 			<Player>1</Player>
 			<Position x="503.76944" z="371.32453"/>
 			<Orientation y="0.33611"/>
 			<Actor seed="41401"/>
 		</Entity>
 		<Entity uid="116">
-			<Template>units/pers/hero_darius_i</Template>
+			<Template>units/achae/hero_darius_i</Template>
 			<Player>1</Player>
 			<Position x="526.60828" z="376.42649"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18587"/>
 		</Entity>
 		<Entity uid="117">
-			<Template>units/pers/hero_xerxes_i</Template>
+			<Template>units/achae/hero_xerxes_i</Template>
 			<Player>1</Player>
 			<Position x="544.56757" z="378.50297"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50432"/>
 		</Entity>
 		<Entity uid="118">
-			<Template>units/pers/hero_xerxes_i</Template>
+			<Template>units/achae/hero_xerxes_i</Template>
 			<Player>1</Player>
 			<Position x="548.10035" z="376.19568"/>
 			<Orientation y="-2.16457"/>
 			<Actor seed="18996"/>
 		</Entity>
 		<Entity uid="119">
-			<Template>units/pers/hero_xerxes_i</Template>
+			<Template>units/achae/hero_xerxes_i</Template>
 			<Player>1</Player>
 			<Position x="544.0453" z="373.65366"/>
 			<Orientation y="-3.79125"/>
 			<Actor seed="57952"/>
 		</Entity>
 		<Entity uid="120">
-			<Template>units/pers/hero_xerxes_i_chariot</Template>
+			<Template>units/achae/hero_xerxes_i_chariot</Template>
 			<Player>1</Player>
 			<Position x="561.87415" z="385.95228"/>
 			<Orientation y="-3.48374"/>
 			<Actor seed="52672"/>
 		</Entity>
 		<Entity uid="121">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>1</Player>
 			<Position x="395.95163" z="529.87879"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10628"/>
 		</Entity>
 		<Entity uid="122">
-			<Template>structures/pers/tachara</Template>
+			<Template>structures/achae/tachara</Template>
 			<Player>1</Player>
 			<Position x="419.84968" z="556.26905"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26991"/>
 		</Entity>
 		<Entity uid="123">
-			<Template>structures/pers/barracks</Template>
+			<Template>structures/achae/barracks</Template>
 			<Player>1</Player>
 			<Position x="338.4224" z="452.5164"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17425"/>
 		</Entity>
 		<Entity uid="124">
-			<Template>structures/pers/range</Template>
+			<Template>structures/achae/range</Template>
 			<Player>1</Player>
 			<Position x="318.55655" z="432.90705"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16676"/>
 		</Entity>
 		<Entity uid="125">
-			<Template>structures/pers/stable</Template>
+			<Template>structures/achae/stable</Template>
 			<Player>1</Player>
 			<Position x="293.21848" z="464.20862"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53608"/>
 		</Entity>
 		<Entity uid="126">
-			<Template>structures/pers/tachara</Template>
+			<Template>structures/achae/tachara</Template>
 			<Player>1</Player>
 			<Position x="363.1981" z="563.04017"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42610"/>
 		</Entity>
 		<Entity uid="127">
-			<Template>structures/pers/sentry_tower</Template>
+			<Template>structures/achae/sentry_tower</Template>
 			<Player>1</Player>
 			<Position x="513.25776" z="507.27588"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42490"/>
 		</Entity>
 		<Entity uid="128">
-			<Template>structures/pers/defense_tower</Template>
+			<Template>structures/achae/defense_tower</Template>
 			<Player>1</Player>
 			<Position x="530.8755" z="503.44349"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57685"/>
 		</Entity>
 		<Entity uid="129">
-			<Template>structures/pers/outpost</Template>
+			<Template>structures/achae/outpost</Template>
 			<Player>1</Player>
 			<Position x="584.09308" z="497.98044"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36353"/>
 		</Entity>
 		<Entity uid="131">
-			<Template>structures/pers/storehouse</Template>
+			<Template>structures/achae/storehouse</Template>
 			<Player>1</Player>
 			<Position x="239.54426" z="556.97669"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12005"/>
 		</Entity>
 		<Entity uid="132">
-			<Template>structures/pers/farmstead</Template>
+			<Template>structures/achae/farmstead</Template>
 			<Player>1</Player>
 			<Position x="294.13474" z="532.65894"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35736"/>
 		</Entity>
 		<Entity uid="133">
-			<Template>structures/pers/forge</Template>
+			<Template>structures/achae/forge</Template>
 			<Player>1</Player>
 			<Position x="353.48374" z="505.95588"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13990"/>
 		</Entity>
 		<Entity uid="134">
-			<Template>structures/pers/fortress</Template>
+			<Template>structures/achae/fortress</Template>
 			<Player>1</Player>
 			<Position x="412.09473" z="447.2323"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41545"/>
 		</Entity>
 		<Entity uid="135">
-			<Template>structures/pers/hall</Template>
+			<Template>structures/achae/hall</Template>
 			<Player>1</Player>
 			<Position x="388.92872" z="592.16626"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9226"/>
 		</Entity>
 		<Entity uid="136">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="445.19025" z="616.31489"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14878"/>
 		</Entity>
 		<Entity uid="137">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="460.38697" z="603.29566"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49476"/>
 		</Entity>
 		<Entity uid="138">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="476.60969" z="618.30518"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56831"/>
 		</Entity>
 		<Entity uid="139">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>1</Player>
 			<Position x="458.90781" z="634.74415"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="971"/>
 		</Entity>
 		<Entity uid="140">
-			<Template>structures/pers/house_a</Template>
+			<Template>structures/achae/house_a</Template>
 			<Player>1</Player>
 			<Position x="495.206" z="582.22376"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61046"/>
 		</Entity>
 		<Entity uid="141">
-			<Template>structures/pers/house_b</Template>
+			<Template>structures/achae/house_b</Template>
 			<Player>1</Player>
 			<Position x="475.68046" z="566.02765"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21418"/>
 		</Entity>
 		<Entity uid="142">
-			<Template>structures/pers/inn</Template>
+			<Template>structures/achae/inn</Template>
 			<Player>1</Player>
 			<Position x="514.28199" z="557.18262"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42960"/>
 		</Entity>
 		<Entity uid="143">
-			<Template>structures/pers/tower_babylon</Template>
+			<Template>structures/achae/tower_babylon</Template>
 			<Player>1</Player>
 			<Position x="577.96058" z="532.15528"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9267"/>
 		</Entity>
 		<Entity uid="144">
-			<Template>structures/pers/wall_long</Template>
+			<Template>structures/achae/wall_long</Template>
 			<Player>1</Player>
 			<Position x="521.83796" z="463.93088"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15939"/>
 		</Entity>
 		<Entity uid="145">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="506.89924" z="449.02311"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34800"/>
 		</Entity>
 		<Entity uid="146">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="536.44098" z="478.34446"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17281"/>
 		</Entity>
 		<Entity uid="147">
-			<Template>structures/pers/wall_gate</Template>
+			<Template>structures/achae/wall_gate</Template>
 			<Player>1</Player>
 			<Position x="491.7621" z="433.40271"/>
 			<Orientation y="2.35621"/>
@@ -964,14 +963,14 @@
 			<Actor seed="43663"/>
 		</Entity>
 		<Entity uid="148">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="476.33399" z="418.86399"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52841"/>
 		</Entity>
 		<Entity uid="149">
-			<Template>structures/pers/wall_medium</Template>
+			<Template>structures/achae/wall_medium</Template>
 			<Player>1</Player>
 			<Position x="465.33655" z="408.07502"/>
 			<Orientation y="2.35621"/>
@@ -979,14 +978,14 @@
 			<Actor seed="63068"/>
 		</Entity>
 		<Entity uid="150">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="454.75626" z="397.69062"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46217"/>
 		</Entity>
 		<Entity uid="151">
-			<Template>structures/pers/wall_short</Template>
+			<Template>structures/achae/wall_short</Template>
 			<Player>1</Player>
 			<Position x="448.78614" z="391.05573"/>
 			<Orientation y="2.35621"/>
@@ -994,125 +993,125 @@
 			<Actor seed="15831"/>
 		</Entity>
 		<Entity uid="152">
-			<Template>structures/pers/wall_tower</Template>
+			<Template>structures/achae/wall_tower</Template>
 			<Player>1</Player>
 			<Position x="443.05536" z="385.18769"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8840"/>
 		</Entity>
 		<Entity uid="153">
-			<Template>structures/pers/market</Template>
+			<Template>structures/achae/market</Template>
 			<Player>1</Player>
 			<Position x="381.546" z="480.9286"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4504"/>
 		</Entity>
 		<Entity uid="154">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>1</Player>
 			<Position x="307.78098" z="548.77472"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5174"/>
 		</Entity>
 		<Entity uid="155">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>1</Player>
 			<Position x="306.40741" z="513.31641"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17262"/>
 		</Entity>
 		<Entity uid="156">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>1</Player>
 			<Position x="273.8448" z="522.22077"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49004"/>
 		</Entity>
 		<Entity uid="157">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>1</Player>
 			<Position x="285.22028" z="568.57209"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10708"/>
 		</Entity>
 		<Entity uid="158">
-			<Template>structures/pers/elephant_stable</Template>
+			<Template>structures/achae/elephant_stable</Template>
 			<Player>1</Player>
 			<Position x="374.14936" z="424.15751"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16623"/>
 		</Entity>
 		<Entity uid="159">
-			<Template>structures/pers/arsenal</Template>
+			<Template>structures/achae/arsenal</Template>
 			<Player>1</Player>
 			<Position x="450.02744" z="488.59327"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60554"/>
 		</Entity>
 		<Entity uid="160">
-			<Template>structures/pers/apartment_block</Template>
+			<Template>structures/achae/apartment_block</Template>
 			<Player>1</Player>
 			<Position x="512.52387" z="600.39631"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20845"/>
 		</Entity>
 		<Entity uid="161">
-			<Template>structures/pers/temple</Template>
+			<Template>structures/achae/temple</Template>
 			<Player>1</Player>
 			<Position x="477.06186" z="519.65552"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="6876"/>
 		</Entity>
 		<Entity uid="162">
-			<Template>structures/pers/wonder</Template>
+			<Template>structures/achae/wonder</Template>
 			<Player>1</Player>
 			<Position x="315.46698" z="627.95539"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48190"/>
 		</Entity>
 		<Entity uid="163">
-			<Template>units/pers/catafalque</Template>
+			<Template>units/achae/catafalque</Template>
 			<Player>1</Player>
 			<Position x="449.08777" z="537.87238"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37359"/>
 		</Entity>
 		<Entity uid="197">
-			<Template>actor|structures/persians/ballista_tower.xml</Template>
+			<Template>actor|structures/achaemenids/ballista_tower.xml</Template>
 			<Position x="629.7616" z="524.59656"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39372"/>
 		</Entity>
 		<Entity uid="198">
-			<Template>units/pers/siege_ram</Template>
+			<Template>units/achae/siege_ram</Template>
 			<Player>1</Player>
 			<Position x="633.16547" z="299.77796"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5974"/>
 		</Entity>
 		<Entity uid="199">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="682.72388" z="350.84943"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64743"/>
 		</Entity>
 		<Entity uid="200">
-			<Template>units/pers/ship_scout</Template>
+			<Template>units/achae/ship_scout</Template>
 			<Player>1</Player>
 			<Position x="704.8949" z="363.15967"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10756"/>
 		</Entity>
 		<Entity uid="201">
-			<Template>units/pers/ship_merchant</Template>
+			<Template>units/achae/ship_merchant</Template>
 			<Player>1</Player>
 			<Position x="660.4673" z="332.23752"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8407"/>
 		</Entity>
 		<Entity uid="202">
-			<Template>units/pers/ship_fishing</Template>
+			<Template>units/achae/ship_fishing</Template>
 			<Player>1</Player>
 			<Position x="644.47608" z="316.61185"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
index 58e707902b..851420f96a 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
@@ -75,13 +75,13 @@
     },
     {
       "AI": "",
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 147,
         "g": 40,
         "r": 99
       },
-      "Name": "The Persians",
+      "Name": "The achaemenids",
       "Team": -1
     },
     {
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
index 7c0d13296a..181228509e 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
@@ -1367,31 +1367,31 @@
 			<Orientation y="-2.87711"/>
 		</Entity>
 		<Entity uid="285">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>2</Player>
 			<Position x="644.1316" z="466.40235"/>
 			<Orientation y="-2.17167"/>
 		</Entity>
 		<Entity uid="286">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>2</Player>
 			<Position x="630.41773" z="485.40418"/>
 			<Orientation y="-2.28068"/>
 		</Entity>
 		<Entity uid="287">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>2</Player>
 			<Position x="640.14563" z="472.33365"/>
 			<Orientation y="-2.25867"/>
 		</Entity>
 		<Entity uid="288">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>2</Player>
 			<Position x="636.60694" z="476.21637"/>
 			<Orientation y="-2.37955"/>
 		</Entity>
 		<Entity uid="289">
-			<Template>units/pers/champion_elephant</Template>
+			<Template>units/achae/champion_elephant</Template>
 			<Player>2</Player>
 			<Position x="633.54847" z="480.69922"/>
 			<Orientation y="-2.3435"/>
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
index d6a4fb3319..fef4ece4ce 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -75,13 +75,13 @@
     },
     {
       "AI": "",
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 147,
         "g": 40,
         "r": 99
       },
-      "Name": "The Persians",
+      "Name": "The Achaemenid achaemenids",
       "Team": -1
     },
     {
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
index 2a9deb2ce0..f3d4971e3b 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
@@ -8442,14 +8442,14 @@
 			<Actor seed="39950"/>
 		</Entity>
 		<Entity uid="1401">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="642.06684" z="449.28684"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21882"/>
 		</Entity>
 		<Entity uid="1402">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="147.89106" z="438.21833"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/serengeti.xml b/binaries/data/mods/public/maps/scenarios/serengeti.xml
index 4410d8950d..fae0c1fda2 100644
--- a/binaries/data/mods/public/maps/scenarios/serengeti.xml
+++ b/binaries/data/mods/public/maps/scenarios/serengeti.xml
@@ -59,7 +59,7 @@
       "Team": 1
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 159,
         "g": 26,
@@ -15288,67 +15288,67 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3148">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>4</Player>
 			<Position x="612.10615" z="593.81458"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3149">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="617.66907" z="574.99866"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3150">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="620.284" z="577.17762"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3151">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="621.8957" z="578.92194"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3152">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="623.3379" z="580.20899"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3153">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="624.83198" z="582.1692"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3154">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="627.02607" z="585.00892"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3155">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>4</Player>
 			<Position x="621.28498" z="569.59858"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3156">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>4</Player>
 			<Position x="624.92774" z="572.71393"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3158">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>4</Player>
 			<Position x="628.46515" z="577.65046"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3159">
-			<Template>units/pers/cavalry_axeman_b</Template>
+			<Template>units/achae/cavalry_axeman_b</Template>
 			<Player>4</Player>
 			<Position x="631.8053" z="580.53321"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/ship_combat_demo.xml b/binaries/data/mods/public/maps/scenarios/ship_combat_demo.xml
index de9942f3e4..3b535b6123 100644
--- a/binaries/data/mods/public/maps/scenarios/ship_combat_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/ship_combat_demo.xml
@@ -57,7 +57,7 @@
       "PopulationLimit": 500
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 0,
         "g": 0,
@@ -117,28 +117,28 @@
 			<Actor seed="40249"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="340.26764" z="230.24787"/>
 			<Orientation y="-0.76932"/>
 			<Actor seed="17214"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="397.6215" z="276.76282"/>
 			<Orientation y="-0.81254"/>
 			<Actor seed="17214"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="365.02887" z="249.67411"/>
 			<Orientation y="-0.86615"/>
 			<Actor seed="28008"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="320.37757" z="217.74009"/>
 			<Orientation y="-0.62998"/>
@@ -614,7 +614,7 @@
 			<Actor seed="61785"/>
 		</Entity>
 		<Entity uid="102">
-			<Template>structures/pers/dock</Template>
+			<Template>structures/achae/dock</Template>
 			<Player>1</Player>
 			<Position x="347.8896" z="1281.41553"/>
 			<Orientation y="2.35621"/>
@@ -712,7 +712,7 @@
 			<Actor seed="54530"/>
 		</Entity>
 		<Entity uid="118">
-			<Template>units/pers/ship_scout</Template>
+			<Template>units/achae/ship_scout</Template>
 			<Player>1</Player>
 			<Position x="304.8335" z="857.66761"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/ship_formations.xml b/binaries/data/mods/public/maps/scenarios/ship_formations.xml
index 124b06983f..f95a5cfebc 100644
--- a/binaries/data/mods/public/maps/scenarios/ship_formations.xml
+++ b/binaries/data/mods/public/maps/scenarios/ship_formations.xml
@@ -63,181 +63,181 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="271.95566" z="327.79468"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="293.00943" z="349.03132"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="314.04102" z="369.33704"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="335.98432" z="393.24796"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="362.52085" z="420.14081"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="313.49494" z="304.3263"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="17">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="333.98462" z="326.7324"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="353.82715" z="349.65336"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="19">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="379.97281" z="373.04343"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="20">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="291.22855" z="283.54139"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="21">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="513.01471" z="442.01395"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="22">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="530.55652" z="459.99189"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="23">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="547.27021" z="407.9527"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="24">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="563.86396" z="427.6259"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="25">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="596.71515" z="395.37772"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="26">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="581.03992" z="375.95911"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="27">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="479.24286" z="476.5854"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="28">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="497.57087" z="492.66825"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="446.52063" z="508.76032"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="462.48005" z="528.25434"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="720.97034" z="502.49555"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="740.04017" z="521.47053"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="759.8028" z="541.4452"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="779.16718" z="559.8069"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="687.7115" z="535.09101"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="655.26948" z="570.69367"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="675.51417" z="589.75568"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="694.04957" z="608.98224"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="712.82575" z="625.17707"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="745.81006" z="591.20356"/>
 			<Orientation y="2.35621"/>
@@ -249,61 +249,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="42">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="332.76691" z="557.53803"/>
 			<Orientation y="1.89394"/>
 		</Entity>
 		<Entity uid="43">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="260.8646" z="606.3523"/>
 			<Orientation y="-0.61513"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="245.16663" z="553.99286"/>
 			<Orientation y="-1.90088"/>
 		</Entity>
 		<Entity uid="45">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="263.67154" z="531.79548"/>
 			<Orientation y="-2.5633"/>
 		</Entity>
 		<Entity uid="46">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="314.07786" z="607.52338"/>
 			<Orientation y="0.57816"/>
 		</Entity>
 		<Entity uid="47">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="287.35224" z="615.78418"/>
 			<Orientation y="-0.05382"/>
 		</Entity>
 		<Entity uid="48">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="290.3892" z="523.38465"/>
 			<Orientation y="3.10311"/>
 		</Entity>
 		<Entity uid="49">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="330.02259" z="585.71711"/>
 			<Orientation y="1.2334"/>
 		</Entity>
 		<Entity uid="50">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="246.06211" z="584.46082"/>
 			<Orientation y="-1.2563"/>
 		</Entity>
 		<Entity uid="51">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="317.11942" z="533.28266"/>
 			<Orientation y="2.49235"/>
diff --git a/binaries/data/mods/public/maps/scenarios/shipattacks.xml b/binaries/data/mods/public/maps/scenarios/shipattacks.xml
index fec7e63002..33b376bbb9 100644
--- a/binaries/data/mods/public/maps/scenarios/shipattacks.xml
+++ b/binaries/data/mods/public/maps/scenarios/shipattacks.xml
@@ -49,7 +49,7 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>1</Player>
 			<Position x="654.27369" z="217.47564"/>
 			<Orientation y="0.01796"/>
@@ -127,13 +127,13 @@
 			<Orientation y="-3.06238"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="358.91327" z="587.59266"/>
 			<Orientation y="3.10068"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="496.75922" z="576.06684"/>
 			<Orientation y="3.084"/>
@@ -157,7 +157,7 @@
 			<Orientation y="-0.04952"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>units/pers/ship_scout</Template>
+			<Template>units/achae/ship_scout</Template>
 			<Player>1</Player>
 			<Position x="623.9704" z="218.14034"/>
 			<Orientation y="-0.0106"/>
@@ -175,7 +175,7 @@
 			<Orientation y="-0.09922"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>units/pers/ship_fishing</Template>
+			<Template>units/achae/ship_fishing</Template>
 			<Player>1</Player>
 			<Position x="600.52717" z="228.30991"/>
 			<Orientation y="0.01967"/>
diff --git a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
index 7c0673c8dc..38513f0c14 100644
--- a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
@@ -65,7 +65,7 @@
       "Team": -1
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 128,
         "g": 128,
@@ -14930,121 +14930,121 @@
 			<Orientation y="-0.5355"/>
 		</Entity>
 		<Entity uid="2905">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>3</Player>
 			<Position x="218.57139" z="510.7439"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2906">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>3</Player>
 			<Position x="198.39377" z="525.92273"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2907">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>3</Player>
 			<Position x="200.9546" z="529.68628"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2908">
-			<Template>units/pers/infantry_archer_a</Template>
+			<Template>units/achae/infantry_archer_a</Template>
 			<Player>3</Player>
 			<Position x="195.4155" z="522.00013"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2909">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>3</Player>
 			<Position x="191.5304" z="526.46302"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2910">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>3</Player>
 			<Position x="194.00766" z="530.16285"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2911">
-			<Template>units/pers/infantry_archer_e</Template>
+			<Template>units/achae/infantry_archer_e</Template>
 			<Player>3</Player>
 			<Position x="197.0582" z="534.4115"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2912">
-			<Template>units/pers/cavalry_axeman_b</Template>
+			<Template>units/achae/cavalry_axeman_b</Template>
 			<Player>3</Player>
 			<Position x="219.02482" z="475.45804"/>
 			<Orientation y="-2.35103"/>
 		</Entity>
 		<Entity uid="2913">
-			<Template>units/pers/cavalry_axeman_a</Template>
+			<Template>units/achae/cavalry_axeman_a</Template>
 			<Player>3</Player>
 			<Position x="215.29712" z="478.74363"/>
 			<Orientation y="-2.46537"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>units/pers/cavalry_axeman_e</Template>
+			<Template>units/achae/cavalry_axeman_e</Template>
 			<Player>3</Player>
 			<Position x="212.28721" z="482.2183"/>
 			<Orientation y="-2.36059"/>
 		</Entity>
 		<Entity uid="2915">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="238.59653" z="481.4318"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2916">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="241.45926" z="485.71164"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2917">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="244.42157" z="488.5206"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2918">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="241.8108" z="491.34623"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2919">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="238.87775" z="488.08005"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2920">
-			<Template>units/pers/infantry_spearman_e</Template>
+			<Template>units/achae/infantry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="236.4917" z="485.0813"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2922">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="232.45408" z="490.08735"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2923">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="235.40638" z="492.63041"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2924">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>3</Player>
 			<Position x="238.47437" z="496.39255"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2925">
-			<Template>units/pers/cavalry_javelineer_e</Template>
+			<Template>units/achae/cavalry_javelineer_e</Template>
 			<Player>3</Player>
 			<Position x="209.10447" z="486.65067"/>
 			<Orientation y="-2.3357"/>
diff --git a/binaries/data/mods/public/maps/scenarios/test_foundation.xml b/binaries/data/mods/public/maps/scenarios/test_foundation.xml
index afeef005c4..4ff64fe601 100644
--- a/binaries/data/mods/public/maps/scenarios/test_foundation.xml
+++ b/binaries/data/mods/public/maps/scenarios/test_foundation.xml
@@ -64,7 +64,7 @@
       "Civ": "mace"
     },
     {
-      "Civ": "pers"
+      "Civ": "achae"
     },
     {
       "Civ": "rome"
diff --git a/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml b/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
index 7647ef6229..9a46fa3821 100644
--- a/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
+++ b/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
@@ -54,7 +54,7 @@
       "Team": 0
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 128,
         "g": 128,
@@ -64,13 +64,13 @@
       "Team": 1
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 147,
         "g": 40,
         "r": 99
       },
-      "Name": "Persians",
+      "Name": "achaemenids",
       "Team": 1
     }
   ],
@@ -83,13 +83,13 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="125">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>3</Player>
 			<Position x="1213.8069" z="884.74054"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="126">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>4</Player>
 			<Position x="1220.26026" z="624.84003"/>
 			<Orientation y="2.35621"/>
@@ -305,13 +305,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="246">
-			<Template>structures/pers/outpost</Template>
+			<Template>structures/achae/outpost</Template>
 			<Player>3</Player>
 			<Position x="797.8346" z="846.00818"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="247">
-			<Template>structures/pers/outpost</Template>
+			<Template>structures/achae/outpost</Template>
 			<Player>4</Player>
 			<Position x="775.00403" z="393.36677"/>
 			<Orientation y="2.35621"/>
@@ -6281,163 +6281,163 @@
 			<Orientation y="2.98491"/>
 		</Entity>
 		<Entity uid="1243">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1224.57581" z="861.45704"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1244">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1226.59266" z="864.32673"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1245">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1229.1167" z="866.96277"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1246">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1231.54261" z="869.2743"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1247">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1234.64307" z="872.45533"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1248">
-			<Template>units/pers/infantry_archer_b</Template>
+			<Template>units/achae/infantry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1237.2798" z="875.16541"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1249">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1230.90857" z="599.86304"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1250">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1234.33436" z="602.97925"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1251">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1236.98694" z="606.4109"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1252">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1239.9253" z="608.49836"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1253">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1242.91871" z="610.83869"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1254">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1245.88135" z="613.74244"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1255">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1235.72889" z="595.65455"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1256">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1239.22876" z="598.47205"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1257">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1240.96473" z="600.53644"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1258">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1243.36182" z="602.55549"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1259">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1246.14905" z="604.80433"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1260">
-			<Template>units/pers/champion_cavalry</Template>
+			<Template>units/achae/champion_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1249.03077" z="607.91645"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1261">
-			<Template>units/pers/cavalry_archer_b</Template>
+			<Template>units/achae/cavalry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1234.49842" z="855.36536"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1262">
-			<Template>units/pers/cavalry_archer_b</Template>
+			<Template>units/achae/cavalry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1240.68091" z="861.6236"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1263">
-			<Template>units/pers/cavalry_archer_b</Template>
+			<Template>units/achae/cavalry_archer_b</Template>
 			<Player>3</Player>
 			<Position x="1246.40638" z="867.59614"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1264">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="1221.98865" z="864.34736"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1265">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="1223.86902" z="866.64551"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1266">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="1225.6985" z="868.82044"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1267">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="1228.69678" z="872.1385"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1268">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="1232.6532" z="875.10438"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1269">
-			<Template>units/pers/infantry_javelineer_b</Template>
+			<Template>units/achae/infantry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="1235.26636" z="878.42725"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/treasure_islands.xml b/binaries/data/mods/public/maps/scenarios/treasure_islands.xml
index 3b94ae9d4f..c890718bdc 100644
--- a/binaries/data/mods/public/maps/scenarios/treasure_islands.xml
+++ b/binaries/data/mods/public/maps/scenarios/treasure_islands.xml
@@ -15591,14 +15591,14 @@
 			<Actor seed="2420"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="247.33747" z="474.63874"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8527"/>
 		</Entity>
 		<Entity uid="2915">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="1104.74573" z="860.54712"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/scenarios/tropical_island.xml b/binaries/data/mods/public/maps/scenarios/tropical_island.xml
index 9612f22109..943dc7b76a 100644
--- a/binaries/data/mods/public/maps/scenarios/tropical_island.xml
+++ b/binaries/data/mods/public/maps/scenarios/tropical_island.xml
@@ -1797,31 +1797,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="502">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="472.93317" z="732.224"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="503">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>2</Player>
 			<Position x="448.75525" z="697.01636"/>
 			<Orientation y="3.06269"/>
 		</Entity>
 		<Entity uid="504">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>2</Player>
 			<Position x="610.40888" z="352.73621"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="505">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>2</Player>
 			<Position x="614.99683" z="344.09598"/>
 			<Orientation y="-2.7891"/>
 		</Entity>
 		<Entity uid="506">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>2</Player>
 			<Position x="609.98493" z="343.63776"/>
 			<Orientation y="0.53388"/>
diff --git a/binaries/data/mods/public/maps/scenarios/vertex_pathfinder_test.xml b/binaries/data/mods/public/maps/scenarios/vertex_pathfinder_test.xml
index 4845b341ef..7f390cb175 100644
--- a/binaries/data/mods/public/maps/scenarios/vertex_pathfinder_test.xml
+++ b/binaries/data/mods/public/maps/scenarios/vertex_pathfinder_test.xml
@@ -215,700 +215,700 @@
 			<Actor seed="3142"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="398.00364" z="73.99463"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="398.64826" z="74.06601"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="399.83002" z="74.19687"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="402.98902" z="74.34237"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="401.80726" z="74.21151"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="401.16263" z="74.14013"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.05796" z="73.33817"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.68018" z="73.15514"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="41">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="408.82084" z="72.8196"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="42">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="405.8506" z="73.90499"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="43">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="404.70994" z="74.24053"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="404.08771" z="74.42356"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="45">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="412.86979" z="71.1251"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="46">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="413.49201" z="70.94207"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="47">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="414.63266" z="70.60653"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="48">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="411.66242" z="71.69191"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="49">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="410.52176" z="72.02746"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="50">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="409.89954" z="72.21048"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="51">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.74216" z="69.02385"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="52">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="419.36438" z="68.84083"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="53">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="420.50504" z="68.50528"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="54">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.5348" z="69.59066"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="55">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.39414" z="69.92621"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="56">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.77192" z="70.10923"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="57">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="424.61411" z="66.89226"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="425.23633" z="66.70925"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="59">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.37699" z="66.3737"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="60">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="423.40674" z="67.45908"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="61">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="422.26609" z="67.79462"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="62">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="421.64386" z="67.97765"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="63">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.60645" z="61.95298"/>
 			<Orientation y="-2.57029"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="64">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.81321" z="61.33823"/>
 			<Orientation y="-2.57029"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="65">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="428.19217" z="60.21126"/>
 			<Orientation y="-2.57029"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="66">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.37876" z="63.2672"/>
 			<Orientation y="-2.57029"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="67">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.99976" z="64.39415"/>
 			<Orientation y="-2.57029"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="68">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.79303" z="65.00892"/>
 			<Orientation y="-2.57029"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="69">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.65018" z="55.52138"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="70">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.85694" z="54.90662"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="71">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="430.23591" z="53.77965"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="72">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.4225" z="56.8356"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="73">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.0435" z="57.96254"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="74">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="428.83677" z="58.57732"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="75">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="431.679" z="49.74302"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="76">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="431.88575" z="49.12826"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="77">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="432.26471" z="48.00129"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="78">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="431.4513" z="51.05724"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="79">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="431.0723" z="52.18418"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="80">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="430.86558" z="52.79896"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="81">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="433.49091" z="43.51879"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="82">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="433.69767" z="42.90403"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="83">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="434.07663" z="41.77706"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="84">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="433.26322" z="44.833"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="85">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="432.88422" z="45.95995"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="86">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="432.6775" z="46.57473"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="87">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="394.04224" z="72.24126"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="88">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="393.49628" z="71.8911"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="89">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="392.49543" z="71.24923"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="90">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="395.26151" z="72.78197"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="91">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="396.2623" z="73.42386"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="92">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="396.8083" z="73.77401"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="93">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="388.75672" z="68.45496"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="94">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="388.21076" z="68.1048"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="95">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="387.2099" z="67.46294"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="96">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="389.97599" z="68.99567"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="97">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="390.97678" z="69.63756"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="98">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="391.52277" z="69.98772"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="99">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="385.8613" z="52.14199"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="100">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="385.31531" z="51.79183"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="101">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="384.31452" z="51.14994"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="102">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="381.54844" z="49.61721"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="103">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="382.5493" z="50.25907"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="104">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="383.09525" z="50.60924"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="105">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="391.14683" z="55.92829"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="106">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="390.60084" z="55.57813"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="107">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="389.60004" z="54.93624"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="108">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="386.83396" z="53.40351"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="109">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="387.83481" z="54.04537"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="110">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="388.38077" z="54.39553"/>
 			<Orientation y="-7.52855"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="111">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="410.11045" z="52.26351"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="112">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="410.73267" z="52.08048"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="113">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="411.87333" z="51.74494"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="114">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="413.0807" z="51.17812"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="115">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="404.23807" z="54.36475"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="116">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="404.8603" z="54.18174"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="117">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="406.00095" z="53.84618"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="118">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="408.9712" z="52.76081"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="119">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.83054" z="53.09635"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="120">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.20832" z="53.27938"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="121">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="398.42624" z="56.57784"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="122">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="399.04847" z="56.39481"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="123">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="400.18912" z="56.05927"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="124">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="403.15937" z="54.97388"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="125">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="402.01871" z="55.30942"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="126">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="401.39649" z="55.49245"/>
 			<Orientation y="2.7526"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="127">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="395.50116" z="56.29441"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="128">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="396.14579" z="56.36579"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="129">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="397.32755" z="56.49665"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="130">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="394.16855" z="56.35114"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="131">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="392.9868" z="56.22028"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="132">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="392.34217" z="56.1489"/>
 			<Orientation y="2.35622"/>
@@ -922,672 +922,672 @@
 			<Actor seed="8054"/>
 		</Entity>
 		<Entity uid="166">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="406.87244" z="92.21702"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="167">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.07917" z="91.60222"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="168">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.45817" z="90.47529"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="169">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="408.27158" z="87.41935"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="170">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.89261" z="88.54632"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="171">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.68586" z="89.16108"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="172">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="405.06052" z="98.44124"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="173">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="405.26725" z="97.82647"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="174">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="405.64625" z="96.69951"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="175">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="406.45966" z="93.64357"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="176">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="406.0807" z="94.77054"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="177">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="405.87394" z="95.3853"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="178">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.099" z="93.15816"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="179">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.30573" z="92.54336"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="180">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.68473" z="91.41643"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="181">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.49814" z="88.3605"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="182">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.11918" z="89.48746"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="183">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.91242" z="90.10222"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="184">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.28708" z="99.38237"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="185">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.49381" z="98.76761"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="186">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.87281" z="97.64065"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="187">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.68622" z="94.58471"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="188">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.30726" z="95.71167"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="189">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.1005" z="96.32644"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="190">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="412.43812" z="87.02611"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="191">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="411.7923" z="86.96593"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="192">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="410.60846" z="86.85557"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="193">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.44745" z="86.7649"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="194">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="408.6313" z="86.87522"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="195">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="409.27707" z="86.93545"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="196">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.912" z="87.36185"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="197">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.26621" z="87.30167"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="198">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.08237" z="87.1913"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="199">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="413.92133" z="87.10062"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="200">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.10517" z="87.21096"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="201">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.75098" z="87.27117"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="202">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="409.51587" z="100.14953"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="203">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="408.87006" z="100.08935"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="204">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="407.68622" z="99.979"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="205">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="404.52521" z="99.88833"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="206">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="405.70905" z="99.99865"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="406.35483" z="100.05887"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.98975" z="100.48527"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.34397" z="100.42508"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="210">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="414.16013" z="100.31472"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="211">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="410.99909" z="100.22403"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="212">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="412.18293" z="100.33439"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="213">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="412.82874" z="100.3946"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="214">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.67551" z="39.00174"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="215">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.02973" z="38.94153"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="216">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="415.8459" z="38.83121"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="217">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="424.35535" z="38.95762"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="218">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="420.19074" z="39.03223"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="219">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="420.83655" z="39.09241"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="220">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.07166" z="26.21406"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="221">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.42585" z="26.15384"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="222">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="425.24201" z="26.0435"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="223">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="428.40305" z="26.13418"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="224">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.58689" z="26.24454"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="225">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="430.23267" z="26.30472"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="420.59775" z="25.87833"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="419.95197" z="25.8181"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="228">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.76813" z="25.70778"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="229">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="421.92914" z="25.79845"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="230">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="423.11298" z="25.9088"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="231">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="423.7588" z="25.96898"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="232">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.42118" z="35.26932"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="233">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.62793" z="34.65455"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="234">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="428.0069" z="33.5276"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="235">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.19349" z="36.58353"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="236">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.81449" z="37.71048"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="237">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.60776" z="38.32525"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="238">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.2331" z="29.0451"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="239">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.43985" z="28.43033"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="240">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.81882" z="27.30338"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="241">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="429.00541" z="30.3593"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="428.62641" z="31.48624"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="428.41968" z="32.10103"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="244">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.19462" z="34.32818"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.40137" z="33.71341"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="246">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="417.78034" z="32.58645"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="247">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.96692" z="35.64238"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="248">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.58793" z="36.76935"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="249">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="416.3812" z="37.38411"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="250">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="419.00654" z="28.10396"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="251">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="419.2133" z="27.4892"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="252">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="419.59226" z="26.36223"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="253">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.77884" z="29.41817"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="254">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.39985" z="30.5451"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="255">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="418.19312" z="31.1599"/>
 			<Orientation y="-2.5703"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="256">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="424.14942" z="39.33748"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="25226"/>
 		</Entity>
 		<Entity uid="257">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="423.50361" z="39.27727"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="258">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="422.31977" z="39.16691"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="259">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="425.48081" z="39.2576"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="260">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="426.66465" z="39.36796"/>
 			<Orientation y="-7.05123"/>
 			<Actor seed="29951"/>
 		</Entity>
 		<Entity uid="261">
-			<Template>units/pers/infantry_spearman_b</Template>
+			<Template>units/achae/infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="427.31043" z="39.42815"/>
 			<Orientation y="-7.05123"/>
diff --git a/binaries/data/mods/public/maps/scenarios/walltest.xml b/binaries/data/mods/public/maps/scenarios/walltest.xml
index 92b9c51104..4d3c4a9024 100644
--- a/binaries/data/mods/public/maps/scenarios/walltest.xml
+++ b/binaries/data/mods/public/maps/scenarios/walltest.xml
@@ -94,7 +94,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>2</Player>
 			<Position x="751.73603" z="789.12446"/>
 			<Orientation y="2.35621"/>
@@ -148,7 +148,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="68">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="311.45011" z="258.70716"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
index 2988ab39b9..fd01994732 100644
--- a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
@@ -11971,21 +11971,21 @@
 			<Actor seed="35990"/>
 		</Entity>
 		<Entity uid="1980">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="464.17502" z="816.94178"/>
 			<Orientation y="-2.54097"/>
 			<Actor seed="48824"/>
 		</Entity>
 		<Entity uid="1981">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="829.30567" z="789.10065"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11110"/>
 		</Entity>
 		<Entity uid="1982">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="763.23505" z="1001.38483"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
index 376a0b407d..9ae758c6c1 100644
--- a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
@@ -14651,28 +14651,28 @@
 			<Actor seed="9052"/>
 		</Entity>
 		<Entity uid="2709">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="266.90098" z="567.57612"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27084"/>
 		</Entity>
 		<Entity uid="2710">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="861.08893" z="272.75239"/>
 			<Orientation y="-1.34891"/>
 			<Actor seed="63326"/>
 		</Entity>
 		<Entity uid="2711">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="462.59308" z="787.56794"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4672"/>
 		</Entity>
 		<Entity uid="2712">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="571.68244" z="86.7671"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
index ed771b31e5..a7f73d7df5 100644
--- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
@@ -14004,7 +14004,7 @@
 			<Actor seed="39222"/>
 		</Entity>
 		<Entity uid="2580">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="538.47297" z="449.12345"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml
index 06e8c257b9..b3f64ca31f 100644
--- a/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml
@@ -3420,7 +3420,7 @@
 			<Actor seed="982"/>
 		</Entity>
 		<Entity uid="694">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="760.5641" z="1268.16041"/>
 			<Orientation y="2.35621"/>
@@ -13759,7 +13759,7 @@
 			<Actor seed="14676"/>
 		</Entity>
 		<Entity uid="2613">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="479.28855" z="669.57203"/>
 			<Orientation y="2.35622"/>
@@ -33974,7 +33974,7 @@
 			<Actor seed="7600"/>
 		</Entity>
 		<Entity uid="6128">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="1038.99903" z="1358.29358"/>
 			<Orientation y="1.99407"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
index ea361ef430..5f737a7607 100644
--- a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
@@ -17002,7 +17002,7 @@
 			<Actor seed="59616"/>
 		</Entity>
 		<Entity uid="9986">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="160.75544" z="574.5511"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
index efe88bb0a6..c4228da07f 100644
--- a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -42,7 +42,7 @@
   "Keywords": [],
   "LockTeams": true,
   "Name": "Egypt (3v3)",
-  "Description": "Fight for the remains of ancient Egypt!\n\nPlayers start with full grown cities and small armies, each having distinct advantages and drawbacks. Take care, there are 7 mighty forts and marauding bandids!\n\nIt is the last century before 0 A.D. Egypt is internally divided between hellenistic (Alexandria, represented by Seleucids) and traditional influences (Memphis, represented by Ptolemies). Thebes in the southern clime of river Nile has already been taken over by the Kush. In the north western Al-Dschabal al-Achdar, where the mediterranean city of Cyrene is located the Romans are preparing their invasion. From the eastern desert at-Tih and mount Sinai enemies (represented by Persians) are pushing forward and the oasis Siwa. Charga (represented by Carthage) in the south western desert are trying to get a share of the pie as well.\nLocations:\n- Alexandria: library, harbor\n- Memphis: Necropolis, pyramids, Apis shrine\n- Thebes: temple district, Valley of the Kings \n- Cyrene: mediterranean Macchie, olive groves\n- Fayyum: crocodile shrine, nile dam\n- Eastern desert: mount Sinai, deep Wadi, Red Sea reefs\n- Western desert: Oasis Charga and Siwa, Qattara Depression\n",
+  "Description": "Fight for the remains of ancient Egypt!\n\nPlayers start with full grown cities and small armies, each having distinct advantages and drawbacks. Take care, there are 7 mighty forts and marauding bandids!\n\nIt is the last century before 0 A.D. Egypt is internally divided between hellenistic (Alexandria, represented by Seleucids) and traditional influences (Memphis, represented by Ptolemies). Thebes in the southern clime of river Nile has already been taken over by the Kush. In the north western Al-Dschabal al-Achdar, where the mediterranean city of Cyrene is located the Romans are preparing their invasion. From the eastern desert at-Tih and mount Sinai enemies (represented by achaemenids) are pushing forward and the oasis Siwa. Charga (represented by Carthage) in the south western desert are trying to get a share of the pie as well.\nLocations:\n- Alexandria: library, harbor\n- Memphis: Necropolis, pyramids, Apis shrine\n- Thebes: temple district, Valley of the Kings \n- Cyrene: mediterranean Macchie, olive groves\n- Fayyum: crocodile shrine, nile dam\n- Eastern desert: mount Sinai, deep Wadi, Red Sea reefs\n- Western desert: Oasis Charga and Siwa, Qattara Depression\n",
   "PlayerData": [
     {
       "Civ": "sele",
@@ -75,7 +75,7 @@
       "Team": 1
     },
     {
-      "Civ": "pers",
+      "Civ": "achae",
       "Color": {
         "b": 5,
         "g": 200,
@@ -1201,7 +1201,7 @@
 			<Orientation y="1.67508"/>
 		</Entity>
 		<Entity uid="445">
-			<Template>units/pers/cavalry_javelineer_b</Template>
+			<Template>units/achae/cavalry_javelineer_b</Template>
 			<Player>3</Player>
 			<Position x="262.83542" z="586.54987"/>
 			<Orientation y="-0.78541"/>
@@ -18651,19 +18651,19 @@
 			<Actor seed="9546"/>
 		</Entity>
 		<Entity uid="4460">
-			<Template>actor|props/special/eyecandy/treasure_persian_food_small.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_food_small.xml</Template>
 			<Position x="1370.51587" z="79.69487"/>
 			<Orientation y="4.03701"/>
 			<Actor seed="44108"/>
 		</Entity>
 		<Entity uid="4461">
-			<Template>actor|props/special/eyecandy/treasure_persian_food_big.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_food_big.xml</Template>
 			<Position x="1350.21192" z="79.6729"/>
 			<Orientation y="5.12046"/>
 			<Actor seed="45936"/>
 		</Entity>
 		<Entity uid="4462">
-			<Template>actor|props/special/eyecandy/treasure_persian_metal_big.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_metal_big.xml</Template>
 			<Position x="1356.35645" z="87.82554"/>
 			<Orientation y="2.3304"/>
 			<Actor seed="36048"/>
@@ -34616,14 +34616,14 @@
 			<Actor seed="59908"/>
 		</Entity>
 		<Entity uid="8101">
-			<Template>structures/pers/dock</Template>
+			<Template>structures/achae/dock</Template>
 			<Player>0</Player>
 			<Position x="1959.85767" z="1272.45496"/>
 			<Orientation y="2.30257"/>
 			<Actor seed="12936"/>
 		</Entity>
 		<Entity uid="8102">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>4</Player>
 			<Position x="1968.94227" z="1301.14051"/>
 			<Orientation y="3.84986"/>
@@ -35020,14 +35020,14 @@
 			<Actor seed="51882"/>
 		</Entity>
 		<Entity uid="8174">
-			<Template>structures/pers/barracks</Template>
+			<Template>structures/achae/barracks</Template>
 			<Player>0</Player>
 			<Position x="1939.57264" z="1290.88135"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58066"/>
 		</Entity>
 		<Entity uid="8175">
-			<Template>structures/pers/defense_tower</Template>
+			<Template>structures/achae/defense_tower</Template>
 			<Player>0</Player>
 			<Position x="1949.01014" z="1244.82007"/>
 			<Orientation y="1.69039"/>
@@ -36108,7 +36108,7 @@
 			<Actor seed="16624"/>
 		</Entity>
 		<Entity uid="8382">
-			<Template>units/pers/support_healer_e</Template>
+			<Template>units/achae/support_healer_e</Template>
 			<Player>1</Player>
 			<Position x="782.42615" z="1752.81617"/>
 			<Orientation y="1.81753"/>
@@ -38468,7 +38468,7 @@
 			<Actor seed="34098"/>
 		</Entity>
 		<Entity uid="8982">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>4</Player>
 			<Position x="1663.72901" z="1712.18348"/>
 			<Orientation y="5.58075"/>
@@ -51831,7 +51831,7 @@
 			<Actor seed="7632"/>
 		</Entity>
 		<Entity uid="11586">
-			<Template>structures/pers/dock</Template>
+			<Template>structures/achae/dock</Template>
 			<Player>4</Player>
 			<Position x="1614.31275" z="1782.88465"/>
 			<Orientation y="2.54531"/>
@@ -51999,98 +51999,98 @@
 			<Actor seed="387"/>
 		</Entity>
 		<Entity uid="11610">
-			<Template>structures/pers/stable</Template>
+			<Template>structures/achae/stable</Template>
 			<Player>4</Player>
 			<Position x="1746.03089" z="1665.09144"/>
 			<Orientation y="3.96238"/>
 			<Actor seed="60060"/>
 		</Entity>
 		<Entity uid="11611">
-			<Template>structures/pers/tachara</Template>
+			<Template>structures/achae/tachara</Template>
 			<Player>4</Player>
 			<Position x="1680.41724" z="1691.77625"/>
 			<Orientation y="8.72716"/>
 			<Actor seed="60360"/>
 		</Entity>
 		<Entity uid="11612">
-			<Template>structures/pers/tachara</Template>
+			<Template>structures/achae/tachara</Template>
 			<Player>4</Player>
 			<Position x="1728.0547" z="1634.66651"/>
 			<Orientation y="5.58768"/>
 			<Actor seed="46692"/>
 		</Entity>
 		<Entity uid="11613">
-			<Template>structures/pers/market</Template>
+			<Template>structures/achae/market</Template>
 			<Player>4</Player>
 			<Position x="1706.49549" z="1618.0464"/>
 			<Orientation y="2.45339"/>
 			<Actor seed="11982"/>
 		</Entity>
 		<Entity uid="11614">
-			<Template>units/pers/hero_xerxes_i_chariot</Template>
+			<Template>units/achae/hero_xerxes_i_chariot</Template>
 			<Player>4</Player>
 			<Position x="1704.25745" z="1662.71692"/>
 			<Orientation y="2.42843"/>
 			<Actor seed="53752"/>
 		</Entity>
 		<Entity uid="11617">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1704.58167" z="1681.59534"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="64092"/>
 		</Entity>
 		<Entity uid="11618">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1701.4524" z="1680.03821"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="17760"/>
 		</Entity>
 		<Entity uid="11619">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1698.94385" z="1677.67481"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="4818"/>
 		</Entity>
 		<Entity uid="11620">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1696.37427" z="1675.19544"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="27240"/>
 		</Entity>
 		<Entity uid="11621">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1693.3971" z="1672.93738"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="16826"/>
 		</Entity>
 		<Entity uid="11622">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1690.94361" z="1670.89576"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="18402"/>
 		</Entity>
 		<Entity uid="11623">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1687.98536" z="1668.25232"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="40436"/>
 		</Entity>
 		<Entity uid="11624">
-			<Template>units/pers/champion_infantry</Template>
+			<Template>units/achae/champion_infantry</Template>
 			<Player>4</Player>
 			<Position x="1685.59742" z="1665.76014"/>
 			<Orientation y="2.39837"/>
 			<Actor seed="48010"/>
 		</Entity>
 		<Entity uid="11626">
-			<Template>units/pers/ship_scout</Template>
+			<Template>units/achae/ship_scout</Template>
 			<Player>4</Player>
 			<Position x="1988.09461" z="1098.11231"/>
 			<Orientation y="-2.53667"/>
@@ -52779,28 +52779,28 @@
 			<Actor seed="17172"/>
 		</Entity>
 		<Entity uid="11785">
-			<Template>units/pers/ship_merchant</Template>
+			<Template>units/achae/ship_merchant</Template>
 			<Player>4</Player>
 			<Position x="1588.26502" z="1783.13257"/>
 			<Orientation y="-2.0174"/>
 			<Actor seed="17234"/>
 		</Entity>
 		<Entity uid="11786">
-			<Template>units/pers/ship_fishing</Template>
+			<Template>units/achae/ship_fishing</Template>
 			<Player>4</Player>
 			<Position x="1621.21045" z="1802.55152"/>
 			<Orientation y="-1.38511"/>
 			<Actor seed="48884"/>
 		</Entity>
 		<Entity uid="11787">
-			<Template>units/pers/ship_scout</Template>
+			<Template>units/achae/ship_scout</Template>
 			<Player>4</Player>
 			<Position x="1535.3169" z="1837.49646"/>
 			<Orientation y="-1.43871"/>
 			<Actor seed="1338"/>
 		</Entity>
 		<Entity uid="11788">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>4</Player>
 			<Position x="1563.92591" z="1815.39014"/>
 			<Orientation y="-1.42492"/>
@@ -53584,161 +53584,161 @@
 			<Actor seed="55262"/>
 		</Entity>
 		<Entity uid="11937">
-			<Template>structures/pers/forge</Template>
+			<Template>structures/achae/forge</Template>
 			<Player>4</Player>
 			<Position x="1705.82483" z="1578.16688"/>
 			<Orientation y="4.57708"/>
 			<Actor seed="2870"/>
 		</Entity>
 		<Entity uid="11938">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>4</Player>
 			<Position x="1662.67347" z="1623.19874"/>
 			<Orientation y="5.59629"/>
 			<Actor seed="18906"/>
 		</Entity>
 		<Entity uid="11939">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>4</Player>
 			<Position x="1682.76771" z="1592.8855"/>
 			<Orientation y="7.12461"/>
 			<Actor seed="54980"/>
 		</Entity>
 		<Entity uid="11940">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>4</Player>
 			<Position x="1649.92383" z="1670.12305"/>
 			<Orientation y="5.54896"/>
 			<Actor seed="51022"/>
 		</Entity>
 		<Entity uid="11941">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>4</Player>
 			<Position x="1655.15931" z="1635.06959"/>
 			<Orientation y="0.84063"/>
 			<Actor seed="23096"/>
 		</Entity>
 		<Entity uid="11942">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>4</Player>
 			<Position x="1660.05555" z="1658.48633"/>
 			<Orientation y="7.0978"/>
 			<Actor seed="2468"/>
 		</Entity>
 		<Entity uid="11943">
-			<Template>structures/pers/barracks</Template>
+			<Template>structures/achae/barracks</Template>
 			<Player>4</Player>
 			<Position x="1749.88526" z="1619.5204"/>
 			<Orientation y="4.0023"/>
 			<Actor seed="1710"/>
 		</Entity>
 		<Entity uid="11944">
-			<Template>structures/pers/house</Template>
+			<Template>structures/achae/house</Template>
 			<Player>4</Player>
 			<Position x="1671.8523" z="1607.64515"/>
 			<Orientation y="-0.57857"/>
 			<Actor seed="51022"/>
 		</Entity>
 		<Entity uid="11945">
-			<Template>structures/pers/corral</Template>
+			<Template>structures/achae/corral</Template>
 			<Player>4</Player>
 			<Position x="1759.5951" z="1581.94983"/>
 			<Orientation y="3.48844"/>
 			<Actor seed="57750"/>
 		</Entity>
 		<Entity uid="11946">
-			<Template>structures/pers/defense_tower</Template>
+			<Template>structures/achae/defense_tower</Template>
 			<Player>4</Player>
 			<Position x="1694.01648" z="1541.89527"/>
 			<Orientation y="14.11187"/>
 			<Actor seed="32492"/>
 		</Entity>
 		<Entity uid="11947">
-			<Template>structures/pers/defense_tower</Template>
+			<Template>structures/achae/defense_tower</Template>
 			<Player>4</Player>
 			<Position x="1732.07862" z="1497.24756"/>
 			<Orientation y="6.35755"/>
 			<Actor seed="15120"/>
 		</Entity>
 		<Entity uid="11948">
-			<Template>structures/pers/defense_tower</Template>
+			<Template>structures/achae/defense_tower</Template>
 			<Player>4</Player>
 			<Position x="1703.0907" z="1708.41297"/>
 			<Orientation y="3.99585"/>
 			<Actor seed="34236"/>
 		</Entity>
 		<Entity uid="11949">
-			<Template>structures/pers/farmstead</Template>
+			<Template>structures/achae/farmstead</Template>
 			<Player>4</Player>
 			<Position x="1706.74122" z="1558.63978"/>
 			<Orientation y="1.45937"/>
 			<Actor seed="41250"/>
 		</Entity>
 		<Entity uid="11950">
-			<Template>structures/pers/fortress</Template>
+			<Template>structures/achae/fortress</Template>
 			<Player>4</Player>
 			<Position x="1721.6371" z="1514.18763"/>
 			<Orientation y="4.0119"/>
 			<Actor seed="63468"/>
 		</Entity>
 		<Entity uid="11951">
-			<Template>structures/pers/hall</Template>
+			<Template>structures/achae/hall</Template>
 			<Player>4</Player>
 			<Position x="1728.98426" z="1688.91663"/>
 			<Orientation y="10.24317"/>
 			<Actor seed="19752"/>
 		</Entity>
 		<Entity uid="11952">
-			<Template>structures/pers/temple</Template>
+			<Template>structures/achae/temple</Template>
 			<Player>4</Player>
 			<Position x="1680.21473" z="1641.07544"/>
 			<Orientation y="7.1702"/>
 			<Actor seed="2800"/>
 		</Entity>
 		<Entity uid="11953">
-			<Template>structures/pers/defense_tower</Template>
+			<Template>structures/achae/defense_tower</Template>
 			<Player>4</Player>
 			<Position x="1801.10682" z="1612.62122"/>
 			<Orientation y="3.90813"/>
 			<Actor seed="34236"/>
 		</Entity>
 		<Entity uid="11955">
-			<Template>structures/pers/storehouse</Template>
+			<Template>structures/achae/storehouse</Template>
 			<Player>4</Player>
 			<Position x="1750.06653" z="1561.60792"/>
 			<Orientation y="0.35044"/>
 			<Actor seed="48494"/>
 		</Entity>
 		<Entity uid="11956">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>4</Player>
 			<Position x="1738.32593" z="1599.79712"/>
 			<Orientation y="-2.68308"/>
 			<Actor seed="31094"/>
 		</Entity>
 		<Entity uid="11957">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>4</Player>
 			<Position x="1729.50684" z="1568.75733"/>
 			<Orientation y="1.5093"/>
 			<Actor seed="58682"/>
 		</Entity>
 		<Entity uid="11958">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>4</Player>
 			<Position x="1704.63257" z="1492.94166"/>
 			<Orientation y="5.44085"/>
 			<Actor seed="49066"/>
 		</Entity>
 		<Entity uid="11959">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>4</Player>
 			<Position x="1664.96583" z="1492.2173"/>
 			<Orientation y="-3.94784"/>
 			<Actor seed="37634"/>
 		</Entity>
 		<Entity uid="11960">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>4</Player>
 			<Position x="1685.25562" z="1514.90552"/>
 			<Orientation y="-4.04787"/>
@@ -55307,7 +55307,7 @@
 			<Actor seed="27328"/>
 		</Entity>
 		<Entity uid="12215">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>4</Player>
 			<Position x="1680.00757" z="1470.8932"/>
 			<Orientation y="-0.95759"/>
@@ -62258,7 +62258,7 @@
 			<Actor seed="23596"/>
 		</Entity>
 		<Entity uid="13917">
-			<Template>actor|props/special/eyecandy/treasure_persian_metal_small.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_metal_small.xml</Template>
 			<Position x="1791.38721" z="458.10434"/>
 			<Orientation y="1.60644"/>
 			<Actor seed="62592"/>
@@ -64477,7 +64477,7 @@
 			<Actor seed="60358"/>
 		</Entity>
 		<Entity uid="14332">
-			<Template>structures/pers/field</Template>
+			<Template>structures/achae/field</Template>
 			<Player>3</Player>
 			<Position x="264.22931" z="512.09559"/>
 			<Orientation y="1.53888"/>
@@ -67743,7 +67743,7 @@
 			<Actor seed="31964"/>
 		</Entity>
 		<Entity uid="14987">
-			<Template>structures/pers/dock</Template>
+			<Template>structures/achae/dock</Template>
 			<Player>4</Player>
 			<Position x="1757.80091" z="1212.31946"/>
 			<Orientation y="-2.47918"/>
@@ -72202,7 +72202,7 @@
 			<Actor seed="54868"/>
 		</Entity>
 		<Entity uid="15896">
-			<Template>structures/pers/corral</Template>
+			<Template>structures/achae/corral</Template>
 			<Player>0</Player>
 			<Position x="304.01069" z="873.72742"/>
 			<Orientation y="1.07081"/>
@@ -73193,7 +73193,7 @@
 			<Actor seed="23058"/>
 		</Entity>
 		<Entity uid="16064">
-			<Template>units/pers/support_healer_a</Template>
+			<Template>units/achae/support_healer_a</Template>
 			<Player>0</Player>
 			<Position x="734.27228" z="1129.80542"/>
 			<Orientation y="5.0183"/>
@@ -75005,7 +75005,7 @@
 			<Actor seed="1132"/>
 		</Entity>
 		<Entity uid="16380">
-			<Template>units/pers/support_healer_e</Template>
+			<Template>units/achae/support_healer_e</Template>
 			<Player>0</Player>
 			<Position x="1286.06482" z="264.69266"/>
 			<Orientation y="1.39495"/>
@@ -94020,31 +94020,31 @@
 			<Actor seed="43642"/>
 		</Entity>
 		<Entity uid="19722">
-			<Template>actor|props/special/eyecandy/treasure_persian_food_big.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_food_big.xml</Template>
 			<Position x="854.64631" z="1576.35926"/>
 			<Orientation y="0.06673"/>
 			<Actor seed="26538"/>
 		</Entity>
 		<Entity uid="19724">
-			<Template>actor|props/special/eyecandy/treasure_persian_food_small.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_food_small.xml</Template>
 			<Position x="811.92365" z="1619.68409"/>
 			<Orientation y="0.85857"/>
 			<Actor seed="62176"/>
 		</Entity>
 		<Entity uid="19725">
-			<Template>actor|props/special/eyecandy/treasure_persian_metal_big.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_metal_big.xml</Template>
 			<Position x="793.06605" z="1642.34791"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41262"/>
 		</Entity>
 		<Entity uid="19726">
-			<Template>actor|props/special/eyecandy/treasure_persian_metal_small.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_metal_small.xml</Template>
 			<Position x="838.24634" z="1563.62171"/>
 			<Orientation y="3.5156"/>
 			<Actor seed="35016"/>
 		</Entity>
 		<Entity uid="19727">
-			<Template>actor|props/structures/persians/market_a_stall6.xml</Template>
+			<Template>actor|props/structures/achaemenids/market_a_stall6.xml</Template>
 			<Position x="860.41187" z="1538.91565"/>
 			<Orientation y="3.95704"/>
 			<Actor seed="32976"/>
@@ -95030,91 +95030,91 @@
 			<Actor seed="3678"/>
 		</Entity>
 		<Entity uid="19910">
-			<Template>units/pers/infantry_spearman_a</Template>
+			<Template>units/achae/infantry_spearman_a</Template>
 			<Player>4</Player>
 			<Position x="1701.44568" z="1530.11109"/>
 			<Orientation y="-8.0057"/>
 			<Actor seed="28634"/>
 		</Entity>
 		<Entity uid="19911">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1683.24402" z="1668.77088"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="31866"/>
 		</Entity>
 		<Entity uid="19912">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1685.13953" z="1670.78138"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="3330"/>
 		</Entity>
 		<Entity uid="19913">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1688.7201" z="1672.8578"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="61688"/>
 		</Entity>
 		<Entity uid="19914">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1691.17188" z="1675.1377"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="54226"/>
 		</Entity>
 		<Entity uid="19915">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1694.17981" z="1677.35071"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="4340"/>
 		</Entity>
 		<Entity uid="19916">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1696.75098" z="1680.46277"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="29408"/>
 		</Entity>
 		<Entity uid="19917">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1699.17457" z="1682.28736"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="8706"/>
 		</Entity>
 		<Entity uid="19918">
-			<Template>units/pers/kardakes_skirmisher</Template>
+			<Template>units/achae/kardakes_skirmisher</Template>
 			<Player>4</Player>
 			<Position x="1701.93165" z="1684.99756"/>
 			<Orientation y="2.39946"/>
 			<Actor seed="45892"/>
 		</Entity>
 		<Entity uid="19919">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1700.26758" z="1672.47632"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="35738"/>
 		</Entity>
 		<Entity uid="19920">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1698.3313" z="1670.88843"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="16568"/>
 		</Entity>
 		<Entity uid="19921">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1696.71485" z="1669.43519"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="40148"/>
 		</Entity>
 		<Entity uid="19922">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1694.96998" z="1667.81739"/>
 			<Orientation y="2.40578"/>
@@ -98882,14 +98882,14 @@
 			<Actor seed="3058"/>
 		</Entity>
 		<Entity uid="20682">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1702.44153" z="1674.46863"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="40148"/>
 		</Entity>
 		<Entity uid="20683">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1693.03724" z="1666.08375"/>
 			<Orientation y="2.40578"/>
@@ -98987,7 +98987,7 @@
 			<Actor seed="28376"/>
 		</Entity>
 		<Entity uid="20697">
-			<Template>units/pers/ship_arrow</Template>
+			<Template>units/achae/ship_arrow</Template>
 			<Player>4</Player>
 			<Position x="1571.31751" z="1852.77906"/>
 			<Orientation y="-1.39922"/>
@@ -99155,14 +99155,14 @@
 			<Actor seed="18356"/>
 		</Entity>
 		<Entity uid="20721">
-			<Template>units/pers/support_healer_e</Template>
+			<Template>units/achae/support_healer_e</Template>
 			<Player>4</Player>
 			<Position x="1678.60645" z="1653.83277"/>
 			<Orientation y="1.70206"/>
 			<Actor seed="61940"/>
 		</Entity>
 		<Entity uid="20722">
-			<Template>units/pers/support_healer_e</Template>
+			<Template>units/achae/support_healer_e</Template>
 			<Player>4</Player>
 			<Position x="1691.70643" z="1637.94825"/>
 			<Orientation y="0.72757"/>
@@ -104714,7 +104714,7 @@
 			<Actor seed="22958"/>
 		</Entity>
 		<Entity uid="21935">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="1386.59437" z="1237.38465"/>
 			<Orientation y="6.28827"/>
@@ -104756,42 +104756,42 @@
 			<Actor seed="17126"/>
 		</Entity>
 		<Entity uid="21941">
-			<Template>structures/pers/inn</Template>
+			<Template>structures/achae/inn</Template>
 			<Player>0</Player>
 			<Position x="1081.73584" z="1089.88892"/>
 			<Orientation y="1.56003"/>
 			<Actor seed="65172"/>
 		</Entity>
 		<Entity uid="21942">
-			<Template>structures/pers/house_b</Template>
+			<Template>structures/achae/house_b</Template>
 			<Player>0</Player>
 			<Position x="1091.87964" z="1133.99073"/>
 			<Orientation y="1.53624"/>
 			<Actor seed="51684"/>
 		</Entity>
 		<Entity uid="21943">
-			<Template>structures/pers/house_a</Template>
+			<Template>structures/achae/house_a</Template>
 			<Player>0</Player>
 			<Position x="1087.02527" z="1115.71924"/>
 			<Orientation y="-3.15867"/>
 			<Actor seed="52778"/>
 		</Entity>
 		<Entity uid="21944">
-			<Template>structures/pers/apartment_block</Template>
+			<Template>structures/achae/apartment_block</Template>
 			<Player>0</Player>
 			<Position x="1140.07496" z="1163.7234"/>
 			<Orientation y="3.12826"/>
 			<Actor seed="49726"/>
 		</Entity>
 		<Entity uid="21946">
-			<Template>structures/pers/inn</Template>
+			<Template>structures/achae/inn</Template>
 			<Player>0</Player>
 			<Position x="1917.19007" z="1437.46705"/>
 			<Orientation y="3.2318"/>
 			<Actor seed="56944"/>
 		</Entity>
 		<Entity uid="21947">
-			<Template>structures/pers/inn</Template>
+			<Template>structures/achae/inn</Template>
 			<Player>0</Player>
 			<Position x="1114.77002" z="1167.45826"/>
 			<Orientation y="3.09757"/>
@@ -104876,14 +104876,14 @@
 			<Actor seed="16426"/>
 		</Entity>
 		<Entity uid="21961">
-			<Template>structures/pers/warehouse</Template>
+			<Template>structures/achae/warehouse</Template>
 			<Player>0</Player>
 			<Position x="1138.14393" z="1132.37903"/>
 			<Orientation y="4.6855"/>
 			<Actor seed="26252"/>
 		</Entity>
 		<Entity uid="21962">
-			<Template>structures/pers/house_a</Template>
+			<Template>structures/achae/house_a</Template>
 			<Player>0</Player>
 			<Position x="1148.91712" z="1117.05481"/>
 			<Orientation y="-3.15287"/>
@@ -104896,7 +104896,7 @@
 			<Actor seed="44576"/>
 		</Entity>
 		<Entity uid="21964">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="721.94294" z="550.58631"/>
 			<Orientation y="-0.27436"/>
@@ -104924,21 +104924,21 @@
 			<Actor seed="7510"/>
 		</Entity>
 		<Entity uid="21968">
-			<Template>structures/pers/warehouse</Template>
+			<Template>structures/achae/warehouse</Template>
 			<Player>0</Player>
 			<Position x="1929.75953" z="1426.69764"/>
 			<Orientation y="-1.47664"/>
 			<Actor seed="31480"/>
 		</Entity>
 		<Entity uid="21969">
-			<Template>structures/pers/house_b</Template>
+			<Template>structures/achae/house_b</Template>
 			<Player>0</Player>
 			<Position x="1928.44227" z="1415.46814"/>
 			<Orientation y="-3.04915"/>
 			<Actor seed="55966"/>
 		</Entity>
 		<Entity uid="21970">
-			<Template>structures/pers/house_a</Template>
+			<Template>structures/achae/house_a</Template>
 			<Player>0</Player>
 			<Position x="1935.4026" z="1434.9231"/>
 			<Orientation y="1.69051"/>
@@ -105218,14 +105218,14 @@
 			<Actor seed="53928"/>
 		</Entity>
 		<Entity uid="22011">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="985.17121" z="166.27704"/>
 			<Orientation y="2.96267"/>
 			<Actor seed="26050"/>
 		</Entity>
 		<Entity uid="22012">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="972.86713" z="176.6489"/>
 			<Orientation y="3.20539"/>
@@ -105309,7 +105309,7 @@
 			<Actor seed="1236"/>
 		</Entity>
 		<Entity uid="22026">
-			<Template>actor|props/special/eyecandy/treasure_persian_metal_small.xml</Template>
+			<Template>actor|props/special/eyecandy/treasure_achaemenid_metal_small.xml</Template>
 			<Position x="1791.44617" z="473.8548"/>
 			<Orientation y="1.66167"/>
 			<Actor seed="62592"/>
@@ -105357,19 +105357,19 @@
 			<Actor seed="25446"/>
 		</Entity>
 		<Entity uid="22034">
-			<Template>actor|props/structures/persians/farmstead_cart_big.xml</Template>
+			<Template>actor|props/structures/achaemenids/farmstead_cart_big.xml</Template>
 			<Position x="1192.28711" z="1765.1371"/>
 			<Orientation y="4.22271"/>
 			<Actor seed="38808"/>
 		</Entity>
 		<Entity uid="22036">
-			<Template>actor|props/structures/persians/market_b_stall2.xml</Template>
+			<Template>actor|props/structures/achaemenids/market_b_stall2.xml</Template>
 			<Position x="1791.67627" z="474.33768"/>
 			<Orientation y="4.80781"/>
 			<Actor seed="36144"/>
 		</Entity>
 		<Entity uid="22039">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="1801.03211" z="464.83545"/>
 			<Orientation y="4.7462"/>
@@ -109931,28 +109931,28 @@
 			<Actor seed="1202"/>
 		</Entity>
 		<Entity uid="22815">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1691.12183" z="1664.32007"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="40148"/>
 		</Entity>
 		<Entity uid="22816">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1688.94788" z="1662.32776"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="35738"/>
 		</Entity>
 		<Entity uid="22817">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1705.20118" z="1676.28772"/>
 			<Orientation y="2.40578"/>
 			<Actor seed="48256"/>
 		</Entity>
 		<Entity uid="22818">
-			<Template>units/pers/champion_cavalry_archer</Template>
+			<Template>units/achae/champion_cavalry_archer</Template>
 			<Player>4</Player>
 			<Position x="1706.94605" z="1677.90552"/>
 			<Orientation y="2.40578"/>
@@ -110092,112 +110092,112 @@
 			<Actor seed="47524"/>
 		</Entity>
 		<Entity uid="22838">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1681.87354" z="1663.7024"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52534"/>
 		</Entity>
 		<Entity uid="22839">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1683.7837" z="1665.3252"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52564"/>
 		</Entity>
 		<Entity uid="22840">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1683.49244" z="1661.82422"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37836"/>
 		</Entity>
 		<Entity uid="22841">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1685.55018" z="1663.70386"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52692"/>
 		</Entity>
 		<Entity uid="22842">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1684.98792" z="1660.07911"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20930"/>
 		</Entity>
 		<Entity uid="22843">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1686.8429" z="1661.93372"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8392"/>
 		</Entity>
 		<Entity uid="22844">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1707.0973" z="1684.7013"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20660"/>
 		</Entity>
 		<Entity uid="22845">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1709.2013" z="1686.55848"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25050"/>
 		</Entity>
 		<Entity uid="22846">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1708.23267" z="1682.65528"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25608"/>
 		</Entity>
 		<Entity uid="22847">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1710.3235" z="1684.8943"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62330"/>
 		</Entity>
 		<Entity uid="22848">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1709.32776" z="1681.43177"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24198"/>
 		</Entity>
 		<Entity uid="22849">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1711.74292" z="1682.84156"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48926"/>
 		</Entity>
 		<Entity uid="22850">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1679.42933" z="1665.55213"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26082"/>
 		</Entity>
 		<Entity uid="22851">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1680.62855" z="1667.29627"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19556"/>
 		</Entity>
 		<Entity uid="22852">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1705.05494" z="1687.4502"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39706"/>
 		</Entity>
 		<Entity uid="22853">
-			<Template>units/pers/kardakes_hoplite</Template>
+			<Template>units/achae/kardakes_hoplite</Template>
 			<Player>4</Player>
 			<Position x="1707.44642" z="1688.89307"/>
 			<Orientation y="2.35621"/>
@@ -114401,35 +114401,35 @@
 			<Actor seed="50594"/>
 		</Entity>
 		<Entity uid="23574">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="1724.11316" z="1547.20276"/>
 			<Orientation y="-1.9386"/>
 			<Actor seed="32892"/>
 		</Entity>
 		<Entity uid="23575">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="1718.32447" z="1548.32776"/>
 			<Orientation y="2.96312"/>
 			<Actor seed="32230"/>
 		</Entity>
 		<Entity uid="23576">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="1721.69007" z="1542.76014"/>
 			<Orientation y="-1.09551"/>
 			<Actor seed="43034"/>
 		</Entity>
 		<Entity uid="23577">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="1716.55884" z="1542.38648"/>
 			<Orientation y="0.78214"/>
 			<Actor seed="3970"/>
 		</Entity>
 		<Entity uid="23578">
-			<Template>units/pers/support_civilian</Template>
+			<Template>units/achae/support_civilian</Template>
 			<Player>4</Player>
 			<Position x="1715.31116" z="1545.3158"/>
 			<Orientation y="2.40142"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
index af49f1f1a2..95a0bd0ead 100644
--- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
@@ -29783,43 +29783,43 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5801">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="546.4245" z="789.35438"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5802">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="548.16407" z="796.58014"/>
 			<Orientation y="-2.90923"/>
 		</Entity>
 		<Entity uid="5803">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="536.04981" z="795.67371"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5804">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="625.36158" z="1084.30091"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5805">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="619.89991" z="429.66742"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5806">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="900.20002" z="174.75136"/>
 			<Orientation y="-2.5337"/>
 		</Entity>
 		<Entity uid="5807">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="697.87354" z="116.76444"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml
index 9882779ed4..77d52e1b22 100644
--- a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml
@@ -11159,14 +11159,14 @@
 			<Actor seed="10908"/>
 		</Entity>
 		<Entity uid="1726">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="208.1894" z="751.59711"/>
 			<Orientation y="-3.48035"/>
 			<Actor seed="47778"/>
 		</Entity>
 		<Entity uid="1729">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="1098.261" z="500.67469"/>
 			<Orientation y="-3.48035"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
index b513350292..100f08fc5f 100644
--- a/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
@@ -15575,49 +15575,49 @@
 			<Orientation y="-0.84614"/>
 		</Entity>
 		<Entity uid="2964">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="969.8996" z="280.95933"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2965">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="975.4853" z="283.98945"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2966">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="286.73484" z="297.35703"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2967">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="291.74167" z="300.5012"/>
 			<Orientation y="-0.6981"/>
 		</Entity>
 		<Entity uid="2968">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="293.76301" z="946.136"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2969">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="296.66938" z="953.23047"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2970">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="952.75635" z="963.39704"/>
 			<Orientation y="-2.32462"/>
 		</Entity>
 		<Entity uid="2971">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="955.91108" z="955.84626"/>
 			<Orientation y="-2.30755"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
index bad3a2ffb7..2eb8157827 100644
--- a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
@@ -10944,28 +10944,28 @@
 			<Actor seed="53092"/>
 		</Entity>
 		<Entity uid="2481">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="779.95771" z="334.63785"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20568"/>
 		</Entity>
 		<Entity uid="2482">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="794.0348" z="349.6843"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56920"/>
 		</Entity>
 		<Entity uid="2483">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="767.67957" z="369.2963"/>
 			<Orientation y="-0.76267"/>
 			<Actor seed="38723"/>
 		</Entity>
 		<Entity uid="2484">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="759.87891" z="354.7302"/>
 			<Orientation y="-2.83504"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml b/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml
index 21096fee01..01ecc47c86 100644
--- a/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml
@@ -6410,14 +6410,14 @@
 			<Actor seed="65491"/>
 		</Entity>
 		<Entity uid="1065">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="640.92237" z="569.65711"/>
 			<Orientation y="-1.94275"/>
 			<Actor seed="35428"/>
 		</Entity>
 		<Entity uid="1066">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="136.85355" z="225.03968"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml
index d3043332ae..375630c734 100644
--- a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml
@@ -13620,49 +13620,49 @@
 			<Orientation y="0.06661"/>
 		</Entity>
 		<Entity uid="2892">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="284.92258" z="303.42701"/>
 			<Orientation y="2.74517"/>
 		</Entity>
 		<Entity uid="2893">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="276.19071" z="305.00358"/>
 			<Orientation y="-0.65973"/>
 		</Entity>
 		<Entity uid="2894">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="241.60044" z="270.80588"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2895">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="241.75582" z="278.73911"/>
 			<Orientation y="-2.92179"/>
 		</Entity>
 		<Entity uid="2897">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="776.69764" z="772.15284"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2898">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="768.53486" z="779.57984"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2899">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="727.21326" z="746.06952"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2900">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="731.37238" z="750.35505"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml
index 315352b75b..4d66b7316b 100644
--- a/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml
@@ -14149,97 +14149,97 @@
 			<Orientation y="0.06661"/>
 		</Entity>
 		<Entity uid="2885">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="242.32479" z="722.82294"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2886">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="248.79026" z="727.45716"/>
 			<Orientation y="-2.69608"/>
 		</Entity>
 		<Entity uid="2887">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="233.52492" z="722.26362"/>
 			<Orientation y="-1.21189"/>
 		</Entity>
 		<Entity uid="2888">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="739.22077" z="282.12876"/>
 			<Orientation y="-0.26603"/>
 		</Entity>
 		<Entity uid="2889">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="738.9109" z="273.51935"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2890">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="742.19898" z="214.3059"/>
 			<Orientation y="-2.51508"/>
 		</Entity>
 		<Entity uid="2891">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="770.05823" z="234.9"/>
 			<Orientation y="0.3145"/>
 		</Entity>
 		<Entity uid="2892">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="284.92258" z="303.42701"/>
 			<Orientation y="2.74517"/>
 		</Entity>
 		<Entity uid="2893">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="276.19071" z="305.00358"/>
 			<Orientation y="-0.65973"/>
 		</Entity>
 		<Entity uid="2894">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="241.60044" z="270.80588"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2895">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="241.75582" z="278.73911"/>
 			<Orientation y="-2.92179"/>
 		</Entity>
 		<Entity uid="2896">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="267.5568" z="744.76001"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2897">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="776.69764" z="772.15284"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2898">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="768.53486" z="779.57984"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2899">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="727.21326" z="746.06952"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2900">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="731.37238" z="750.35505"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
index cc824de9c5..e9019a8c57 100644
--- a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
@@ -20070,14 +20070,14 @@
 			<Actor seed="30104"/>
 		</Entity>
 		<Entity uid="9181">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="947.21448" z="200.31424"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62098"/>
 		</Entity>
 		<Entity uid="9182">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="962.71894" z="876.00379"/>
 			<Orientation y="-2.05533"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml
index 0d96524718..35fc955aa3 100644
--- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml
@@ -17070,7 +17070,7 @@
 			<Actor seed="29544"/>
 		</Entity>
 		<Entity uid="4992">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="460.43284" z="921.62848"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml b/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml
index 0f35b2c8e0..120baf1dcb 100644
--- a/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml
@@ -39777,14 +39777,14 @@
 			<Actor seed="63266"/>
 		</Entity>
 		<Entity uid="9232">
-			<Template>units/pers/cavalry_axeman_e</Template>
+			<Template>units/achae/cavalry_axeman_e</Template>
 			<Player>0</Player>
 			<Position x="257.36673" z="711.84559"/>
 			<Orientation y="0.35102"/>
 			<Actor seed="27686"/>
 		</Entity>
 		<Entity uid="9233">
-			<Template>units/pers/cavalry_axeman_e</Template>
+			<Template>units/achae/cavalry_axeman_e</Template>
 			<Player>0</Player>
 			<Position x="1674.26465" z="899.42261"/>
 			<Orientation y="-2.11175"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml
index ccaa2d7583..b6085fb144 100644
--- a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml
@@ -5322,7 +5322,7 @@
 			<Actor seed="54564"/>
 		</Entity>
 		<Entity uid="856">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="316.72092" z="267.29389"/>
 			<Orientation y="2.35621"/>
@@ -13259,7 +13259,7 @@
 			<Actor seed="51667"/>
 		</Entity>
 		<Entity uid="2082">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="335.89518" z="265.33259"/>
 			<Orientation y="2.76102"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/syria_2p.xml b/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
index 3ccb41a245..cc84fe021b 100644
--- a/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
@@ -22878,56 +22878,56 @@
 			<Actor seed="29478"/>
 		</Entity>
 		<Entity uid="3981">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="899.1764" z="418.97284"/>
 			<Orientation y="1.82352"/>
 			<Actor seed="21138"/>
 		</Entity>
 		<Entity uid="3982">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="436.84598" z="609.0047"/>
 			<Orientation y="0.49222"/>
 			<Actor seed="40812"/>
 		</Entity>
 		<Entity uid="3984">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="647.60053" z="166.06333"/>
 			<Orientation y="-2.81272"/>
 			<Actor seed="11676"/>
 		</Entity>
 		<Entity uid="3985">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="800.06305" z="192.676"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13986"/>
 		</Entity>
 		<Entity uid="3986">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="606.73981" z="795.22535"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41340"/>
 		</Entity>
 		<Entity uid="3987">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="802.78138" z="843.34205"/>
 			<Orientation y="2.20368"/>
 			<Actor seed="13216"/>
 		</Entity>
 		<Entity uid="3988">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="186.84267" z="243.39322"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2678"/>
 		</Entity>
 		<Entity uid="3989">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="1207.1731" z="811.39521"/>
 			<Orientation y="-2.16413"/>
@@ -30891,14 +30891,14 @@
 			<Actor seed="32166"/>
 		</Entity>
 		<Entity uid="5203">
-			<Template>structures/pers/storehouse</Template>
+			<Template>structures/achae/storehouse</Template>
 			<Player>0</Player>
 			<Position x="259.95417" z="989.5636"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27452"/>
 		</Entity>
 		<Entity uid="5204">
-			<Template>structures/pers/storehouse</Template>
+			<Template>structures/achae/storehouse</Template>
 			<Player>0</Player>
 			<Position x="1005.47046" z="923.96033"/>
 			<Orientation y="2.347"/>
@@ -31486,14 +31486,14 @@
 			<Actor seed="5356"/>
 		</Entity>
 		<Entity uid="5292">
-			<Template>structures/shrine_persian</Template>
+			<Template>structures/shrine_achaemenid</Template>
 			<Player>0</Player>
 			<Position x="294.43342" z="312.03336"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33034"/>
 		</Entity>
 		<Entity uid="5293">
-			<Template>structures/shrine_persian</Template>
+			<Template>structures/shrine_achaemenid</Template>
 			<Player>0</Player>
 			<Position x="1043.60962" z="796.05561"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml b/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml
index a7e836994e..a90dfca0b9 100644
--- a/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml
@@ -7237,25 +7237,25 @@
 			<Orientation y="0.18761"/>
 		</Entity>
 		<Entity uid="1419">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="671.15052" z="675.38483"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1420">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="659.73377" z="673.2649"/>
 			<Orientation y="2.45946"/>
 		</Entity>
 		<Entity uid="1421">
-			<Template>gaia/treasure/metal_persian_big</Template>
+			<Template>gaia/treasure/metal_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="336.07233" z="376.83265"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1422">
-			<Template>gaia/treasure/metal_persian_small</Template>
+			<Template>gaia/treasure/metal_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="344.7121" z="381.8205"/>
 			<Orientation y="-2.3853"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml b/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml
index f14e49004f..4450a0bc12 100644
--- a/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml
@@ -12188,14 +12188,14 @@
 			<Actor seed="45114"/>
 		</Entity>
 		<Entity uid="2232">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="690.03089" z="490.34974"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35156"/>
 		</Entity>
 		<Entity uid="2233">
-			<Template>gaia/treasure/food_persian_small</Template>
+			<Template>gaia/treasure/food_achaemenid_small</Template>
 			<Player>0</Player>
 			<Position x="692.88703" z="500.44495"/>
 			<Orientation y="3.10402"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
index da1aa19d12..74e5ae8877 100644
--- a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
@@ -41,7 +41,7 @@
   "AISeed": 0,
   "AllyView": false,
   "CircularMap": true,
-  "Description": "The mountains buffering the Persian homeland, straddling Persis, Susiana, and Media. This map simulates the many valleys and choke points that criss cross the mountain range. \n\nPlayers start the match nestled in their own province with 1 free Persian temple. Access to untapped resources and territories can be found through the rugged hinterlands, but is also chock full of dangerous animals, such as Asian bears and Caspian tigers.\n\nThe central valley is wide open for expansion, with an unclaimed Civic Center, farms, and Trading Posts. Cliffs along the valley's edge may offer vantage points for defensive or offensive fortifications.",
+  "Description": "The mountains buffering the achaemenid homeland, straddling Persis, Susiana, and Media. This map simulates the many valleys and choke points that criss cross the mountain range. \n\nPlayers start the match nestled in their own province with 1 free achaemenid temple. Access to untapped resources and territories can be found through the rugged hinterlands, but is also chock full of dangerous animals, such as Asian bears and Caspian tigers.\n\nThe central valley is wide open for expansion, with an unclaimed Civic Center, farms, and Trading Posts. Cliffs along the valley's edge may offer vantage points for defensive or offensive fortifications.",
   "Keywords": [],
   "LockTeams": false,
   "Name": "Zagros Mountains (2)",
@@ -9956,7 +9956,7 @@
 			<Actor seed="44623"/>
 		</Entity>
 		<Entity uid="1507">
-			<Template>structures/pers/civil_centre</Template>
+			<Template>structures/achae/civil_centre</Template>
 			<Player>0</Player>
 			<Position x="537.41742" z="499.478"/>
 			<Orientation y="2.35621"/>
@@ -11171,14 +11171,14 @@
 			<Actor seed="31141"/>
 		</Entity>
 		<Entity uid="2409">
-			<Template>structures/pers/ice_house</Template>
+			<Template>structures/achae/ice_house</Template>
 			<Player>0</Player>
 			<Position x="711.11866" z="227.73386"/>
 			<Orientation y="-3.72931"/>
 			<Actor seed="47337"/>
 		</Entity>
 		<Entity uid="2412">
-			<Template>structures/pers/ice_house</Template>
+			<Template>structures/achae/ice_house</Template>
 			<Player>0</Player>
 			<Position x="350.92975" z="746.61951"/>
 			<Orientation y="-2.97693"/>
@@ -12538,14 +12538,14 @@
 			<Actor seed="52245"/>
 		</Entity>
 		<Entity uid="2704">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="206.15537" z="833.76978"/>
 			<Orientation y="2.44053"/>
 			<Actor seed="36667"/>
 		</Entity>
 		<Entity uid="2705">
-			<Template>gaia/treasure/food_persian_big</Template>
+			<Template>gaia/treasure/food_achaemenid_big</Template>
 			<Player>0</Player>
 			<Position x="814.61689" z="213.176"/>
 			<Orientation y="0.93131"/>
@@ -22950,14 +22950,14 @@
 			<Actor seed="41784"/>
 		</Entity>
 		<Entity uid="4207">
-			<Template>structures/shrine_persian</Template>
+			<Template>structures/shrine_achaemenid</Template>
 			<Player>0</Player>
 			<Position x="508.43833" z="196.37641"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43559"/>
 		</Entity>
 		<Entity uid="4208">
-			<Template>structures/shrine_persian</Template>
+			<Template>structures/shrine_achaemenid</Template>
 			<Player>0</Player>
 			<Position x="643.43073" z="779.62513"/>
 			<Orientation y="2.35621"/>
@@ -23076,14 +23076,14 @@
 			<Actor seed="27257"/>
 		</Entity>
 		<Entity uid="4225">
-			<Template>structures/pers/sentry_tower</Template>
+			<Template>structures/achae/sentry_tower</Template>
 			<Player>0</Player>
 			<Position x="403.02347" z="371.19513"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48067"/>
 		</Entity>
 		<Entity uid="4226">
-			<Template>structures/pers/sentry_tower</Template>
+			<Template>structures/achae/sentry_tower</Template>
 			<Player>0</Player>
 			<Position x="664.63929" z="522.2295"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/simulation/ai/petra/config.js b/binaries/data/mods/public/simulation/ai/petra/config.js
index d5229c80f2..7c650e3e8a 100644
--- a/binaries/data/mods/public/simulation/ai/petra/config.js
+++ b/binaries/data/mods/public/simulation/ai/petra/config.js
@@ -58,6 +58,9 @@ export function Config(difficulty = difficultyLevel.MEDIUM, behavior)
 	this.buildings =
 		{
 			"default": [],
+			"achae": [
+				"structures/{civ}/tachara"
+			],
 			"athen": [
 				"structures/{civ}/gymnasium",
 				"structures/{civ}/prytaneion",
@@ -92,9 +95,6 @@ export function Config(difficulty = difficultyLevel.MEDIUM, behavior)
 				"structures/{civ}/palace",
 				"structures/{civ}/pillar_ashoka"
 			],
-			"pers": [
-				"structures/{civ}/tachara"
-			],
 			"ptol": [
 				"structures/{civ}/library",
 				"structures/{civ}/theater"
diff --git a/binaries/data/mods/public/simulation/components/Attack.js b/binaries/data/mods/public/simulation/components/Attack.js
index 75c42e9ebb..8b75917aa5 100644
--- a/binaries/data/mods/public/simulation/components/Attack.js
+++ b/binaries/data/mods/public/simulation/components/Attack.js
@@ -36,7 +36,7 @@ Attack.prototype.Schema =
 			"<RepeatTime>1000</RepeatTime>" +
 			"<Bonuses>" +
 				"<Bonus1>" +
-					"<Civ>pers</Civ>" +
+					"<Civ>achae</Civ>" +
 					"<Classes>Infantry</Classes>" +
 					"<Multiplier>1.5</Multiplier>" +
 				"</Bonus1>" +
diff --git a/binaries/data/mods/public/simulation/components/Builder.js b/binaries/data/mods/public/simulation/components/Builder.js
index 1f3da1b7bf..84e0adaccd 100644
--- a/binaries/data/mods/public/simulation/components/Builder.js
+++ b/binaries/data/mods/public/simulation/components/Builder.js
@@ -5,7 +5,7 @@ Builder.prototype.Schema =
 	"<a:example>" +
 		"<Rate>1.0</Rate>" +
 		"<Entities datatype='tokens'>" +
-			"\n    structures/{civ}/barracks\n    structures/{native}/civil_centre\n    structures/pers/apadana\n  " +
+			"\n    structures/{civ}/barracks\n    structures/{native}/civil_centre\n    structures/achae/apadana\n  " +
 		"</Entities>" +
 	"</a:example>" +
 	"<element name='Rate' a:help='Construction speed multiplier (1.0 is normal speed, higher values are faster).'>" +
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index 9d36b212ea..963a58c0e0 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -8,7 +8,7 @@ Identity.prototype.Schema =
 		"<SpecificName>Hoplī́tēs Athēnaïkós</SpecificName>" +
 		"<Icon>units/athen_infantry_spearman.png</Icon>" +
 	"</a:example>" +
-	"<element name='Civ' a:help='Civilization that this unit is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), skirm (skirmish map placeholders), athen (Athenians), brit (Britons), cart (Carthaginians), gaul (Gauls), han (Han Chinese), iber (Iberians), kush (Kushites), mace (Macedonians), maur (Mauryas), pers (Persians), ptol (Ptolemies), rome (Romans), sele (Seleucids), spart (Spartans).'>" +
+	"<element name='Civ' a:help='Civilization that this unit is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), skirm (skirmish map placeholders), achae (Achaemenids), athen (Athenians), brit (Britons), cart (Carthaginians), gaul (Gauls), han (Han Chinese), iber (Iberians), kush (Kushites), mace (Macedonians), maur (Mauryas), ptol (Ptolemies), rome (Romans), sele (Seleucids), spart (Spartans).'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
diff --git a/binaries/data/mods/public/simulation/data/auras/teambonuses/pers_player_teambonus.json b/binaries/data/mods/public/simulation/data/auras/teambonuses/achae_player_teambonus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/teambonuses/pers_player_teambonus.json
rename to binaries/data/mods/public/simulation/data/auras/teambonuses/achae_player_teambonus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/pers_catafalque.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/achae_catafalque.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/units/catafalques/pers_catafalque.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/achae_catafalque.json
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus_ii.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_cyrus_ii.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus_ii.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_cyrus_ii.json
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius_i.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_darius_i.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius_i.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_darius_i.json
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_xerxes_i_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_xerxes_i_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_xerxes_i_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/achae_hero_xerxes_i_2.json
diff --git a/binaries/data/mods/public/simulation/data/cheats/createHeros.json b/binaries/data/mods/public/simulation/data/cheats/createHeros.json
index f1861ba00e..9d541d4436 100644
--- a/binaries/data/mods/public/simulation/data/cheats/createHeros.json
+++ b/binaries/data/mods/public/simulation/data/cheats/createHeros.json
@@ -5,12 +5,12 @@
 		"DefaultParameter": 1,
 		"isNumeric": true,
 		"Templates": [
+			"units/achae/hero_cyrus_ii",
+			"units/achae/hero_darius_i",
+			"units/achae/hero_xerxes_i",
 			"units/cart/hero_hamilcar",
 			"units/cart/hero_hannibal",
 			"units/cart/hero_maharbal",
-			"units/pers/hero_cyrus_ii",
-			"units/pers/hero_darius_i",
-			"units/pers/hero_xerxes_i",
 			"units/rome/hero_marcellus",
 			"units/rome/hero_maximus",
 			"units/rome/hero_scipio"
diff --git a/binaries/data/mods/public/simulation/data/cheats/createUnits.json b/binaries/data/mods/public/simulation/data/cheats/createUnits.json
index 9df6f46d63..4b9e1e7b63 100644
--- a/binaries/data/mods/public/simulation/data/cheats/createUnits.json
+++ b/binaries/data/mods/public/simulation/data/cheats/createUnits.json
@@ -5,6 +5,7 @@
 		"DefaultParameter": 13,
 		"isNumeric": true,
 		"Templates": [
+			"units/achae/infantry_spearman_b",
 			"units/athen/infantry_spearman_b",
 			"units/brit/infantry_spearman_b",
 			"units/cart/infantry_spearman_b",
@@ -13,7 +14,6 @@
 			"units/kush/infantry_spearman_b",
 			"units/mace/infantry_pikeman_b",
 			"units/maur/infantry_spearman_b",
-			"units/pers/infantry_spearman_b",
 			"units/ptol/infantry_pikeman_b",
 			"units/rome/infantry_spearman_b",
 			"units/sele/infantry_spearman_b",
diff --git a/binaries/data/mods/public/simulation/data/civs/pers.json b/binaries/data/mods/public/simulation/data/civs/achae.json
similarity index 64%
rename from binaries/data/mods/public/simulation/data/civs/pers.json
rename to binaries/data/mods/public/simulation/data/civs/achae.json
index a515942116..25dfa6eb9c 100644
--- a/binaries/data/mods/public/simulation/data/civs/pers.json
+++ b/binaries/data/mods/public/simulation/data/civs/achae.json
@@ -1,6 +1,6 @@
 {
-	"Code": "pers",
-	"Culture": "pers",
+	"Code": "achae",
+	"Culture": "achae",
 	"Music": [
 		{
 			"File": "Eastern_Dreams.ogg",
@@ -32,37 +32,37 @@
 		},
 		{
 			"Name": "Times of War",
-			"History": "The Persians were known for their large cavalry contingent.",
+			"History": "The Achaemenids were known for their large cavalry contingent.",
 			"Description": "The batch training time of units trained in Stables decreases each phase advance."
 		},
 		{
 			"Name": "Satrapy Tribute",
-			"History": "The empire was divided into provinces, called “Satrapies,” that sent yearly tribute to the ruling Persian dynasty in Persepolis as a form of tax.",
-			"Description": "Upgrade the Throne Hall to receive a free trickle of a desired resource."
+			"History": "The empire was divided into provinces, called “Satrapies,” that sent yearly tribute to the ruling Achaemenid dynasty in Persepolis as a form of tax.",
+			"Description": "Upgrade the Winter Palace to receive a free trickle of a desired resource."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
-		"structures/pers/wallset_stone"
+		"structures/achae/wallset_stone"
 	],
 	"StartEntities": [
 		{
-			"Template": "structures/pers/civil_centre"
+			"Template": "structures/achae/civil_centre"
 		},
 		{
-			"Template": "units/pers/support_civilian",
+			"Template": "units/achae/support_civilian",
 			"Count": 4
 		},
 		{
-			"Template": "units/pers/infantry_spearman_b",
+			"Template": "units/achae/infantry_spearman_b",
 			"Count": 2
 		},
 		{
-			"Template": "units/pers/infantry_archer_b",
+			"Template": "units/achae/infantry_archer_b",
 			"Count": 2
 		},
 		{
-			"Template": "units/pers/cavalry_javelineer_b"
+			"Template": "units/achae/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
@@ -77,7 +77,7 @@
 		"Xsayarsa II"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/pers/infantry_archer_b",
+		"skirmish/units/default_infantry_ranged_b": "units/achae/infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
diff --git a/binaries/data/mods/public/simulation/data/settings/player_defaults.json b/binaries/data/mods/public/simulation/data/settings/player_defaults.json
index 124f90aa00..990d637547 100644
--- a/binaries/data/mods/public/simulation/data/settings/player_defaults.json
+++ b/binaries/data/mods/public/simulation/data/settings/player_defaults.json
@@ -59,7 +59,7 @@
 		},
 		{
 			"Name": "Player 7",
-			"Civ": "pers",
+			"Civ": "achae",
 			"Color": { "r": 220, "g": 115, "b": 16 },
 			"AI": "petra",
 			"AIDiff": 3,
diff --git a/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json b/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
index 308fdf3d97..daa49cfd3b 100644
--- a/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
+++ b/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
@@ -12,7 +12,7 @@
 				"any": [
 					{ "civ": "kush" },
 					{ "civ": "maur" },
-					{ "civ": "pers" }
+					{ "civ": "achae" }
 				]
 			}
 		]
diff --git a/binaries/data/mods/public/simulation/data/technologies/architecture_pers.json b/binaries/data/mods/public/simulation/data/technologies/architecture_achae.json
similarity index 66%
rename from binaries/data/mods/public/simulation/data/technologies/architecture_pers.json
rename to binaries/data/mods/public/simulation/data/technologies/architecture_achae.json
index 3420b9d18f..1fd7ff2c24 100644
--- a/binaries/data/mods/public/simulation/data/technologies/architecture_pers.json
+++ b/binaries/data/mods/public/simulation/data/technologies/architecture_achae.json
@@ -1,6 +1,6 @@
 {
 	"genericName": "Achaemenid Architecture",
-	"description": "The Persians built the wonderful 1677 mile-long Royal Highway from Sardis to Susa; Darius the Great and Xerxes also built the magnificent Persepolis; Cyrus the Great greatly improved Ecbatana and virtually 'rebuilt' the old Elamite capital of Susa.",
+	"description": "The Achaemenids built the wonderful 1677 mile-long Royal Highway from Sardis to Susa; Darius the Great and Xerxes also built the magnificent Persepolis; Cyrus the Great greatly improved Ecbatana and virtually 'rebuilt' the old Elamite capital of Susa.",
 	"cost": {
 		"wood": 200,
 		"stone": 200
@@ -8,7 +8,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_village" },
-			{ "civ": "pers" }
+			{ "civ": "achae" }
 		]
 	},
 	"icon": "stone_blocks.png",
diff --git a/binaries/data/mods/public/simulation/data/technologies/architecture_kush.json b/binaries/data/mods/public/simulation/data/technologies/architecture_kush.json
index 20e0c4ccd7..85be7234c7 100644
--- a/binaries/data/mods/public/simulation/data/technologies/architecture_kush.json
+++ b/binaries/data/mods/public/simulation/data/technologies/architecture_kush.json
@@ -10,7 +10,7 @@
 		]
 	},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "pers_hundred_columns.png",
+	"icon": "stone_blocks.png",
 	"researchTime": 60,
 	"tooltip": "Civic Structures +20% build time, +20% health, and +20% capture points.",
 	"modifications": [
diff --git a/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json b/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
index fc72fc3b64..b39646b35b 100644
--- a/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
+++ b/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
@@ -7,7 +7,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "notciv": "pers" }
+			{ "notciv": "achae" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/civbonuses/achae_population.json b/binaries/data/mods/public/simulation/data/technologies/civbonuses/achae_population.json
new file mode 100644
index 0000000000..495ed91e51
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/civbonuses/achae_population.json
@@ -0,0 +1,11 @@
+{
+	"genericName": "Great King's Levy",
+	"autoResearch": true,
+	"description": "The Achaemenids could and did levy a large number of infantry during wartime due to the sheer size of the Achaemenid Empire and the way in which it was set-up. In general the Achaemenid infantry was well trained and fought with great tenacity. However while this was true the infantry were poor hand-to-hand, close combat fighters. Also, with the exception of the elite regiments, the Achaemenid infantry was not a standing professional force.",
+	"requirements": { "civ": "achae" },
+	"icon": "population.png",
+	"tooltip": "+10% maximum population limit.",
+	"modifications": [
+		{ "value": "Player/MaxPopulation", "multiply": 1.1 }
+	]
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/civbonuses/pers_population.json b/binaries/data/mods/public/simulation/data/technologies/civbonuses/pers_population.json
deleted file mode 100644
index 1c3f29e94a..0000000000
--- a/binaries/data/mods/public/simulation/data/technologies/civbonuses/pers_population.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"genericName": "Great King's Levy",
-	"autoResearch": true,
-	"description": "The Persians could and did levy a large number of infantry during wartime due to the sheer size of the Achaemenid Empire and the way in which it was set-up. In general the Persian infantry was well trained and fought with great tenacity. However while this was true the infantry were poor hand-to-hand, close combat fighters. Also, with the exception of the elite regiments, the Persian infantry was not a standing professional force.",
-	"requirements": { "civ": "pers" },
-	"icon": "population.png",
-	"tooltip": "+10% maximum population limit.",
-	"modifications": [
-		{ "value": "Player/MaxPopulation", "multiply": 1.1 }
-	]
-}
diff --git a/binaries/data/mods/public/simulation/data/technologies/equine_transports.json b/binaries/data/mods/public/simulation/data/technologies/equine_transports.json
index 517f015f97..04eb30bd64 100644
--- a/binaries/data/mods/public/simulation/data/technologies/equine_transports.json
+++ b/binaries/data/mods/public/simulation/data/technologies/equine_transports.json
@@ -1,6 +1,6 @@
 {
 	"genericName": "Equine Transports",
-	"description": "Early Achaemenid rulers acted towards making Persia the first great Asian empire to rule the seas. The Great King behaved favourably towards the various sea peoples in order to secure their services, but also carried out various marine initiatives. During the reign of Darius the Great, for example, a canal was built in Egypt and a Persian navy was sent exploring the Indus river. According to Herodotus, some 300 ships in the Persian navy were retrofitted to carry horses and their riders.",
+	"description": "Early Achaemenid rulers acted towards making Persia the first great Asian empire to rule the seas. The Great King behaved favourably towards the various sea peoples in order to secure their services, but also carried out various marine initiatives. During the reign of Darius the Great, for example, a canal was built in Egypt and an Achaemenid navy was sent exploring the Indus river. According to Herodotus, some 300 ships in the Achaemenid navy were retrofitted to carry horses and their riders.",
 	"cost": {
 		"wood": 300,
 		"metal": 300
@@ -9,7 +9,7 @@
 		"all": [
 			{ "tech": "phase_city" },
 			{ "tech": "dock_efficiency" },
-			{ "civ": "pers" }
+			{ "civ": "achae" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase. Requires “Shipwrights.”",
diff --git a/binaries/data/mods/public/simulation/data/technologies/immortals.json b/binaries/data/mods/public/simulation/data/technologies/immortals.json
index ae52e93aac..17c70bff25 100644
--- a/binaries/data/mods/public/simulation/data/technologies/immortals.json
+++ b/binaries/data/mods/public/simulation/data/technologies/immortals.json
@@ -8,7 +8,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "civ": "pers" }
+			{ "civ": "achae" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json b/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
index b0dba696bc..ff0f61895f 100644
--- a/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
+++ b/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
@@ -14,7 +14,7 @@
 			{ "tech": "unlock_champion_cavalry" },
 			{
 				"any": [
-					{ "civ": "pers" },
+					{ "civ": "achae" },
 					{ "civ": "sele" }
 				]
 			}
diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_pers.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_achae.json
similarity index 77%
rename from binaries/data/mods/public/simulation/data/technologies/phase_city_pers.json
rename to binaries/data/mods/public/simulation/data/technologies/phase_city_achae.json
index 88ab07d918..a37e06dccd 100644
--- a/binaries/data/mods/public/simulation/data/technologies/phase_city_pers.json
+++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_achae.json
@@ -1,7 +1,7 @@
 {
 	"genericName": "City Phase",
-	"specificName": { "pers": "Vazaraka Vardana"},
-	"description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology. This is the Persian city phase.\nThe 'Times of War' bonus decreases the batch training time in Stables. Large batches will benefit more than small batches.\nIn mathematical terms: The training time of one batch gets divided by `batchSize^0.1`.",
+	"specificName": { "achae": "Vazaraka Vardana"},
+	"description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology. This is the Achaemenid city phase.\nThe 'Times of War' bonus decreases the batch training time in Stables. Large batches will benefit more than small batches.\nIn mathematical terms: The training time of one batch gets divided by `batchSize^0.1`.",
 	"cost": {
 		"stone": 750,
 		"metal": 750
@@ -13,7 +13,7 @@
 		}
 	},
 	"requirementsTooltip": "Requires three Town Structures.",
-	"supersedes": "phase_town_pers",
+	"supersedes": "phase_town_achae",
 	"replaces": ["phase_city"],
 	"icon": "city_phase.png",
 	"researchTime": 60,
diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town_pers.json b/binaries/data/mods/public/simulation/data/technologies/phase_town_achae.json
similarity index 97%
rename from binaries/data/mods/public/simulation/data/technologies/phase_town_pers.json
rename to binaries/data/mods/public/simulation/data/technologies/phase_town_achae.json
index 06de370835..545397fd97 100644
--- a/binaries/data/mods/public/simulation/data/technologies/phase_town_pers.json
+++ b/binaries/data/mods/public/simulation/data/technologies/phase_town_achae.json
@@ -1,6 +1,6 @@
 {
 	"genericName": "Town Phase",
-	"specificName": {"pers": "Vardana"},
+	"specificName": {"achae": "Vardana"},
 	"description": "Advances from a small village to a bustling town, ready to expand rapidly. This is the Persian town phase.\nThe 'Times of War' bonus dercreases the batch training time in Stables. Large batches will benefit more than small batches.\nIn mathematical terms: The training time of one batch gets divided by `batchSize^0.1`.",
 	"cost": {
 		"food": 500,
diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_village.json b/binaries/data/mods/public/simulation/data/technologies/phase_village.json
index c4aaa0b193..65a11c1928 100644
--- a/binaries/data/mods/public/simulation/data/technologies/phase_village.json
+++ b/binaries/data/mods/public/simulation/data/technologies/phase_village.json
@@ -1,6 +1,7 @@
 {
 	"genericName": "Village Phase",
 	"specificName": {
+		"achae": "Āvahana",
 		"athen": "Kōmē",
 		"brit": "Ialon",
 		"cart": "Kapr",
@@ -11,7 +12,6 @@
 		"kush": "Wḥyt",
 		"mace": "Kōmē",
 		"maur": "Gāma",
-		"pers": "Āvahana",
 		"ptol": "Kōmē",
 		"rome": "Vicus",
 		"sele": "Kōmē",
diff --git a/binaries/data/mods/public/simulation/data/technologies/pop_house_01.json b/binaries/data/mods/public/simulation/data/technologies/pop_house_01.json
index 1f7fdee180..d04c9cb56f 100644
--- a/binaries/data/mods/public/simulation/data/technologies/pop_house_01.json
+++ b/binaries/data/mods/public/simulation/data/technologies/pop_house_01.json
@@ -1,9 +1,9 @@
 {
 	"genericName": "Home Garden",
 	"specificName": {
+		"achae": "Paradaidām",
 		"athen": "Peristylon",
 		"mace": "Peristylon",
-		"pers": "Paradaidām",
 		"ptol": "Peristylon",
 		"rome": "Peristylium",
 		"sele": "Peristylon",
diff --git a/binaries/data/mods/public/simulation/data/technologies/ship_capture_resistance.json b/binaries/data/mods/public/simulation/data/technologies/ship_capture_resistance.json
index e07a33078c..cc1d25553e 100644
--- a/binaries/data/mods/public/simulation/data/technologies/ship_capture_resistance.json
+++ b/binaries/data/mods/public/simulation/data/technologies/ship_capture_resistance.json
@@ -1,10 +1,10 @@
 {
 	"genericName": "Marines",
 	"specificName": {
+		"achae": "Epibatai",
 		"athen": "Epibatai",
 		"cart": "Epibatai",
 		"mace": "Epibatai",
-		"pers": "Epibatai",
 		"ptol": "Epibatai",
 		"sele": "Epibatai",
 		"spart": "Epibatai"
diff --git a/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json b/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json
index a9b2ae53d9..6f951685d5 100644
--- a/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json
+++ b/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json
@@ -12,7 +12,7 @@
 			{
 				"any": [
 					{ "civ": "cart" },
-					{ "civ": "pers" }
+					{ "civ": "achae" }
 				]
 			}
 		]
diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json b/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json
index b36359cef6..666a8c7f0f 100644
--- a/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json
+++ b/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json
@@ -8,13 +8,13 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
+			{ "notciv": "achae" },
 			{ "notciv": "brit" },
 			{ "notciv": "germ" },
 			{ "notciv": "gaul" },
 			{ "notciv": "iber" },
 			{ "notciv": "kush" },
 			{ "notciv": "maur" },
-			{ "notciv": "pers" },
 			{ "notciv": "sele" }
 		]
 	},
diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json b/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json
index b309d51354..e229b07b35 100644
--- a/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json
+++ b/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json
@@ -7,13 +7,13 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
+			{ "notciv": "achae" },
 			{ "notciv": "brit" },
 			{ "notciv": "germ" },
 			{ "notciv": "gaul" },
 			{ "notciv": "iber" },
 			{ "notciv": "maur" },
-			{ "notciv": "kush" },
-			{ "notciv": "pers" }
+			{ "notciv": "kush" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json b/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
index 92dcf124a6..3303222879 100644
--- a/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
+++ b/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
@@ -7,7 +7,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "notciv": "pers" }
+			{ "notciv": "achae" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/subterranean_aqueducts.json b/binaries/data/mods/public/simulation/data/technologies/subterranean_aqueducts.json
index a1f83d9b52..430818ad6c 100644
--- a/binaries/data/mods/public/simulation/data/technologies/subterranean_aqueducts.json
+++ b/binaries/data/mods/public/simulation/data/technologies/subterranean_aqueducts.json
@@ -1,7 +1,7 @@
 {
 	"genericName": "Subterranean Aqueducts",
 	"specificName": {
-		"pers": "Kārēz"
+		"achae": "Kārēz"
 	},
 	"description": "Qanāt or Kārēz, a network of underground aqueducts connected to the yakhchal ice house.",
 	"cost": {
@@ -11,7 +11,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "civ": "pers" }
+			{ "civ": "achae" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json
index a0c61982e9..d64bcdc6a4 100644
--- a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json
+++ b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json
@@ -11,7 +11,7 @@
 				"any": [
 					{ "civ": "brit" },
 					{ "civ": "maur" },
-					{ "civ": "pers" },
+					{ "civ": "achae" },
 					{ "civ": "sele" }
 				]
 			}
diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json b/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json
index e19a7975e0..85977a1817 100644
--- a/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json
+++ b/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json
@@ -9,6 +9,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_village" },
+			{ "notciv": "achae" },
 			{ "notciv": "athen" },
 			{ "notciv": "brit" },
 			{ "notciv": "cart" },
@@ -18,7 +19,6 @@
 			{ "notciv": "iber" },
 			{ "notciv": "mace" },
 			{ "notciv": "maur" },
-			{ "notciv": "pers" },
 			{ "notciv": "ptol" },
 			{ "notciv": "rome" },
 			{ "notciv": "sele" },
diff --git a/binaries/data/mods/public/simulation/data/technologies/warship_fireship_attack.json b/binaries/data/mods/public/simulation/data/technologies/warship_fireship_attack.json
index aa50a331f2..92cdade586 100644
--- a/binaries/data/mods/public/simulation/data/technologies/warship_fireship_attack.json
+++ b/binaries/data/mods/public/simulation/data/technologies/warship_fireship_attack.json
@@ -8,13 +8,13 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
+			{ "notciv": "achae" },
 			{ "notciv": "athen" },
 			{ "notciv": "cart" },
 			{ "notciv": "han" },
 			{ "notciv": "kush" },
 			{ "notciv": "mace" },
 			{ "notciv": "maur" },
-			{ "notciv": "pers" },
 			{ "notciv": "ptol" },
 			{ "notciv": "rome" },
 			{ "notciv": "sele" },
diff --git a/binaries/data/mods/public/simulation/data/technologies/warship_health.json b/binaries/data/mods/public/simulation/data/technologies/warship_health.json
index 1154c9fd77..f61b698453 100644
--- a/binaries/data/mods/public/simulation/data/technologies/warship_health.json
+++ b/binaries/data/mods/public/simulation/data/technologies/warship_health.json
@@ -1,10 +1,10 @@
 {
 	"genericName": "Undergirding Cables",
 	"specificName": {
+		"achae": "Hypozomata",
 		"athen": "Hypozomata",
 		"cart": "Hypozomata",
 		"mace": "Hypozomata",
-		"pers": "Hypozomata",
 		"ptol": "Hypozomata",
 		"sele": "Hypozomata",
 		"spart": "Hypozomata"
diff --git a/binaries/data/mods/public/simulation/data/technologies/warship_ramming_attack.json b/binaries/data/mods/public/simulation/data/technologies/warship_ramming_attack.json
index 7bbc13ebde..c5cfb37cb6 100644
--- a/binaries/data/mods/public/simulation/data/technologies/warship_ramming_attack.json
+++ b/binaries/data/mods/public/simulation/data/technologies/warship_ramming_attack.json
@@ -1,10 +1,10 @@
 {
 	"genericName": "Bronze Ram",
 	"specificName": {
+		"achae": "Embolon",
 		"athen": "Embolon",
 		"cart": "Embolon",
 		"mace": "Embolon",
-		"pers": "Embolon",
 		"ptol": "Embolon",
 		"sele": "Embolon",
 		"spart": "Embolon"
diff --git a/binaries/data/mods/public/simulation/data/technologies/warship_siege_attack.json b/binaries/data/mods/public/simulation/data/technologies/warship_siege_attack.json
index 885f20be24..b458ebf181 100644
--- a/binaries/data/mods/public/simulation/data/technologies/warship_siege_attack.json
+++ b/binaries/data/mods/public/simulation/data/technologies/warship_siege_attack.json
@@ -8,6 +8,7 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
+			{ "notciv": "achae" },
 			{ "notciv": "athen" },
 			{ "notciv": "brit" },
 			{ "notciv": "gaul" },
@@ -16,7 +17,6 @@
 			{ "notciv": "kush" },
 			{ "notciv": "mace" },
 			{ "notciv": "maur" },
-			{ "notciv": "pers" },
 			{ "notciv": "spart" },
 			{ "notciv": "germ" }
 		]
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_achaemenid_lamassu.xml
similarity index 87%
rename from binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml
rename to binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_achaemenid_lamassu.xml
index 9a393d3b86..59dbfee020 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_achaemenid_lamassu.xml
@@ -14,6 +14,6 @@
     <Max>500</Max>
   </ResourceSupply>
   <VisualActor>
-    <Actor>structures/persians/lamassu_ruin.xml</Actor>
+    <Actor>structures/achaemenids/lamassu_ruin.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_achaemenid_big.xml
similarity index 86%
rename from binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
rename to binaries/data/mods/public/simulation/templates/gaia/treasure/food_achaemenid_big.xml
index afdb8ec06b..40b19f7f87 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_achaemenid_big.xml
@@ -17,6 +17,6 @@
     </Resources>
   </Treasure>
   <VisualActor>
-    <Actor>props/special/eyecandy/treasure_persian_food_big.xml</Actor>
+    <Actor>props/special/eyecandy/treasure_achaemenid_food_big.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_achaemenid_small.xml
similarity index 86%
rename from binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
rename to binaries/data/mods/public/simulation/templates/gaia/treasure/food_achaemenid_small.xml
index 6e87c2b5d3..4cf58e7866 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_achaemenid_small.xml
@@ -17,6 +17,6 @@
     </Resources>
   </Treasure>
   <VisualActor>
-    <Actor>props/special/eyecandy/treasure_persian_food_small.xml</Actor>
+    <Actor>props/special/eyecandy/treasure_achaemenid_food_small.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_achaemenid_big.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
rename to binaries/data/mods/public/simulation/templates/gaia/treasure/metal_achaemenid_big.xml
index 33897f9dcd..75997613c4 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_achaemenid_big.xml
@@ -21,6 +21,6 @@
     </Resources>
   </Treasure>
   <VisualActor>
-    <Actor>props/special/eyecandy/treasure_persian_metal_big.xml</Actor>
+    <Actor>props/special/eyecandy/treasure_achaemenid_metal_big.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_achaemenid_small.xml
similarity index 87%
rename from binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
rename to binaries/data/mods/public/simulation/templates/gaia/treasure/metal_achaemenid_small.xml
index ab92bbe98d..841c32a03d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_achaemenid_small.xml
@@ -21,6 +21,6 @@
     </Resources>
   </Treasure>
   <VisualActor>
-    <Actor>props/special/eyecandy/treasure_persian_metal_small.xml</Actor>
+    <Actor>props/special/eyecandy/treasure_achaemenid_metal_small.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_pers_cc.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_achae_cc.xml
similarity index 69%
rename from binaries/data/mods/public/simulation/templates/rubble/rubble_pers_cc.xml
rename to binaries/data/mods/public/simulation/templates/rubble/rubble_achae_cc.xml
index c72110eed5..554dcfffe4 100644
--- a/binaries/data/mods/public/simulation/templates/rubble/rubble_pers_cc.xml
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_achae_cc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_rubble">
   <VisualActor>
-    <Actor>structures/destruct_pers_cc.xml</Actor>
+    <Actor>structures/destruct_achae_cc.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_pers_dock.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_achae_dock.xml
similarity index 65%
rename from binaries/data/mods/public/simulation/templates/rubble/rubble_pers_dock.xml
rename to binaries/data/mods/public/simulation/templates/rubble/rubble_achae_dock.xml
index 0df5a702c2..f1165ac17a 100644
--- a/binaries/data/mods/public/simulation/templates/rubble/rubble_pers_dock.xml
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_achae_dock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_rubble">
   <VisualActor>
-    <Actor>structures/destruct_pers_dock_rubble.xml</Actor>
+    <Actor>structures/destruct_achae_dock_rubble.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/achae.xml b/binaries/data/mods/public/simulation/templates/special/players/achae.xml
new file mode 100644
index 0000000000..02f98cc95c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/special/players/achae.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_player">
+  <Auras datatype="tokens">
+    teambonuses/achae_player_teambonus
+  </Auras>
+  <Identity>
+    <Civ>achae</Civ>
+    <GenericName>Achaemenids</GenericName>
+    <History>The Achaemenid Empire, also known as the first Persian Empire, was one of the greatest empires of antiquity, stretching at its zenith from the Indus Valley in the east to Greece in the west. The Achaemenids were the pioneers of empire-building of the ancient world, successfully imposing a centralized rule over various peoples with different customs, laws, religions and languages, and building a cosmopolitan army made up of contingents from each of these nations.</History>
+    <Icon>emblems/emblem_achaemenids.png</Icon>
+  </Identity>
+  <Player>
+    <Formations datatype="tokens">
+      special/formations/phalanx
+    </Formations>
+  </Player>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/athen.xml b/binaries/data/mods/public/simulation/templates/special/players/athen.xml
index 74cc5b8e0b..487350640f 100644
--- a/binaries/data/mods/public/simulation/templates/special/players/athen.xml
+++ b/binaries/data/mods/public/simulation/templates/special/players/athen.xml
@@ -6,7 +6,7 @@
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Athenians</GenericName>
-    <History>The Greek city-state of Athens is remembered as a famed center for the arts, learning, and philosophy, as well as one of the earliest forms of democracy. That wasn't to say that they weren't warriors. Athens at its height had one of the most powerful navies in the ancient world and through conquering and colonizing built a vast empire.\nAncient Athens rose to an imperial power after defeating the invading Persians twice in the early fifth century BC and fell in 338 BC, when they lost the Battle of Chaeronea to King Philip II of Macedonia. While after that it never rose again to power, Athens still was renowned for its learning and its scholars were well sought out as teachers.</History>
+    <History>The Greek city-state of Athens is remembered as a famed center for the arts, learning, and philosophy, as well as one of the earliest forms of democracy. That wasn't to say that they weren't warriors. Athens at its height had one of the most powerful navies in the ancient world and through conquering and colonizing built a vast empire.\nAncient Athens rose to an imperial power after defeating the invading Achaemenid Persians twice in the early fifth century BC and fell in 338 BC, when they lost the Battle of Chaeronea to King Philip II of Macedonia. While after that it never rose again to power, Athens still was renowned for its learning and its scholars were well sought out as teachers.</History>
     <Icon>emblems/emblem_athenians.png</Icon>
   </Identity>
   <Player>
diff --git a/binaries/data/mods/public/simulation/templates/special/players/pers.xml b/binaries/data/mods/public/simulation/templates/special/players/pers.xml
deleted file mode 100644
index c2487b38d2..0000000000
--- a/binaries/data/mods/public/simulation/templates/special/players/pers.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
-  <Auras datatype="tokens">
-    teambonuses/pers_player_teambonus
-  </Auras>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Persians</GenericName>
-    <History>The Persian Empire, when ruled by the Achaemenid dynasty, was one of the greatest empires of antiquity, stretching at its zenith from the Indus Valley in the east to Greece in the west. The Persians were the pioneers of empire-building of the ancient world, successfully imposing a centralized rule over various peoples with different customs, laws, religions and languages, and building a cosmopolitan army made up of contingents from each of these nations.</History>
-    <Icon>emblems/emblem_persians.png</Icon>
-  </Identity>
-  <Player>
-    <Formations datatype="tokens">
-      special/formations/phalanx
-    </Formations>
-  </Player>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/rallypoints/pers.xml b/binaries/data/mods/public/simulation/templates/special/rallypoints/achae.xml
similarity index 84%
rename from binaries/data/mods/public/simulation/templates/special/rallypoints/pers.xml
rename to binaries/data/mods/public/simulation/templates/special/rallypoints/achae.xml
index 93c05b0375..7fac539bcd 100644
--- a/binaries/data/mods/public/simulation/templates/special/rallypoints/pers.xml
+++ b/binaries/data/mods/public/simulation/templates/special/rallypoints/achae.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/rallypoint">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
   </Identity>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/apartment_block.xml b/binaries/data/mods/public/simulation/templates/structures/achae/apartment_block.xml
similarity index 85%
rename from binaries/data/mods/public/simulation/templates/structures/pers/apartment_block.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/apartment_block.xml
index ebb9e2810b..ffd32d1a65 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/apartment_block.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/apartment_block.xml
@@ -8,7 +8,7 @@
     <Max>2000</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Apartment Block</SpecificName>
   </Identity>
   <Obstruction>
@@ -21,6 +21,6 @@
     <Radius>25</Radius>
   </TerritoryInfluence>
   <VisualActor>
-    <Actor>props/structures/persians/alt_building_03.xml</Actor>
+    <Actor>props/structures/achaemenids/alt_building_03.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/arsenal.xml b/binaries/data/mods/public/simulation/templates/structures/achae/arsenal.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/structures/pers/arsenal.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/arsenal.xml
index aaa64bafbf..546646269d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/arsenal.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/arsenal.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_arsenal">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/workshop.xml</Actor>
+    <Actor>structures/achaemenids/workshop.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml b/binaries/data/mods/public/simulation/templates/structures/achae/barracks.xml
similarity index 82%
rename from binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/barracks.xml
index d4fcfb6776..33b9bbde52 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/barracks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Padgan</SpecificName>
   </Identity>
   <Trainer>
@@ -11,6 +11,6 @@
     </Entities>
   </Trainer>
   <VisualActor>
-    <Actor>structures/persians/barracks.xml</Actor>
+    <Actor>structures/achaemenids/barracks.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/achae/civil_centre.xml
similarity index 91%
rename from binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/civil_centre.xml
index d613389fec..3067563a30 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/civil_centre.xml
@@ -8,7 +8,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <GenericName>Provincial Governor</GenericName>
     <SpecificName>Xšaçapāvan</SpecificName>
   </Identity>
@@ -17,7 +17,7 @@
   </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
-      architecture_pers
+      architecture_achae
     </Technologies>
   </Researcher>
   <Trainer>
@@ -33,7 +33,7 @@
     </Entities>
   </Trainer>
   <VisualActor>
-    <Actor>structures/persians/civil_centre.xml</Actor>
+    <Actor>structures/achaemenids/civil_centre.xml</Actor>
     <FoundationActor>structures/fndn_9x7.xml</FoundationActor>
     <SelectionShape>
       <Footprint/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/corral.xml b/binaries/data/mods/public/simulation/templates/structures/achae/corral.xml
similarity index 87%
rename from binaries/data/mods/public/simulation/templates/structures/pers/corral.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/corral.xml
index f8cf399044..601d74cc92 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/corral.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/corral.xml
@@ -7,14 +7,14 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Gaiāšta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="18.0" depth="11.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/corral.xml</Actor>
+    <Actor>structures/achaemenids/corral.xml</Actor>
     <FoundationActor>structures/fndn_5x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/achae/defense_tower.xml
similarity index 77%
rename from binaries/data/mods/public/simulation/templates/structures/pers/defense_tower.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/defense_tower.xml
index a5875224dc..a8edd3b361 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/defense_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/defense_tower.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_tower_stone">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Pāyaud</SpecificName>
   </Identity>
   <StatusBars>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <VisualActor>
-    <Actor>structures/persians/scout_tower.xml</Actor>
+    <Actor>structures/achaemenids/scout_tower.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml b/binaries/data/mods/public/simulation/templates/structures/achae/dock.xml
similarity index 72%
rename from binaries/data/mods/public/simulation/templates/structures/pers/dock.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/dock.xml
index 19d2993780..7cc4a652e9 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/dock.xml
@@ -5,16 +5,16 @@
     <Height>8.0</Height>
   </Footprint>
   <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_pers_dock</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>decay|rubble/rubble_achae_dock</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Nāvašta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="23.0" depth="15.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/dock.xml</Actor>
+    <Actor>structures/achaemenids/dock.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml b/binaries/data/mods/public/simulation/templates/structures/achae/elephant_stable.xml
similarity index 67%
rename from binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/elephant_stable.xml
index e09ac57164..86dea5f42f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/elephant_stable.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_elephant_stable">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/stable_elephant.xml</Actor>
+    <Actor>structures/achaemenids/stable_elephant.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/achae/farmstead.xml
similarity index 82%
rename from binaries/data/mods/public/simulation/templates/structures/pers/farmstead.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/farmstead.xml
index be3afcb516..e571fe2271 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/farmstead.xml
@@ -4,13 +4,13 @@
     <Square width="20.0" depth="20.0"/>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Kaštašta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/farmstead.xml</Actor>
+    <Actor>structures/achaemenids/farmstead.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/field.xml b/binaries/data/mods/public/simulation/templates/structures/achae/field.xml
similarity index 92%
rename from binaries/data/mods/public/simulation/templates/structures/pers/field.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/field.xml
index 31688bb70a..64023ee6de 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/field.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/field.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_field">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Kaštrya</SpecificName>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/forge.xml b/binaries/data/mods/public/simulation/templates/structures/achae/forge.xml
similarity index 72%
rename from binaries/data/mods/public/simulation/templates/structures/pers/forge.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/forge.xml
index b78c885150..906b21d38c 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/forge.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/forge.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_forge">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Arštišta</SpecificName>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/blacksmith.xml</Actor>
+    <Actor>structures/achaemenids/blacksmith.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml b/binaries/data/mods/public/simulation/templates/structures/achae/fortress.xml
similarity index 78%
rename from binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/fortress.xml
index 2248ecd2e6..967c91a42b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/fortress.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Didā</SpecificName>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/fortress.xml</Actor>
+    <Actor>structures/achaemenids/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.5</Length>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/hall.xml b/binaries/data/mods/public/simulation/templates/structures/achae/hall.xml
similarity index 91%
rename from binaries/data/mods/public/simulation/templates/structures/pers/hall.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/hall.xml
index 370873d512..4ad55f41a2 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/hall.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/hall.xml
@@ -19,11 +19,11 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <GenericName>Gate of All Nations</GenericName>
     <SpecificName>Duvarθi Visadahyu</SpecificName>
     <VisibleClasses datatype="tokens">Hall</VisibleClasses>
-    <Icon>structures/pers_hall.png</Icon>
+    <Icon>structures/achae_hall.png</Icon>
   </Identity>
   <Loot>
     <stone>50</stone>
@@ -48,7 +48,7 @@
     <Range>40</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/persians/hall.xml</Actor>
+    <Actor>structures/achaemenids/hall.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/house.xml b/binaries/data/mods/public/simulation/templates/structures/achae/house.xml
similarity index 82%
rename from binaries/data/mods/public/simulation/templates/structures/pers/house.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/house.xml
index a682f4942b..e299cde90e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/house.xml
@@ -4,13 +4,13 @@
     <Square width="15.0" depth="16.0"/>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Huvādā</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="13.0" depth="14.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/house.xml</Actor>
+    <Actor>structures/achaemenids/house.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/house_a.xml b/binaries/data/mods/public/simulation/templates/structures/achae/house_a.xml
similarity index 82%
rename from binaries/data/mods/public/simulation/templates/structures/pers/house_a.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/house_a.xml
index 63229d4507..f4df503ad0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/house_a.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/house_a.xml
@@ -8,13 +8,13 @@
     <Max>1000</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>House</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="17.0" depth="12.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>props/structures/persians/alt_building_02.xml</Actor>
+    <Actor>props/structures/achaemenids/alt_building_02.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/house_b.xml b/binaries/data/mods/public/simulation/templates/structures/achae/house_b.xml
similarity index 83%
rename from binaries/data/mods/public/simulation/templates/structures/pers/house_b.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/house_b.xml
index 4a2c7cf7c5..78c90a2692 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/house_b.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/house_b.xml
@@ -8,7 +8,7 @@
     <Max>1200</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Inn</SpecificName>
   </Identity>
   <Obstruction>
@@ -18,6 +18,6 @@
     <Bonus>10</Bonus>
   </Population>
   <VisualActor>
-    <Actor>props/structures/persians/alt_building_05.xml</Actor>
+    <Actor>props/structures/achaemenids/alt_building_05.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml b/binaries/data/mods/public/simulation/templates/structures/achae/ice_house.xml
similarity index 96%
rename from binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/ice_house.xml
index af06de2360..e35a87ecfb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/ice_house.xml
@@ -21,7 +21,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <GenericName>Ice House</GenericName>
     <SpecificName>Yakhchāl</SpecificName>
     <VisibleClasses datatype="tokens">-City Village IceHouse</VisibleClasses>
@@ -68,7 +68,7 @@
     <Range>20</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/persians/ice_house.xml</Actor>
+    <Actor>structures/achaemenids/ice_house.xml</Actor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/inn.xml b/binaries/data/mods/public/simulation/templates/structures/achae/inn.xml
similarity index 85%
rename from binaries/data/mods/public/simulation/templates/structures/pers/inn.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/inn.xml
index c5d1261c03..9de6e24a14 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/inn.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/inn.xml
@@ -8,7 +8,7 @@
     <Max>2500</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Inn</SpecificName>
   </Identity>
   <Obstruction>
@@ -21,6 +21,6 @@
     <Radius>26</Radius>
   </TerritoryInfluence>
   <VisualActor>
-    <Actor>props/structures/persians/alt_building_04.xml</Actor>
+    <Actor>props/structures/achaemenids/alt_building_04.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/market.xml b/binaries/data/mods/public/simulation/templates/structures/achae/market.xml
similarity index 87%
rename from binaries/data/mods/public/simulation/templates/structures/pers/market.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/market.xml
index dc47352835..d8614520b5 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/market.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/market.xml
@@ -8,14 +8,14 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Ardatašta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/market.xml</Actor>
+    <Actor>structures/achaemenids/market.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/outpost.xml b/binaries/data/mods/public/simulation/templates/structures/achae/outpost.xml
similarity index 73%
rename from binaries/data/mods/public/simulation/templates/structures/pers/outpost.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/outpost.xml
index 2de3141400..dbe93e9a6f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/outpost.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_outpost">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Didebani</SpecificName>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/outpost.xml</Actor>
+    <Actor>structures/achaemenids/outpost.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/range.xml b/binaries/data/mods/public/simulation/templates/structures/achae/range.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/structures/pers/range.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/range.xml
index d4b2ef78d8..7eed83ec0c 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/range.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/range.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_range">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/range.xml</Actor>
+    <Actor>structures/achaemenids/range.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/achae/sentry_tower.xml
similarity index 67%
rename from binaries/data/mods/public/simulation/templates/structures/pers/sentry_tower.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/sentry_tower.xml
index a977ec1cb0..d39a72732d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/sentry_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/sentry_tower.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/wooden_tower.xml</Actor>
+    <Actor>structures/achaemenids/wooden_tower.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/stable.xml b/binaries/data/mods/public/simulation/templates/structures/achae/stable.xml
similarity index 85%
rename from binaries/data/mods/public/simulation/templates/structures/pers/stable.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/stable.xml
index ba395a3111..ec1638e1b1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/stable.xml
@@ -5,14 +5,14 @@
     <Height>5.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Paraspa</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/stable.xml</Actor>
+    <Actor>structures/achaemenids/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/storehouse.xml b/binaries/data/mods/public/simulation/templates/structures/achae/storehouse.xml
similarity index 72%
rename from binaries/data/mods/public/simulation/templates/structures/pers/storehouse.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/storehouse.xml
index 3a130cecde..0ebe5cb963 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/storehouse.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/storehouse.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Asiyah</SpecificName>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/storehouse.xml</Actor>
+    <Actor>structures/achaemenids/storehouse.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/tachara.xml b/binaries/data/mods/public/simulation/templates/structures/achae/tachara.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/structures/pers/tachara.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/tachara.xml
index c869aea11d..5e60e515cd 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/tachara.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/tachara.xml
@@ -22,10 +22,10 @@
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_pers_cc</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>decay|rubble/rubble_achae_cc</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <GenericName>Winter Palace</GenericName>
     <SpecificName>Taçara</SpecificName>
     <Tooltip>Train Heroes and make use of the “Satrapy Tribute” feature.</Tooltip>
@@ -77,22 +77,22 @@
   </Trainer>
   <Upgrade>
     <TributeFood>
-      <Entity>structures/pers/tachara_food</Entity>
+      <Entity>structures/achae/tachara_food</Entity>
       <Tooltip>Receive free Food tribute to your treasury from your subject peoples.</Tooltip>
       <Time>10</Time>
     </TributeFood>
     <TributeWood>
-      <Entity>structures/pers/tachara_wood</Entity>
+      <Entity>structures/achae/tachara_wood</Entity>
       <Tooltip>Receive free Wood tribute to your treasury from your subject peoples.</Tooltip>
       <Time>10</Time>
     </TributeWood>
     <TributeStone>
-      <Entity>structures/pers/tachara_stone</Entity>
+      <Entity>structures/achae/tachara_stone</Entity>
       <Tooltip>Receive free Stone tribute to your treasury from your subject peoples.</Tooltip>
       <Time>10</Time>
     </TributeStone>
     <TributeMetal>
-      <Entity>structures/pers/tachara_metal</Entity>
+      <Entity>structures/achae/tachara_metal</Entity>
       <Tooltip>Receive free Metal tribute to your treasury from your subject peoples.</Tooltip>
       <Time>10</Time>
     </TributeMetal>
@@ -101,7 +101,7 @@
     <Range>40</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/persians/tachara.xml</Actor>
+    <Actor>structures/achaemenids/tachara.xml</Actor>
     <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_food.xml b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_food.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/structures/pers/tachara_food.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/tachara_food.xml
index 24a90cdea6..0be4d5e22f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_food.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_food.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/tachara">
+<Entity parent="structures/achae/tachara">
   <Identity>
     <Icon>structures/palace_food.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_metal.xml b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_metal.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/structures/pers/tachara_metal.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/tachara_metal.xml
index a979970627..cb88c6232c 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_metal.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_metal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/tachara">
+<Entity parent="structures/achae/tachara">
   <Identity>
     <Icon>structures/palace_metal.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_stone.xml b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_stone.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/structures/pers/tachara_stone.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/tachara_stone.xml
index 5d54b9c4ae..6fa7688c59 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/tachara">
+<Entity parent="structures/achae/tachara">
   <Identity>
     <Icon>structures/palace_stone.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_wood.xml b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_wood.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/structures/pers/tachara_wood.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/tachara_wood.xml
index 346e2dc2e9..780c6cdbd0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/tachara_wood.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/tachara_wood.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/tachara">
+<Entity parent="structures/achae/tachara">
   <Identity>
     <Icon>structures/palace_wood.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/temple.xml b/binaries/data/mods/public/simulation/templates/structures/achae/temple.xml
similarity index 87%
rename from binaries/data/mods/public/simulation/templates/structures/pers/temple.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/temple.xml
index 2c4642b536..0d4eebca31 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/temple.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/temple.xml
@@ -8,14 +8,14 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Āyadanam</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="17.5" depth="17.5"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/temple.xml</Actor>
+    <Actor>structures/achaemenids/temple.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/tower_babylon.xml b/binaries/data/mods/public/simulation/templates/structures/achae/tower_babylon.xml
similarity index 76%
rename from binaries/data/mods/public/simulation/templates/structures/pers/tower_babylon.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/tower_babylon.xml
index b50010f0d1..5ffec50a42 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/tower_babylon.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/tower_babylon.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_tower_stone">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Pāyaud</SpecificName>
   </Identity>
   <StatusBars>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <VisualActor>
-    <Actor>structures/persians/babylonian_tower.xml</Actor>
+    <Actor>structures/achaemenids/babylonian_tower.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wall_gate.xml
similarity index 93%
rename from binaries/data/mods/public/simulation/templates/structures/pers/wall_gate.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/wall_gate.xml
index 9732b5dec4..29071a0feb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wall_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wall_gate.xml
@@ -5,7 +5,7 @@
     <Height>13.8</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Duvarθiš</SpecificName>
   </Identity>
   <Obstruction>
@@ -53,6 +53,6 @@
     </TurretPoints>
   </TurretHolder>
   <VisualActor>
-    <Actor>structures/persians/wall_gate.xml</Actor>
+    <Actor>structures/achaemenids/wall_gate.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wall_long.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wall_long.xml
similarity index 96%
rename from binaries/data/mods/public/simulation/templates/structures/pers/wall_long.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/wall_long.xml
index 6bef968450..6d1d8421ca 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wall_long.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wall_long.xml
@@ -5,7 +5,7 @@
     <Height>11.6</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
@@ -99,6 +99,6 @@
     </TurretPoints>
   </TurretHolder>
   <VisualActor>
-    <Actor>structures/persians/wall_long.xml</Actor>
+    <Actor>structures/achaemenids/wall_long.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wall_medium.xml
similarity index 93%
rename from binaries/data/mods/public/simulation/templates/structures/pers/wall_medium.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/wall_medium.xml
index a551501232..aac3764c40 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wall_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wall_medium.xml
@@ -5,7 +5,7 @@
     <Height>11.6</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
@@ -59,6 +59,6 @@
     </TurretPoints>
   </TurretHolder>
   <VisualActor>
-    <Actor>structures/persians/wall_medium.xml</Actor>
+    <Actor>structures/achaemenids/wall_medium.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wall_short.xml
similarity index 84%
rename from binaries/data/mods/public/simulation/templates/structures/pers/wall_short.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/wall_short.xml
index 273cd287be..575947aab3 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wall_short.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wall_short.xml
@@ -5,7 +5,7 @@
     <Height>11.6</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
@@ -15,6 +15,6 @@
     <HeightOffset>12.6</HeightOffset>
   </StatusBars>
   <VisualActor>
-    <Actor>structures/persians/wall_short.xml</Actor>
+    <Actor>structures/achaemenids/wall_short.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wall_tower.xml
similarity index 86%
rename from binaries/data/mods/public/simulation/templates/structures/pers/wall_tower.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/wall_tower.xml
index 0d54eeecf8..f88248f44d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wall_tower.xml
@@ -5,7 +5,7 @@
     <Height>14.4</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Pāyaud</SpecificName>
   </Identity>
   <Obstruction>
@@ -15,7 +15,7 @@
     <HeightOffset>15.4</HeightOffset>
   </StatusBars>
   <VisualActor>
-    <Actor>structures/persians/wall_tower.xml</Actor>
+    <Actor>structures/achaemenids/wall_tower.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>7</Length>
diff --git a/binaries/data/mods/public/simulation/templates/structures/achae/wallset_stone.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wallset_stone.xml
new file mode 100644
index 0000000000..8182536208
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wallset_stone.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_wallset">
+  <Identity>
+    <Civ>achae</Civ>
+    <SpecificName>Para</SpecificName>
+  </Identity>
+  <WallSet>
+    <Templates>
+      <Tower>structures/achae/wall_tower</Tower>
+      <Gate>structures/achae/wall_gate</Gate>
+      <WallLong>structures/achae/wall_long</WallLong>
+      <WallMedium>structures/achae/wall_medium</WallMedium>
+      <WallShort>structures/achae/wall_short</WallShort>
+    </Templates>
+  </WallSet>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/warehouse.xml b/binaries/data/mods/public/simulation/templates/structures/achae/warehouse.xml
similarity index 84%
rename from binaries/data/mods/public/simulation/templates/structures/pers/warehouse.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/warehouse.xml
index 71765212b2..523e7781f7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/warehouse.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/warehouse.xml
@@ -8,7 +8,7 @@
     <Max>2000</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Warehouse</SpecificName>
   </Identity>
   <Obstruction>
@@ -18,6 +18,6 @@
     <Radius>30</Radius>
   </TerritoryInfluence>
   <VisualActor>
-    <Actor>props/structures/persians/alt_building_01.xml</Actor>
+    <Actor>props/structures/achaemenids/alt_building_01.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wonder.xml b/binaries/data/mods/public/simulation/templates/structures/achae/wonder.xml
similarity index 84%
rename from binaries/data/mods/public/simulation/templates/structures/pers/wonder.xml
rename to binaries/data/mods/public/simulation/templates/structures/achae/wonder.xml
index d9e1fcb2fe..bb6f6aaa41 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/achae/wonder.xml
@@ -5,7 +5,7 @@
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Hanging Gardens of Babylon</SpecificName>
   </Identity>
   <Obstruction>
@@ -13,6 +13,6 @@
   </Obstruction>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
-    <Actor>structures/persians/gardens_struct.xml</Actor>
+    <Actor>structures/achaemenids/gardens_struct.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml b/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
index 7e0f448cf0..e541f8451a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
@@ -24,7 +24,7 @@
   <Identity>
     <GenericName>Ishtar Gate of Babylon</GenericName>
     <Tooltip>Territory root.</Tooltip>
-    <Icon>structures/pers_gate.png</Icon>
+    <Icon>structures/achae_gate.png</Icon>
   </Identity>
   <Loot>
     <stone>50</stone>
@@ -56,7 +56,7 @@
     <Range>40</Range>
   </Vision>
   <VisualActor>
-    <Actor>special/pers_ishtar_gate.xml</Actor>
+    <Actor>special/achae_ishtar_gate.xml</Actor>
     <FoundationActor>structures/fndn_9x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml b/binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
index 1b569a4f18..dac4f32cf4 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
@@ -11,6 +11,6 @@
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/farmstead.xml</Actor>
+    <Actor>structures/achaemenids/farmstead.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/wallset_stone.xml b/binaries/data/mods/public/simulation/templates/structures/pers/wallset_stone.xml
deleted file mode 100644
index 592bc17d20..0000000000
--- a/binaries/data/mods/public/simulation/templates/structures/pers/wallset_stone.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_wallset">
-  <Identity>
-    <Civ>pers</Civ>
-    <SpecificName>Para</SpecificName>
-  </Identity>
-  <WallSet>
-    <Templates>
-      <Tower>structures/pers/wall_tower</Tower>
-      <Gate>structures/pers/wall_gate</Gate>
-      <WallLong>structures/pers/wall_long</WallLong>
-      <WallMedium>structures/pers/wall_medium</WallMedium>
-      <WallShort>structures/pers/wall_short</WallShort>
-    </Templates>
-  </WallSet>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml b/binaries/data/mods/public/simulation/templates/structures/shrine_achaemenid.xml
similarity index 73%
rename from binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml
rename to binaries/data/mods/public/simulation/templates/structures/shrine_achaemenid.xml
index 2bef33a292..3a1efb792d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/shrine_achaemenid.xml
@@ -5,13 +5,13 @@
     <Height>14</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
-    <SpecificName>Fire Temple</SpecificName>
+    <Civ>achae</Civ>
+    <SpecificName>Fire Shrine</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="10.5" depth="10.5"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/shrine.xml</Actor>
+    <Actor>structures/achaemenids/shrine.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml b/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml
index 81af123d96..eea4a79c99 100644
--- a/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml
@@ -31,7 +31,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Bedouin Tent</SpecificName>
     <GenericName>Tent</GenericName>
     <Icon>structures/mercenary_camp.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/structures/trading_post_desert.xml b/binaries/data/mods/public/simulation/templates/structures/trading_post_desert.xml
index 4966d3247f..0cbf750b79 100644
--- a/binaries/data/mods/public/simulation/templates/structures/trading_post_desert.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/trading_post_desert.xml
@@ -5,13 +5,13 @@
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <SpecificName>Desert Bazaar</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/persians/market.xml</Actor>
+    <Actor>structures/achaemenids/market.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml b/binaries/data/mods/public/simulation/templates/units/achae/arstibara.xml
similarity index 67%
rename from binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/arstibara.xml
index b58f328df1..ef33a9b4b2 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/arstibara.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/arstibara.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/champion_infantry">
+<Entity parent="units/achae/champion_infantry">
   <Cost>
     <BuildTime>5</BuildTime>
     <Resources>
@@ -8,13 +8,13 @@
     </Resources>
   </Cost>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Persian Apple Bearer</GenericName>
     <SpecificName>Arštibara</SpecificName>
-    <Icon>units/pers/arstibara.png</Icon>
+    <Icon>units/achae/arstibara.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/infantry_spearman_c.xml</Actor>
+    <Actor>units/achaemenids/infantry_spearman_c.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/catafalque.xml b/binaries/data/mods/public/simulation/templates/units/achae/catafalque.xml
similarity index 66%
rename from binaries/data/mods/public/simulation/templates/units/pers/catafalque.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/catafalque.xml
index 7a21c2cee3..6f35e938bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/catafalque.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_catafalque">
   <Auras datatype="tokens">
-    units/catafalques/pers_catafalque
+    units/catafalques/achae_catafalque
   </Auras>
   <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Persian Catafalque</GenericName>
+    <Civ>achae</Civ>
+    <GenericName>Achaemenid Catafalque</GenericName>
     <Lang>persian</Lang>
     <SpecificName>Artaxšaçā</SpecificName>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_a.xml
similarity index 51%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_a.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_a.xml
index 7923598f6c..0dc84caa86 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_a.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_archer_b">
+<Entity parent="units/achae/cavalry_archer_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_archer_e</Entity>
+    <Entity>units/achae/cavalry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_a_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_a_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_b.xml
similarity index 61%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_b.xml
index 191aa85afe..ba50e36e97 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_b.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/cavalry_archer_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/cavalry_archer_b</SelectionGroupName>
     <GenericName>Parthian Horse Archer</GenericName>
     <SpecificName>Asabāra Parθava</SpecificName>
-    <Icon>units/pers/cavalry_archer.png</Icon>
+    <Icon>units/achae/cavalry_archer.png</Icon>
     <Requirements>
       <Techs datatype="tokens">phase_town</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_archer_a</Entity>
+    <Entity>units/achae/cavalry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_b_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_e.xml
similarity index 59%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_e.xml
index 4ccac3dfb1..17e442d406 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_archer_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_archer_a">
+<Entity parent="units/achae/cavalry_archer_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_e_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_a.xml
similarity index 51%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_a.xml
index a6b47a1f57..8501e33cb5 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_a.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_axeman_b">
+<Entity parent="units/achae/cavalry_axeman_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_axeman_e</Entity>
+    <Entity>units/achae/cavalry_axeman_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_axeman_a_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_axeman_a_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_a_trireme.xml
similarity index 66%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_a_trireme.xml
index 66c913a3f8..f66935fbed 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_a_trireme.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_axeman_a">
+<Entity parent="units/achae/cavalry_axeman_a">
   <Identity>
     <Requirements>
       <Techs datatype="tokens">-phase_town equine_transports</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_axeman_e_trireme</Entity>
+    <Entity>units/achae/cavalry_axeman_e_trireme</Entity>
   </Promotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_b.xml
similarity index 61%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_b.xml
index e5f2f5a511..e7cb56250e 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_b.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_axeman">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/cavalry_axeman_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/cavalry_axeman_b</SelectionGroupName>
     <GenericName>Hyrcanian Cavalry</GenericName>
     <SpecificName>Asabāra Varkaniya</SpecificName>
-    <Icon>units/pers/cavalry_axeman.png</Icon>
+    <Icon>units/achae/cavalry_axeman.png</Icon>
     <Requirements>
       <Techs datatype="tokens">phase_town</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_axeman_a</Entity>
+    <Entity>units/achae/cavalry_axeman_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_axeman_b_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_axeman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_b_trireme.xml
similarity index 66%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_b_trireme.xml
index b4962c674c..fc3a4e17f7 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_b_trireme.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_axeman_b">
+<Entity parent="units/achae/cavalry_axeman_b">
   <Identity>
     <Requirements>
       <Techs datatype="tokens">-phase_town equine_transports</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_axeman_a_trireme</Entity>
+    <Entity>units/achae/cavalry_axeman_a_trireme</Entity>
   </Promotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_e.xml
similarity index 59%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_e.xml
index b8a673c1c3..c4fe394f58 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_axeman_a">
+<Entity parent="units/achae/cavalry_axeman_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_axeman_e_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_axeman_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_e_trireme.xml
similarity index 79%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_e_trireme.xml
index e898cf6a39..9943cd930b 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_axeman_e_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_axeman_e">
+<Entity parent="units/achae/cavalry_axeman_e">
   <Identity>
     <Requirements>
       <Techs datatype="tokens">-phase_town equine_transports</Techs>
diff --git a/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_a.xml
new file mode 100644
index 0000000000..65ddccaaa9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/achae/cavalry_javelineer_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/achae/cavalry_javelineer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/achaemenids/cavalry_javelinist_a_m.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_a_trireme.xml
similarity index 64%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_a_trireme.xml
index 65afc86953..4fff012689 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_a_trireme.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_javelineer_a">
+<Entity parent="units/achae/cavalry_javelineer_a">
   <Identity>
     <Requirements>
       <Techs datatype="tokens">equine_transports</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_javelineer_e_trireme</Entity>
+    <Entity>units/achae/cavalry_javelineer_e_trireme</Entity>
   </Promotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_b.xml
similarity index 54%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_b.xml
index f8f61baa1b..7c81dfb544 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_b.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_javelineer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/cavalry_javelineer_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Median Light Cavalry</GenericName>
     <SpecificName>Asabāra Māda</SpecificName>
-    <Icon>units/pers/cavalry_javelinist.png</Icon>
+    <Icon>units/achae/cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_javelineer_a</Entity>
+    <Entity>units/achae/cavalry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_b_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_b_trireme.xml
similarity index 64%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_b_trireme.xml
index f216f68a3b..e6e4649110 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_b_trireme.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_javelineer_b">
+<Entity parent="units/achae/cavalry_javelineer_b">
   <Identity>
     <Requirements>
       <Techs datatype="tokens">equine_transports</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_javelineer_a_trireme</Entity>
+    <Entity>units/achae/cavalry_javelineer_a_trireme</Entity>
   </Promotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_e.xml
similarity index 57%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_e.xml
index e76fd80509..5124909a0f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_javelineer_a">
+<Entity parent="units/achae/cavalry_javelineer_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_e_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_javelinist_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_e_trireme.xml
similarity index 77%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_e_trireme.xml
index d23b2b198e..95cb03bfe0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_javelineer_e_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_javelineer_e">
+<Entity parent="units/achae/cavalry_javelineer_e">
   <Identity>
     <Requirements>
       <Techs datatype="tokens">equine_transports</Techs>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_a.xml
similarity index 50%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_a.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_a.xml
index 6b9714f3b3..ca0414fe25 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_a.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_spearman_b">
+<Entity parent="units/achae/cavalry_spearman_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_spearman_e</Entity>
+    <Entity>units/achae/cavalry_spearman_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_spearman_a_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_spearman_a_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_b.xml
similarity index 61%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_b.xml
index 8ba8beeac5..423f82d6e5 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_b.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/cavalry_spearman_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/cavalry_spearman_b</SelectionGroupName>
     <GenericName>Cappadocian Cavalry</GenericName>
     <SpecificName>Asabāra Katpatuka</SpecificName>
-    <Icon>units/pers/cavalry_spearman.png</Icon>
+    <Icon>units/achae/cavalry_spearman.png</Icon>
     <Requirements>
       <Techs datatype="tokens">phase_town</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/cavalry_spearman_a</Entity>
+    <Entity>units/achae/cavalry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_spearman_b_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_spearman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_e.xml
similarity index 58%
rename from binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_e.xml
index 6b42e17fec..6cb226b0d3 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/cavalry_spearman_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_spearman_a">
+<Entity parent="units/achae/cavalry_spearman_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_spearman_e_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_spearman_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/achae/champion_cavalry.xml
similarity index 69%
rename from binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/champion_cavalry.xml
index e09f086c9a..b89e07f673 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/champion_cavalry.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="cataphract|template_unit_champion_cavalry_spearman">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Bactrian Heavy Lancer</GenericName>
     <SpecificName>Asabāra Baxtriš</SpecificName>
-    <Icon>units/pers/champion_cavalry.png</Icon>
+    <Icon>units/achae/champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/cavalry_spearman_c_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_spearman_c_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/units/achae/champion_cavalry_archer.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/champion_cavalry_archer.xml
index 5a1b3b543f..c4524bded9 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/champion_cavalry_archer.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Bactrian Heavy Cavalry Archer</GenericName>
     <SpecificName>Asabāra Baxtriš</SpecificName>
-    <Icon>units/pers/champion_cavalry_archer.png</Icon>
+    <Icon>units/achae/champion_cavalry_archer.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_c_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_c_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/achae/champion_chariot.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/champion_chariot.xml
index db8f4b2163..e008185eec 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/champion_chariot.xml
@@ -5,16 +5,16 @@
     <Height>6.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Raθa Bābiruviya</SpecificName>
-    <Icon>units/pers/chariot_archer.png</Icon>
+    <Icon>units/achae/chariot_archer.png</Icon>
     <Requirements>
       <Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
     </Requirements>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/chariot_archer_e_m.xml</Actor>
+    <Actor>units/achaemenids/chariot_archer_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/achae/champion_elephant.xml
similarity index 70%
rename from binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/champion_elephant.xml
index f0c3255d5c..1aa006a7ef 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/champion_elephant.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="elephant_indian|template_unit_champion_elephant_melee">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Pila Hinduya</SpecificName>
-    <Icon>units/pers/champion_elephant.png</Icon>
+    <Icon>units/achae/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/elephantry_c_m.xml</Actor>
+    <Actor>units/achaemenids/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/achae/champion_infantry.xml
similarity index 85%
rename from binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/champion_infantry.xml
index 6039bbdf02..effb19c67b 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/champion_infantry.xml
@@ -12,12 +12,12 @@
     <Max>120</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Persian Immortal</GenericName>
     <SpecificName>Anušiya</SpecificName>
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
-    <Icon>units/pers/champion_infantry.png</Icon>
+    <Icon>units/achae/champion_infantry.png</Icon>
     <Requirements>
       <Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
     </Requirements>
@@ -44,12 +44,12 @@
   </Loot>
   <Upgrade>
     <Immortal_archer>
-      <Entity>units/pers/champion_infantry_archer_upgrade</Entity>
+      <Entity>units/achae/champion_infantry_archer_upgrade</Entity>
       <Tooltip>Switch to using the bow and arrow.</Tooltip>
       <Time>4</Time>
     </Immortal_archer>
   </Upgrade>
   <VisualActor>
-    <Actor>units/persians/infantry_spearman_c2.xml</Actor>
+    <Actor>units/achaemenids/infantry_spearman_c2.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml b/binaries/data/mods/public/simulation/templates/units/achae/champion_infantry_archer_upgrade.xml
similarity index 85%
rename from binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/champion_infantry_archer_upgrade.xml
index 10343d1280..25f67fa1a5 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/champion_infantry_archer_upgrade.xml
@@ -11,12 +11,12 @@
     <Max>120</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Persian Immortal</GenericName>
     <SpecificName>Anušiya</SpecificName>
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
-    <Icon>units/pers/champion_infantry_archer.png</Icon>
+    <Icon>units/achae/champion_infantry_archer.png</Icon>
     <Requirements>
       <Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
     </Requirements>
@@ -42,7 +42,7 @@
   </Resistance>
   <Upgrade>
     <Immortal_spearman>
-      <Entity>units/pers/champion_infantry</Entity>
+      <Entity>units/achae/champion_infantry</Entity>
       <Tooltip>Switch to using a spear and shield.</Tooltip>
       <Time>4</Time>
     </Immortal_spearman>
@@ -51,6 +51,6 @@
     <WalkSpeed op="mul">0.88</WalkSpeed>
   </UnitMotion>
   <VisualActor>
-    <Actor>units/persians/infantry_archer_c.xml</Actor>
+    <Actor>units/achaemenids/infantry_archer_c.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml b/binaries/data/mods/public/simulation/templates/units/achae/hero_cyrus_ii.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/hero_cyrus_ii.xml
index 22df938b64..a9980cce8a 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/hero_cyrus_ii.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
   <Auras datatype="tokens">
-    units/heroes/pers_hero_cyrus_ii
+    units/heroes/achae_hero_cyrus_ii
   </Auras>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Cyrus II The Great</GenericName>
     <SpecificName>Kuruš</SpecificName>
-    <Icon>units/pers/hero_cyrus.png</Icon>
+    <Icon>units/achae/hero_cyrus.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers/champion_infantry
+      units/achae/champion_infantry
     </Entities>
   </Trainer>
   <VisualActor>
-    <Actor>units/persians/hero_cavalry_spearman_cyrus_m.xml</Actor>
+    <Actor>units/achaemenids/hero_cavalry_spearman_cyrus_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml b/binaries/data/mods/public/simulation/templates/units/achae/hero_darius_i.xml
similarity index 76%
rename from binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/hero_darius_i.xml
index a052a18a93..a3549e4602 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/hero_darius_i.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="chariot|template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
-    units/heroes/pers_hero_darius_i
+    units/heroes/achae_hero_darius_i
   </Auras>
   <Footprint replace="">
     <Square width="11.0" depth="11.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Darius I the Great</GenericName>
     <SpecificName>Dārayavahuš</SpecificName>
-    <Icon>units/pers/hero_darius.png</Icon>
+    <Icon>units/achae/hero_darius.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
@@ -22,6 +22,6 @@
     </Overlay>
   </Selectable>
   <VisualActor>
-    <Actor>units/persians/hero_chariot_archer_darius_m.xml</Actor>
+    <Actor>units/achaemenids/hero_chariot_archer_darius_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml b/binaries/data/mods/public/simulation/templates/units/achae/hero_xerxes_i.xml
similarity index 59%
rename from binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/hero_xerxes_i.xml
index 38e78199a5..1cc18e4782 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/hero_xerxes_i.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_archer">
   <Auras datatype="tokens">
-    units/heroes/pers_hero_xerxes_i_1
-    units/heroes/pers_hero_xerxes_i_2
+    units/heroes/achae_hero_xerxes_i_1
+    units/heroes/achae_hero_xerxes_i_2
   </Auras>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
-    <Icon>units/pers/hero_xerxes.png</Icon>
+    <Icon>units/achae/hero_xerxes.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/hero_infantry_archer_xerxes.xml</Actor>
+    <Actor>units/achaemenids/hero_infantry_archer_xerxes.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml b/binaries/data/mods/public/simulation/templates/units/achae/hero_xerxes_i_chariot.xml
similarity index 71%
rename from binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/hero_xerxes_i_chariot.xml
index 3ddd25aa0c..140dfb0ccd 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/hero_xerxes_i_chariot.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="chariot|template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
-    units/heroes/pers_hero_xerxes_i_1
-    units/heroes/pers_hero_xerxes_i_2
+    units/heroes/achae_hero_xerxes_i_1
+    units/heroes/achae_hero_xerxes_i_2
   </Auras>
   <Footprint replace="">
     <Square width="11.0" depth="11.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
-    <Icon>units/pers/hero_xerxes.png</Icon>
+    <Icon>units/achae/hero_xerxes.png</Icon>
   </Identity>
   <Selectable>
     <Overlay>
@@ -23,6 +23,6 @@
     </Overlay>
   </Selectable>
   <VisualActor>
-    <Actor>units/persians/hero_chariot_archer_xerxes_m.xml</Actor>
+    <Actor>units/achaemenids/hero_chariot_archer_xerxes_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_a.xml
similarity index 50%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_a.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_a.xml
index 9eec0fa9b0..aad2745c21 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_a.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/infantry_archer_b">
+<Entity parent="units/achae/infantry_archer_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers/infantry_archer_e</Entity>
+    <Entity>units/achae/infantry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/infantry_archer_a.xml</Actor>
+    <Actor>units/achaemenids/infantry_archer_a.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_b.xml
similarity index 55%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_b.xml
index cda59093a8..b9a125c287 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_b.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/infantry_archer_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/infantry_archer_b</SelectionGroupName>
     <GenericName>Sogdian Archer</GenericName>
     <SpecificName>Θanuvaniya Suguda</SpecificName>
-    <Icon>units/pers/infantry_archer.png</Icon>
+    <Icon>units/achae/infantry_archer.png</Icon>
   </Identity>
   <Promotion>
-    <Entity>units/pers/infantry_archer_a</Entity>
+    <Entity>units/achae/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/infantry_archer_b.xml</Actor>
+    <Actor>units/achaemenids/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_e.xml
similarity index 59%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_e.xml
index 7a17a2ed31..df86001fe0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_archer_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/infantry_archer_a">
+<Entity parent="units/achae/infantry_archer_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/infantry_archer_e.xml</Actor>
+    <Actor>units/achaemenids/infantry_archer_e.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_a.xml
new file mode 100644
index 0000000000..8d4e94494b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/achae/infantry_javelineer_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/achae/infantry_javelineer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/achaemenids/infantry_javelinist_a.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_b.xml
similarity index 60%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_b.xml
index 1f2b6b17db..c3822790b7 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_b.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/infantry_javelineer_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Lydian Auxiliary</GenericName>
     <SpecificName>Pastiš Spardiya</SpecificName>
-    <Icon>units/pers/infantry_javelinist.png</Icon>
+    <Icon>units/achae/infantry_javelinist.png</Icon>
     <Requirements>
       <Techs datatype="tokens">phase_town</Techs>
     </Requirements>
   </Identity>
   <Promotion>
-    <Entity>units/pers/infantry_javelineer_a</Entity>
+    <Entity>units/achae/infantry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/infantry_javelinist_b.xml</Actor>
+    <Actor>units/achaemenids/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_e.xml
similarity index 57%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_e.xml
index 8034024326..32ddb63155 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_javelineer_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/infantry_javelineer_a">
+<Entity parent="units/achae/infantry_javelineer_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/infantry_javelinist_e.xml</Actor>
+    <Actor>units/achaemenids/infantry_javelinist_e.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_a.xml
similarity index 50%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_a.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_a.xml
index 06e4aa4938..6e4aca5742 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_a.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/infantry_spearman_b">
+<Entity parent="units/achae/infantry_spearman_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers/infantry_spearman_e</Entity>
+    <Entity>units/achae/infantry_spearman_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/infantry_spearman_a.xml</Actor>
+    <Actor>units/achaemenids/infantry_spearman_a.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_b.xml
similarity index 53%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_b.xml
index 0a1a92f7fd..e35c0d6459 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_b.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers/infantry_spearman_b</SelectionGroupName>
+    <SelectionGroupName>units/achae/infantry_spearman_b</SelectionGroupName>
     <GenericName>Shield Bearer</GenericName>
     <SpecificName>Sparabara</SpecificName>
-    <Icon>units/pers/infantry_spearman.png</Icon>
+    <Icon>units/achae/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
-    <Entity>units/pers/infantry_spearman_a</Entity>
+    <Entity>units/achae/infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/infantry_spearman_b.xml</Actor>
+    <Actor>units/achaemenids/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_e.xml
similarity index 58%
rename from binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_e.xml
index 1b4cf69774..8199bf35cf 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/infantry_spearman_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/infantry_spearman_a">
+<Entity parent="units/achae/infantry_spearman_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/infantry_spearman_e.xml</Actor>
+    <Actor>units/achaemenids/infantry_spearman_e.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml b/binaries/data/mods/public/simulation/templates/units/achae/kardakes_hoplite.xml
similarity index 71%
rename from binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/kardakes_hoplite.xml
index 273895cf64..230bb85870 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/kardakes_hoplite.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|hoplite|template_unit_champion_infantry_spearman">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Cardaces Hoplite</GenericName>
     <SpecificName>Hoplites Kardakes</SpecificName>
-    <Icon>units/pers/kardakes.png</Icon>
+    <Icon>units/achae/kardakes.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/infantry_spearman_c3.xml</Actor>
+    <Actor>units/achaemenids/infantry_spearman_c3.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/achae/kardakes_skirmisher.xml
similarity index 69%
rename from binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/kardakes_skirmisher.xml
index 1c09e9f529..6851fee1cc 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/kardakes_skirmisher.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Cardaces Skirmisher</GenericName>
     <SpecificName>Peltastes Kardakes</SpecificName>
-    <Icon>units/pers/kardakes_skirmisher.png</Icon>
+    <Icon>units/achae/kardakes_skirmisher.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/infantry_javelinist_c.xml</Actor>
+    <Actor>units/achaemenids/infantry_javelinist_c.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_arrow.xml b/binaries/data/mods/public/simulation/templates/units/achae/ship_arrow.xml
similarity index 69%
rename from binaries/data/mods/public/simulation/templates/units/pers/ship_arrow.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/ship_arrow.xml
index ae87185efc..9640ed8dc4 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_arrow.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/ship_arrow.xml
@@ -5,20 +5,20 @@
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <SpecificName>Hamaraniyanava Vazarka</SpecificName>
-    <Icon>units/pers/ship_arrow.png</Icon>
+    <Icon>units/achae/ship_arrow.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers/cavalry_axeman_b_trireme
-      units/pers/cavalry_javelineer_b_trireme
+      units/achae/cavalry_axeman_b_trireme
+      units/achae/cavalry_javelineer_b_trireme
     </Entities>
   </Trainer>
   <VisualActor>
-    <Actor>structures/persians/trireme.xml</Actor>
+    <Actor>structures/achaemenids/trireme.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/achae/ship_fishing.xml
similarity index 72%
rename from binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/ship_fishing.xml
index b63a85787d..709d1a2550 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/ship_fishing.xml
@@ -5,12 +5,12 @@
     <Height>6.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <SpecificName>Masiyakara</SpecificName>
-    <Icon>units/pers/ship_fishing.png</Icon>
+    <Icon>units/achae/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/fishship.xml</Actor>
+    <Actor>structures/achaemenids/fishship.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/achae/ship_merchant.xml
similarity index 74%
rename from binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/ship_merchant.xml
index 29b194acc9..5db20410da 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/ship_merchant.xml
@@ -5,13 +5,13 @@
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Ionian Trade Ship</GenericName>
     <SpecificName>Nauš Yauna</SpecificName>
-    <Icon>units/pers/ship_merchant.png</Icon>
+    <Icon>units/achae/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/merchant.xml</Actor>
+    <Actor>structures/achaemenids/merchant.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_ram.xml b/binaries/data/mods/public/simulation/templates/units/achae/ship_ram.xml
similarity index 69%
rename from binaries/data/mods/public/simulation/templates/units/pers/ship_ram.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/ship_ram.xml
index f6a88bbee9..f9aa190cc6 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/ship_ram.xml
@@ -5,20 +5,20 @@
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <SpecificName>Hamaraniyanava Vazarka</SpecificName>
-    <Icon>units/pers/ship_ram.png</Icon>
+    <Icon>units/achae/ship_ram.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers/cavalry_axeman_b_trireme
-      units/pers/cavalry_javelineer_b_trireme
+      units/achae/cavalry_axeman_b_trireme
+      units/achae/cavalry_javelineer_b_trireme
     </Entities>
   </Trainer>
   <VisualActor>
-    <Actor>structures/persians/trireme_ram.xml</Actor>
+    <Actor>structures/achaemenids/trireme_ram.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/ship_scout.xml b/binaries/data/mods/public/simulation/templates/units/achae/ship_scout.xml
similarity index 72%
rename from binaries/data/mods/public/simulation/templates/units/pers/ship_scout.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/ship_scout.xml
index 80f268d92c..4fc63b98bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/ship_scout.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/ship_scout.xml
@@ -5,12 +5,12 @@
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <SpecificName>Hamaraniyanava</SpecificName>
-    <Icon>units/pers/ship_scout.png</Icon>
+    <Icon>units/achae/ship_scout.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/bireme_scout.xml</Actor>
+    <Actor>structures/achaemenids/bireme_scout.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/achae/siege_ram.xml
similarity index 82%
rename from binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/siege_ram.xml
index b4b13dc83b..bf203dedfe 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/siege_ram.xml
@@ -15,13 +15,13 @@
     <Max op="add">2</Max>
   </GarrisonHolder>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Assyrian Siege Ram</GenericName>
     <SpecificName>Hamaranakuba Aθuriya</SpecificName>
-    <Icon>units/pers/siege_ram.png</Icon>
+    <Icon>units/achae/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/siege_ram.xml</Actor>
+    <Actor>structures/achaemenids/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_civilian.xml
similarity index 67%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_civilian.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_civilian.xml
index 21b6615864..f19f2783d0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_civilian.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_civilian.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_civilian">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Persian Laborer</GenericName>
     <SpecificName>Martiyā</SpecificName>
-    <Icon>units/pers/support_civilian.png</Icon>
+    <Icon>units/achae/support_civilian.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/citizen_{phenotype}.xml</Actor>
+    <Actor>units/achaemenids/citizen_{phenotype}.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_civilian_house.xml
similarity index 83%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_civilian_house.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_civilian_house.xml
index 89a1463cd3..1baf9fb88f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_civilian_house.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_civilian_house.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/support_civilian">
+<Entity parent="units/achae/support_civilian">
   <Cost>
     <BuildTime>30</BuildTime>
   </Cost>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_female_citizen.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_female_citizen.xml
index 950e955fdb..7a57c77f4f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_female_citizen.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <SpecificName>Banu Miyanrudani</SpecificName>
     <GenericName>Mesopotamian Woman</GenericName>
-    <Icon>units/pers/support_female_citizen.png</Icon>
+    <Icon>units/achae/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/female_citizen.xml</Actor>
+    <Actor>units/achaemenids/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_female_citizen_house.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_female_citizen_house.xml
index 61283a8907..a9463b5f2b 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_female_citizen_house.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/support_female_citizen">
+<Entity parent="units/achae/support_female_citizen">
   <Cost>
     <BuildTime>30</BuildTime>
   </Cost>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_a.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_healer_a.xml
similarity index 57%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_healer_a.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_healer_a.xml
index 5f9e2eedc3..4cd1a1edd9 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_healer_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/support_healer_b">
+<Entity parent="units/achae/support_healer_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers/support_healer_e</Entity>
+    <Entity>units/achae/support_healer_e</Entity>
   </Promotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_healer_b.xml
similarity index 64%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_healer_b.xml
index 4534c240be..c4fd7fd482 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_healer_b.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Median Magus</GenericName>
     <SpecificName>Maguš Māda</SpecificName>
-    <Icon>units/pers/support_healer.png</Icon>
+    <Icon>units/achae/support_healer.png</Icon>
   </Identity>
   <Promotion>
-    <Entity>units/pers/support_healer_a</Entity>
+    <Entity>units/achae/support_healer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/healer.xml</Actor>
+    <Actor>units/achaemenids/healer.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_e.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_healer_e.xml
similarity index 72%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_healer_e.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_healer_e.xml
index 3a8cf94027..0472a10deb 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_healer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_healer_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/support_healer_a">
+<Entity parent="units/achae/support_healer_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/achae/support_trader.xml
similarity index 81%
rename from binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml
rename to binaries/data/mods/public/simulation/templates/units/achae/support_trader.xml
index 5de8d5a1e7..af6c2b5a6f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/achae/support_trader.xml
@@ -5,12 +5,12 @@
     <Height>6</Height>
   </Footprint>
   <Identity>
-    <Civ>pers</Civ>
+    <Civ>achae</Civ>
     <Lang>persian</Lang>
     <GenericName>Aramaean Merchant</GenericName>
     <SpecificName>Tamkarum Arami</SpecificName>
-    <Icon>units/pers/support_trader.png</Icon>
-    <Tooltip>Trade resources between your own markets and those of your allies. Persians have a +25% land trading bonus.</Tooltip>
+    <Icon>units/achae/support_trader.png</Icon>
+    <Tooltip>Trade resources between your own markets and those of your allies. Achaemenids have a +25% land trading bonus.</Tooltip>
   </Identity>
   <Sound>
     <SoundGroups>
@@ -26,6 +26,6 @@
     <GainMultiplier op="mul">1.25</GainMultiplier>
   </Trader>
   <VisualActor>
-    <Actor>units/persians/trader.xml</Actor>
+    <Actor>units/achaemenids/trader.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml
index c527b6d4d6..15bd22675d 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/siege_ram.xml
@@ -16,9 +16,9 @@
   </GarrisonHolder>
   <Identity>
     <Civ>kush</Civ>
-    <Icon>units/pers/siege_ram.png</Icon>
+    <Icon>units/achae/siege_ram.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/siege_ram.xml</Actor>
+    <Actor>structures/achaemenids/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a.xml
deleted file mode 100644
index e21674feac..0000000000
--- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/cavalry_javelineer_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers/cavalry_javelineer_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_a_m.xml</Actor>
-  </VisualActor>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_a.xml b/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_a.xml
deleted file mode 100644
index 1c611f7352..0000000000
--- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers/infantry_javelineer_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers/infantry_javelineer_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/infantry_javelinist_a.xml</Actor>
-  </VisualActor>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml
index a637558ad1..805d6013e5 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_trader.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Émporos</SpecificName>
-    <Icon>units/pers/support_trader.png</Icon>
+    <Icon>units/achae/support_trader.png</Icon>
   </Identity>
   <Sound>
     <SoundGroups>
@@ -20,6 +20,6 @@
     <HeightOffset>7</HeightOffset>
   </StatusBars>
   <VisualActor>
-    <Actor>units/persians/trader.xml</Actor>
+    <Actor>units/achaemenids/trader.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_a.xml
index cb67db8154..3081ae6688 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/sele/cavalry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_a_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_a_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
index afe89b92d8..d7b2a49807 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
@@ -6,7 +6,7 @@
     <SelectionGroupName>units/sele/cavalry_archer_b</SelectionGroupName>
     <GenericName>Dahae Horse Archer</GenericName>
     <SpecificName>Hippotoxotès Dahae</SpecificName>
-    <Icon>units/pers/cavalry_archer.png</Icon>
+    <Icon>units/achae/cavalry_archer.png</Icon>
     <Requirements>
       <Techs datatype="tokens">phase_town</Techs>
     </Requirements>
@@ -15,6 +15,6 @@
     <Entity>units/sele/cavalry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_b_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_e.xml
index 6933bbc006..a3aa32749f 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_archer_e_m.xml</Actor>
+    <Actor>units/achaemenids/cavalry_archer_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml
index c497da9497..d409e6bca5 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/support_trader.xml
@@ -8,9 +8,9 @@
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SpecificName>Émporos</SpecificName>
-    <Icon>units/pers/support_trader.png</Icon>
+    <Icon>units/achae/support_trader.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/persians/trader.xml</Actor>
+    <Actor>units/achaemenids/trader.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/build/resources/0ad.appdata.xml b/build/resources/0ad.appdata.xml
index c244554448..d82f2c8337 100644
--- a/build/resources/0ad.appdata.xml
+++ b/build/resources/0ad.appdata.xml
@@ -25,8 +25,8 @@
       The fifteen factions are: Three of the Hellenic States (Athens, Sparta and
       Macedonia), two of the kingdoms of Alexander the Great's successors
       (Seleucids and Ptolemaic Egyptians), two Celtic tribes (Britons and
-      Gauls), the Germans, the Romans, the Persians, the Iberians, the Carthaginians,
-      the Han, the Mauryas and the Kushites.
+      Gauls), the Germans, the Romans, the Achaemenid Persians, the Iberians, the Carthaginians,
+      the Han Chinese, the Maurya Indians, and the Kushites.
       Each civilization is complete with substantially unique artwork,
       technologies and civilization bonuses.
     </p>
@@ -117,6 +117,7 @@
     <keyword>Fortress</keyword>
     <keyword>Celtics</keyword>
     <keyword>Hellenes</keyword>
+    <keyword>Achaemenids</keyword>
     <keyword>Athenians</keyword>
     <keyword>Britons</keyword>
     <keyword>Carthaginians</keyword>
@@ -127,7 +128,6 @@
     <keyword>Kushites</keyword>
     <keyword>Macedonians</keyword>
     <keyword>Mauryas</keyword>
-    <keyword>Persians</keyword>
     <keyword>Ptolemies</keyword>
     <keyword>Romans</keyword>
     <keyword>Seleucids</keyword>
diff --git a/build/resources/0ad.desktop b/build/resources/0ad.desktop
index 8c6c8e6f1c..894faba448 100644
--- a/build/resources/0ad.desktop
+++ b/build/resources/0ad.desktop
@@ -19,7 +19,7 @@ Comment[nl]=Een real-time strategie spel over oorlog van de oudheid
 Comment[pl]=Gra strategiczna czasu rzeczywistego  o wojnach starożytnych
 Comment[pt_BR]=Um jogo em tempo real de guerra antiga
 Comment[ru]=Игра в жанре исторической стратегии в реальном времени
-Keywords=RTS;Real-Time Strategy;Economic Simulation Game;History;Warfare;Infantry;Cavalry;Siege Engines;Fortress;Celtics;Hellenes;Athenians;Britons;Carthaginians;Gauls;Iberians;Macedonians;Mauryas;Persians;Ptolemies;Romans;Seleucids;Spartans;
+Keywords=RTS;Real-Time Strategy;Economic Simulation Game;History;Warfare;Infantry;Cavalry;Siege Engines;Fortress;Celtics;Hellenes;Achaemenids;Athenians;Britons;Carthaginians;Gauls;Iberians;Macedonians;Mauryas;Ptolemies;Romans;Seleucids;Spartans;
 Actions=Atlas;
 
 [Desktop Action Atlas]
diff --git a/source/tools/templatesanalyzer/unit_tables.py b/source/tools/templatesanalyzer/unit_tables.py
index 8cb0f4c144..1a5526e653 100755
--- a/source/tools/templatesanalyzer/unit_tables.py
+++ b/source/tools/templatesanalyzer/unit_tables.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2025 Wildfire Games.
+# Copyright (C) 2026 Wildfire Games.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -50,16 +50,17 @@ LOAD_TEMPLATES_IF_PARENT = [
 # The script will load all entities that derive (to the nth degree) from one of
 # the above templates.
 CIVS = [
+    "achae",
     "athen",
     "brit",
     "cart",
     "gaul",
+    "germ",
     "iber",
     "kush",
     "han",
     "mace",
     "maur",
-    "pers",
     "ptol",
     "rome",
     "sele",