Index: binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
===================================================================
--- binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
+++ binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
@@ -72,7 +72,7 @@
 	// Walls
 	"structures/" + civ + "_wallset_stone",
 	"structures/rome_wallset_siege",
-	"other/wallset_palisade",
+	"structures/wallset_palisade",
 
 	// Shoreline
 	"structures/" + civ + "_dock",
Index: binaries/data/mods/public/simulation/data/civs/athen.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/athen.json
+++ binaries/data/mods/public/simulation/data/civs/athen.json
@@ -112,7 +112,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/athen_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/brit.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/brit.json
+++ binaries/data/mods/public/simulation/data/civs/brit.json
@@ -90,7 +90,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/brit_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/cart.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/cart.json
+++ binaries/data/mods/public/simulation/data/civs/cart.json
@@ -115,7 +115,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/cart_wallset_short",
 		"structures/cart_wallset_stone"
 	],
Index: binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/gaul.json
+++ binaries/data/mods/public/simulation/data/civs/gaul.json
@@ -90,7 +90,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/gaul_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/iber.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/iber.json
+++ binaries/data/mods/public/simulation/data/civs/iber.json
@@ -88,7 +88,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/iber_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/kush.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/kush.json
+++ binaries/data/mods/public/simulation/data/civs/kush.json
@@ -129,7 +129,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/kush_wallset_stone"
 	],
 	"Formations":
Index: binaries/data/mods/public/simulation/data/civs/mace.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/mace.json
+++ binaries/data/mods/public/simulation/data/civs/mace.json
@@ -117,7 +117,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/mace_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/maur.json
+++ binaries/data/mods/public/simulation/data/civs/maur.json
@@ -98,7 +98,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/maur_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/pers.json
+++ binaries/data/mods/public/simulation/data/civs/pers.json
@@ -108,7 +108,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/pers_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/ptol.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/ptol.json
+++ binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -117,7 +117,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/ptol_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/sele.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/sele.json
+++ binaries/data/mods/public/simulation/data/civs/sele.json
@@ -116,7 +116,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/sele_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/data/civs/spart.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/spart.json
+++ binaries/data/mods/public/simulation/data/civs/spart.json
@@ -108,7 +108,7 @@
 	],
 	"WallSets":
 	[
-		"other/wallset_palisade",
+		"structures/wallset_palisade",
 		"structures/spart_wallset_stone"
 	],
 	"StartEntities":
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
@@ -14,7 +14,7 @@
     <Max op="mul">0.75</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>other/wallset_palisade</SelectionGroupName>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
@@ -14,7 +14,7 @@
     <Max op="mul">0.5</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>other/wallset_palisade</SelectionGroupName>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
@@ -14,7 +14,7 @@
     <Max op="mul">0.25</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>other/wallset_palisade</SelectionGroupName>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
@@ -14,7 +14,7 @@
     <Max op="mul">0.75</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>other/wallset_palisade</SelectionGroupName>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
     <Classes datatype="tokens">Tower</Classes>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
+++ binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_wallset">
-  <Identity>
-    <GenericName>Wooden Wall</GenericName>
-    <SpecificName>Palisade</SpecificName>
-    <Classes datatype="tokens">-StoneWall Palisade</Classes>
-    <Icon>structures/palisade_wall.png</Icon>
-    <RequiredTechnology>phase_village</RequiredTechnology>
-  </Identity>
-  <WallSet>
-    <Templates>
-      <Tower>other/palisades_rocks_tower</Tower>
-      <Gate>other/palisades_rocks_gate</Gate>
-      <Fort>other/palisades_rocks_fort</Fort>
-      <WallLong>other/palisades_rocks_long</WallLong>
-      <WallMedium>other/palisades_rocks_medium</WallMedium>
-      <WallShort>other/palisades_rocks_short</WallShort>
-      <WallCurves>
-        other/palisades_rocks_curve
-      </WallCurves>
-      <WallEnd>other/palisades_rocks_end</WallEnd>
-    </Templates>
-  </WallSet>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -28,7 +28,7 @@
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_outpost
-      other/wallset_palisade
+      structures/wallset_palisade
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
Index: binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -9,7 +9,7 @@
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_outpost
-      other/wallset_palisade
+      structures/wallset_palisade
       structures/{civ}_dock
       structures/{civ}_barracks
       structures/{civ}_blacksmith
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      -other/wallset_palisade
+      -structures/wallset_palisade
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      -other/wallset_palisade
+      -structures/wallset_palisade
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      -other/wallset_palisade
+      -structures/wallset_palisade
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
@@ -7,7 +7,7 @@
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      other/wallset_palisade
+      structures/wallset_palisade
       structures/{civ}_defense_tower
       structures/{civ}_sentry_tower
     </Entities>