Index: ps/trunk/binaries/data/mods/public/maps/random/danubius.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/danubius.js
+++ ps/trunk/binaries/data/mods/public/maps/random/danubius.js
@@ -66,16 +66,16 @@
 const oLongHouse = "uncapturable|other/celt_longhouse";
 const oHut = "uncapturable|other/celt_hut";
 const oSentryTower = "uncapturable|structures/gaul_sentry_tower";
-const oWatchTower = "uncapturable|other/palisades_rocks_watchtower";
+const oWatchTower = "uncapturable|structures/palisades_watchtower";
 
-const oPalisadeTallSpikes = "uncapturable|other/palisades_tall_spikes";
-const oPalisadeAngleSpikes = "uncapturable|other/palisades_angle_spike";
-const oPalisadeCurve = "uncapturable|other/palisades_rocks_curve";
-const oPalisadeShort = "uncapturable|other/palisades_rocks_short";
-const oPalisadeMedium = "uncapturable|other/palisades_rocks_medium";
-const oPalisadeLong = "uncapturable|other/palisades_rocks_long";
-const oPalisadeGate = "uncapturable|other/palisades_rocks_gate";
-const oPalisadePillar = "uncapturable|other/palisades_rocks_tower";
+const oPalisadeTallSpikes = "uncapturable|structures/palisades_spikes_tall";
+const oPalisadeAngleSpikes = "uncapturable|structures/palisades_spike_angle";
+const oPalisadeCurve = "uncapturable|structures/palisades_curve";
+const oPalisadeShort = "uncapturable|structures/palisades_short";
+const oPalisadeMedium = "uncapturable|structures/palisades_medium";
+const oPalisadeLong = "uncapturable|structures/palisades_long";
+const oPalisadeGate = "uncapturable|structures/palisades_gate";
+const oPalisadePillar = "uncapturable|structures/palisades_tower";
 
 const oFemale = "units/gaul_support_female_citizen";
 const oHealer = "units/gaul_support_healer_b";
Index: ps/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
+++ ps/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
@@ -29,7 +29,7 @@
 const oStoneLarge = "gaia/geology_stonemine_temperate_quarry";
 const oStoneSmall = "gaia/geology_stone_temperate";
 const oMetalLarge = "gaia/geology_metal_temperate_slabs";
-const oTower = "other/palisades_rocks_fort";
+const oTower = "structures/palisades_fort";
 
 const aRockLarge = "actor|geology/stone_granite_med.xml";
 const aRockMedium = "actor|geology/stone_granite_med.xml";
Index: ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -81,9 +81,9 @@
 const oWallMedium = "structures/kush_wall_medium";
 const oWallGate = "structures/kush_wall_gate";
 const oWallTower = "structures/kush_wall_tower";
-const oPalisadeMedium = "other/palisades_rocks_medium";
-const oPalisadeGate = "other/palisades_rocks_gate";
-const oPalisadeTower = "other/palisades_rocks_tower";
+const oPalisadeMedium = "structures/palisades_medium";
+const oPalisadeGate = "structures/palisades_gate";
+const oPalisadeTower = "structures/palisades_tower";
 const oKushCitizenArcher = "units/kush_infantry_archer_b";
 const oKushHealer = "units/kush_support_healer_b";
 const oKushChampionArcher = "units/kush_champion_infantry";
Index: ps/trunk/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
+++ ps/trunk/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
@@ -193,7 +193,7 @@
 		break;
 
 	case "entryTower":
-		ret.templateName = g_CivData[civ] ? "structures/" + civ + "_defense_tower" : "other/palisades_rocks_watchtower";
+		ret.templateName = g_CivData[civ] ? "structures/" + civ + "_defense_tower" : "structures/palisades_watchtower";
 		ret.indent = ret.length * -3;
 		ret.length = wallset.gate.length;
 		break;
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml
@@ -13637,79 +13637,79 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2865">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="791.32148" z="1224.46912"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2866">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="797.35993" z="1218.55835"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2867">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="804.60273" z="1211.61585"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2868">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="810.52442" z="1207.18714"/>
 			<Orientation y="2.11304"/>
 		</Entity>
 		<Entity uid="2869">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="870.89228" z="1241.38831"/>
 			<Orientation y="-2.71221"/>
 		</Entity>
 		<Entity uid="2870">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="868.19227" z="1232.29871"/>
 			<Orientation y="-2.82464"/>
 		</Entity>
 		<Entity uid="2871">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="865.73304" z="1226.63416"/>
 			<Orientation y="-2.53281"/>
 		</Entity>
 		<Entity uid="2872">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="793.9148" z="1224.96644"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2873">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="800.49" z="1217.96253"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2874">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="804.54041" z="1214.59961"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2875">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="797.425" z="1229.13611"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2876">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="858.78125" z="1224.85914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2877">
-			<Template>other/palisades_rocks_watchtower</Template>
+			<Template>structures/palisades_watchtower</Template>
 			<Player>0</Player>
 			<Position x="796.94703" z="1271.39234"/>
 			<Orientation y="2.35621"/>
@@ -17885,13 +17885,13 @@
 			<Orientation y="-0.03605"/>
 		</Entity>
 		<Entity uid="3655">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="788.43244" z="1230.97986"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3656">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="810.28187" z="1209.93201"/>
 			<Orientation y="2.35621"/>
@@ -28099,43 +28099,43 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5501">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="359.23847" z="1069.61438"/>
 			<Orientation y="-2.19227"/>
 		</Entity>
 		<Entity uid="5502">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="352.20148" z="1068.76246"/>
 			<Orientation y="-2.43834"/>
 		</Entity>
 		<Entity uid="5503">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="346.7078" z="1073.13196"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5504">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="355.33158" z="1071.73877"/>
 			<Orientation y="1.15523"/>
 		</Entity>
 		<Entity uid="5505">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="345.51551" z="1082.05042"/>
 			<Orientation y="-2.65954"/>
 		</Entity>
 		<Entity uid="5506">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="360.38465" z="1080.39307"/>
 			<Orientation y="-1.46682"/>
 		</Entity>
 		<Entity uid="5508">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="346.43482" z="1085.29017"/>
 			<Orientation y="-0.82096"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
@@ -13657,79 +13657,79 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2865">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="791.32148" z="1224.46912"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2866">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="797.35993" z="1218.55835"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2867">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="804.60273" z="1211.61585"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2868">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="810.52442" z="1207.18714"/>
 			<Orientation y="2.11304"/>
 		</Entity>
 		<Entity uid="2869">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="870.89228" z="1241.38831"/>
 			<Orientation y="-2.71221"/>
 		</Entity>
 		<Entity uid="2870">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="868.19227" z="1232.29871"/>
 			<Orientation y="-2.82464"/>
 		</Entity>
 		<Entity uid="2871">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="865.73304" z="1226.63416"/>
 			<Orientation y="-2.53281"/>
 		</Entity>
 		<Entity uid="2872">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="793.9148" z="1224.96644"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2873">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="800.49" z="1217.96253"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2874">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="804.54041" z="1214.59961"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2875">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="797.425" z="1229.13611"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2876">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="858.78125" z="1224.85914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2877">
-			<Template>other/palisades_rocks_watchtower</Template>
+			<Template>structures/palisades_watchtower</Template>
 			<Player>0</Player>
 			<Position x="796.94703" z="1271.39234"/>
 			<Orientation y="2.35621"/>
@@ -17905,13 +17905,13 @@
 			<Orientation y="-0.03605"/>
 		</Entity>
 		<Entity uid="3655">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="788.43244" z="1230.97986"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3656">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="810.28187" z="1209.93201"/>
 			<Orientation y="2.35621"/>
@@ -28119,43 +28119,43 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5501">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="359.23847" z="1069.61438"/>
 			<Orientation y="-2.19227"/>
 		</Entity>
 		<Entity uid="5502">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="352.20148" z="1068.76246"/>
 			<Orientation y="-2.43834"/>
 		</Entity>
 		<Entity uid="5503">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="346.7078" z="1073.13196"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5504">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="355.33158" z="1071.73877"/>
 			<Orientation y="1.15523"/>
 		</Entity>
 		<Entity uid="5505">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="345.51551" z="1082.05042"/>
 			<Orientation y="-2.65954"/>
 		</Entity>
 		<Entity uid="5506">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="360.38465" z="1080.39307"/>
 			<Orientation y="-1.46682"/>
 		</Entity>
 		<Entity uid="5508">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="346.43482" z="1085.29017"/>
 			<Orientation y="-0.82096"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Azure Coast.xml
@@ -13709,82 +13709,82 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2865">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="791.32148" z="1224.46912"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="2875"/>
 		</Entity>
 		<Entity uid="2866">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="797.35993" z="1218.55835"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2867">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="804.60273" z="1211.61585"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2868">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="810.52442" z="1207.18714"/>
 			<Orientation y="2.11304"/>
 		</Entity>
 		<Entity uid="2869">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="870.89228" z="1241.38831"/>
 			<Orientation y="-2.71221"/>
 		</Entity>
 		<Entity uid="2870">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="868.19227" z="1232.29871"/>
 			<Orientation y="-2.82464"/>
 		</Entity>
 		<Entity uid="2871">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="865.73304" z="1226.63416"/>
 			<Orientation y="-2.53281"/>
 			<Obstruction group="2876"/>
 		</Entity>
 		<Entity uid="2872">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="793.9148" z="1224.96644"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="2875"/>
 		</Entity>
 		<Entity uid="2873">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="800.49" z="1217.96253"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2874">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="804.54041" z="1214.59961"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2875">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="797.425" z="1229.13611"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2876">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="858.78125" z="1224.85914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2877">
-			<Template>other/palisades_rocks_watchtower</Template>
+			<Template>structures/palisades_watchtower</Template>
 			<Player>0</Player>
 			<Position x="796.94703" z="1271.39234"/>
 			<Orientation y="2.35621"/>
@@ -17960,14 +17960,14 @@
 			<Orientation y="-0.03605"/>
 		</Entity>
 		<Entity uid="3655">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="788.43244" z="1230.97986"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="2875"/>
 		</Entity>
 		<Entity uid="3656">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="810.28187" z="1209.93201"/>
 			<Orientation y="2.35621"/>
@@ -28175,44 +28175,44 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5501">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="359.23847" z="1069.61438"/>
 			<Orientation y="-2.19227"/>
 		</Entity>
 		<Entity uid="5502">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="352.20148" z="1068.76246"/>
 			<Orientation y="-2.43834"/>
 		</Entity>
 		<Entity uid="5503">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="346.7078" z="1073.13196"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5504">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="355.33158" z="1071.73877"/>
 			<Orientation y="1.15523"/>
 		</Entity>
 		<Entity uid="5505">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="345.51551" z="1082.05042"/>
 			<Orientation y="-2.65954"/>
 			<Obstruction group="5508"/>
 		</Entity>
 		<Entity uid="5506">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="360.38465" z="1080.39307"/>
 			<Orientation y="-1.46682"/>
 		</Entity>
 		<Entity uid="5508">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="346.43482" z="1085.29017"/>
 			<Orientation y="-0.82096"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
@@ -152,226 +152,226 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="482.20899" z="466.5011"/>
 			<Orientation y="0.798"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="476.24488" z="485.9672"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="474.18104" z="477.94306"/>
 			<Orientation y="-3.13718"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="478.70936" z="470.50977"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="471.67286" z="483.37357"/>
 			<Orientation y="3.01175"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="476.61084" z="492.29947"/>
 			<Orientation y="-2.15049"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="17">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>1</Player>
 			<Position x="469.74146" z="484.21293"/>
 			<Orientation y="-3.02302"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="483.19153" z="490.37943"/>
 			<Orientation y="0.89289"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="19">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="610.99646" z="511.39365"/>
 			<Orientation y="2.45415"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="21">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="487.53614" z="493.36875"/>
 			<Orientation y="2.45597"/>
 		</Entity>
 		<Entity uid="22">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="514.24177" z="388.66071"/>
 			<Orientation y="0.78141"/>
 		</Entity>
 		<Entity uid="23">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="518.357" z="384.61481"/>
 			<Orientation y="-0.85848"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="24">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="526.18671" z="380.61622"/>
 			<Orientation y="1.6486"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="25">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="533.08259" z="381.76783"/>
 			<Orientation y="-0.80591"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="607.53028" z="515.9892"/>
 			<Orientation y="-2.36693"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="616.34473" z="507.865"/>
 			<Orientation y="-2.31174"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="618.3755" z="499.64411"/>
 			<Orientation y="-0.07187"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="614.79957" z="492.62623"/>
 			<Orientation y="-2.28614"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="536.74286" z="387.66364"/>
 			<Orientation y="0.78063"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="528.35297" z="377.89344"/>
 			<Orientation y="1.46691"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="538.6479" z="385.08393"/>
 			<Orientation y="-2.65601"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="610.68348" z="489.12134"/>
 			<Orientation y="-0.93099"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="540.60822" z="391.53864"/>
 			<Orientation y="-0.77671"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="475.37781" z="469.84174"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="517.82917" z="381.92432"/>
 			<Orientation y="-0.83996"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="614.49573" z="513.33027"/>
 			<Orientation y="1.99071"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="41">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="622.45093" z="502.36292"/>
 			<Orientation y="-0.08655"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="618.1869" z="490.72931"/>
 			<Orientation y="0.84478"/>
 		</Entity>
 		<Entity uid="45">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>1</Player>
 			<Position x="539.58967" z="383.23609"/>
 			<Orientation y="-2.54506"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="528.98426" z="523.93824"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="59">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="521.3584" z="531.83594"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="60">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="512.36524" z="532.22291"/>
 			<Orientation y="0.8262"/>
 		</Entity>
 		<Entity uid="62">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="527.65522" z="516.28693"/>
 			<Orientation y="-2.32161"/>
 		</Entity>
 		<Entity uid="63">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="480.51575" z="497.88965"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="64">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="620.88758" z="510.52118"/>
 			<Orientation y="2.35621"/>
@@ -1174,242 +1174,242 @@
 			<Orientation y="-0.68833"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="684.05396" z="297.92887"/>
 			<Orientation y="1.57081"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="655.0287" z="325.88776"/>
 			<Orientation y="-3.12851"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="719.38245" z="329.00669"/>
 			<Orientation y="0.019"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="211">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="659.87806" z="317.39954"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="212">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="675.45868" z="302.58637"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="213">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="656.33838" z="334.16984"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="214">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="663.99408" z="312.55082"/>
 			<Orientation y="0.85485"/>
 		</Entity>
 		<Entity uid="215">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="671.18451" z="306.51273"/>
 			<Orientation y="0.98328"/>
 		</Entity>
 		<Entity uid="216">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="693.20221" z="298.94587"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="217">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="697.03986" z="304.8022"/>
 			<Orientation y="-2.32073"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="218">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="701.25336" z="308.86518"/>
 			<Orientation y="-0.9034"/>
 		</Entity>
 		<Entity uid="219">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="714.81586" z="321.14939"/>
 			<Orientation y="-2.32953"/>
 		</Entity>
 		<Entity uid="220">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="710.23035" z="317.17475"/>
 			<Orientation y="-0.82479"/>
 		</Entity>
 		<Entity uid="221">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="717.75721" z="335.52997"/>
 			<Orientation y="-2.29558"/>
 		</Entity>
 		<Entity uid="222">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="712.4311" z="339.22507"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="223">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="662.96521" z="338.20402"/>
 			<Orientation y="-2.39802"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="224">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="666.95826" z="342.83884"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="225">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="653.11017" z="314.27317"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="704.35474" z="297.19034"/>
 			<Orientation y="-2.14817"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="701.71216" z="300.51105"/>
 			<Orientation y="-2.44234"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="228">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="693.07361" z="291.96988"/>
 			<Orientation y="1.03708"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="229">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="682.4422" z="291.07633"/>
 			<Orientation y="1.8888"/>
 		</Entity>
 		<Entity uid="230">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="673.86945" z="296.69202"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="231">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="655.08265" z="315.04798"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="232">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="651.6211" z="324.66071"/>
 			<Orientation y="3.07378"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="233">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="659.42688" z="342.44599"/>
 			<Orientation y="-2.10112"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="234">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="698.97632" z="355.64368"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="235">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="714.56366" z="344.34357"/>
 			<Orientation y="-1.35111"/>
 		</Entity>
 		<Entity uid="236">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="721.93232" z="334.15006"/>
 			<Orientation y="-0.13688"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="237">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="718.29987" z="319.1367"/>
 			<Orientation y="-2.47904"/>
 		</Entity>
 		<Entity uid="238">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="722.13477" z="320.52903"/>
 			<Orientation y="-2.55782"/>
 		</Entity>
 		<Entity uid="239">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="672.78663" z="296.10804"/>
 			<Orientation y="2.13321"/>
 		</Entity>
 		<Entity uid="240">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="651.22596" z="331.41044"/>
 			<Orientation y="0.33802"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="241">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="701.39045" z="357.88242"/>
 			<Orientation y="-0.79641"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="691.37531" z="363.18299"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="684.69452" z="364.70035"/>
 			<Orientation y="-2.32055"/>
 		</Entity>
 		<Entity uid="244">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="677.42066" z="361.29361"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="672.14405" z="360.46451"/>
 			<Orientation y="0.71708"/>
@@ -6830,255 +6830,255 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1199">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="492.33674" z="747.0647"/>
 			<Orientation y="3.04125"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1200">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="556.52302" z="748.91492"/>
 			<Orientation y="0.13331"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1201">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="523.2497" z="717.52527"/>
 			<Orientation y="1.64791"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1202">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="493.73768" z="754.77186"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1203">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="530.94361" z="719.4095"/>
 			<Orientation y="-0.79741"/>
 		</Entity>
 		<Entity uid="1204">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="497.521" z="738.9048"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1205">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="515.03748" z="721.39338"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1206">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="500.11237" z="759.49286"/>
 			<Orientation y="0.78994"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1207">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="501.16196" z="735.24567"/>
 			<Orientation y="0.86066"/>
 		</Entity>
 		<Entity uid="1208">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="510.82416" z="726.23407"/>
 			<Orientation y="0.70745"/>
 		</Entity>
 		<Entity uid="1209">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="535.49274" z="725.50745"/>
 			<Orientation y="-2.40027"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1210">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="551.21705" z="740.73426"/>
 			<Orientation y="0.78866"/>
 		</Entity>
 		<Entity uid="1211">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="549.47571" z="760.52247"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1212">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="554.79676" z="757.65796"/>
 			<Orientation y="0.73365"/>
 		</Entity>
 		<Entity uid="1213">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="545.48652" z="764.6034"/>
 			<Orientation y="-2.2079"/>
 		</Entity>
 		<Entity uid="1214">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="539.18036" z="730.37482"/>
 			<Orientation y="-0.8873"/>
 		</Entity>
 		<Entity uid="1215">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="547.5373" z="737.01307"/>
 			<Orientation y="-0.91549"/>
 		</Entity>
 		<Entity uid="1216">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="503.88523" z="763.0005"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1217">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="529.79188" z="784.65223"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1218">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="537.66755" z="777.00178"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1219">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="523.20289" z="787.95887"/>
 			<Orientation y="-2.25115"/>
 		</Entity>
 		<Entity uid="1220">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="516.67939" z="786.54712"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1221">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="511.17219" z="785.4126"/>
 			<Orientation y="-2.29975"/>
 		</Entity>
 		<Entity uid="1222">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="498.48908" z="766.07898"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1223">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="496.61084" z="761.81751"/>
 			<Orientation y="-2.3148"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1224">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="488.82264" z="753.06788"/>
 			<Orientation y="0.20873"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1225">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="491.10233" z="741.93824"/>
 			<Orientation y="-0.53002"/>
 		</Entity>
 		<Entity uid="1226">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="495.40784" z="736.47083"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1227">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="512.1609" z="719.02485"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1228">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="520.12793" z="713.16321"/>
 			<Orientation y="1.71013"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1229">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="528.99933" z="712.53443"/>
 			<Orientation y="1.4199"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1230">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="537.6883" z="721.14771"/>
 			<Orientation y="-2.77094"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1231">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="555.98835" z="739.03309"/>
 			<Orientation y="-2.24331"/>
 		</Entity>
 		<Entity uid="1232">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="559.21705" z="751.85297"/>
 			<Orientation y="3.03222"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1233">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="553.83185" z="764.43342"/>
 			<Orientation y="2.02135"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1235">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="510.13163" z="717.089"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1236">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="490.00794" z="739.16767"/>
 			<Orientation y="2.58219"/>
 		</Entity>
 		<Entity uid="1237">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="540.9997" z="725.49866"/>
 			<Orientation y="-3.02762"/>
 		</Entity>
 		<Entity uid="1238">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="537.4734" z="782.25226"/>
 			<Orientation y="2.17074"/>
 		</Entity>
 		<Entity uid="1239">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="560.39753" z="746.3235"/>
 			<Orientation y="0.76757"/>
@@ -16475,669 +16475,669 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2813">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="472.01038" z="468.24732"/>
 			<Orientation y="-0.70112"/>
 		</Entity>
 		<Entity uid="2814">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.90992" z="474.31525"/>
 			<Orientation y="0.07686"/>
 		</Entity>
 		<Entity uid="2815">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="477.87183" z="466.14332"/>
 			<Orientation y="-0.8854"/>
 		</Entity>
 		<Entity uid="2816">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="542.24238" z="388.53327"/>
 			<Orientation y="-2.16036"/>
 		</Entity>
 		<Entity uid="2817">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="518.06708" z="378.56788"/>
 			<Orientation y="-0.97393"/>
 		</Entity>
 		<Entity uid="2818">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="513.35163" z="386.16688"/>
 			<Orientation y="-0.87737"/>
 		</Entity>
 		<Entity uid="2819">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="479.91993" z="465.45447"/>
 			<Orientation y="-0.69239"/>
 		</Entity>
 		<Entity uid="2820">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="523.27387" z="375.42914"/>
 			<Orientation y="-1.37801"/>
 		</Entity>
 		<Entity uid="2821">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="530.53693" z="375.76423"/>
 			<Orientation y="-1.70125"/>
 		</Entity>
 		<Entity uid="2822">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="539.97602" z="381.84424"/>
 			<Orientation y="-3.07622"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="2823">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="535.66413" z="376.92823"/>
 			<Orientation y="-1.97432"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="2824">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="515.27973" z="379.20667"/>
 			<Orientation y="-1.03014"/>
 		</Entity>
 		<Entity uid="2825">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="538.58295" z="379.14258"/>
 			<Orientation y="-2.15874"/>
 		</Entity>
 		<Entity uid="2826">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="620.93213" z="489.00702"/>
 			<Orientation y="-2.4399"/>
 		</Entity>
 		<Entity uid="2827">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="625.71766" z="497.99378"/>
 			<Orientation y="-2.91565"/>
 		</Entity>
 		<Entity uid="2828">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="626.34742" z="508.18137"/>
 			<Orientation y="2.76719"/>
 		</Entity>
 		<Entity uid="2829">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.61707" z="489.40665"/>
 			<Orientation y="0.40384"/>
 		</Entity>
 		<Entity uid="2830">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="477.85718" z="497.22999"/>
 			<Orientation y="0.46006"/>
 		</Entity>
 		<Entity uid="2831">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="472.89136" z="494.66279"/>
 			<Orientation y="0.68361"/>
 		</Entity>
 		<Entity uid="2832">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.87281" z="483.74381"/>
 			<Orientation y="-0.42118"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="2833">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.511" z="479.6084"/>
 			<Orientation y="-0.01011"/>
 		</Entity>
 		<Entity uid="2834">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="622.84778" z="513.60016"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2835">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="610.30414" z="522.59626"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2836">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="533.4065" z="525.636"/>
 			<Orientation y="2.46938"/>
 		</Entity>
 		<Entity uid="2837">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="527.26124" z="535.02637"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2838">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="521.0116" z="536.56934"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2839">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="511.83973" z="535.75794"/>
 			<Orientation y="0.90784"/>
 		</Entity>
 		<Entity uid="2840">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="530.73383" z="516.83906"/>
 			<Orientation y="-2.62179"/>
 		</Entity>
 		<Entity uid="2841">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="523.54078" z="511.27735"/>
 			<Orientation y="-0.80524"/>
 		</Entity>
 		<Entity uid="2842">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="507.65061" z="526.03431"/>
 			<Orientation y="0.16437"/>
 		</Entity>
 		<Entity uid="2843">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="650.45765" z="319.86661"/>
 			<Orientation y="-0.00403"/>
 		</Entity>
 		<Entity uid="2844">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="652.77576" z="313.2079"/>
 			<Orientation y="-0.94945"/>
 		</Entity>
 		<Entity uid="2845">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="656.70746" z="314.5224"/>
 			<Orientation y="-0.95185"/>
 		</Entity>
 		<Entity uid="2846">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="659.87409" z="312.04157"/>
 			<Orientation y="-0.96984"/>
 		</Entity>
 		<Entity uid="2847">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="660.00635" z="309.53974"/>
 			<Orientation y="-1.15148"/>
 		</Entity>
 		<Entity uid="2848">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="669.43104" z="300.72223"/>
 			<Orientation y="-0.76438"/>
 		</Entity>
 		<Entity uid="2849">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="672.28089" z="294.32456"/>
 			<Orientation y="-1.1818"/>
 		</Entity>
 		<Entity uid="2850">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="679.23224" z="291.83704"/>
 			<Orientation y="-1.20165"/>
 		</Entity>
 		<Entity uid="2851">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="677.43885" z="295.14255"/>
 			<Orientation y="-1.0089"/>
 		</Entity>
 		<Entity uid="2852">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="683.62421" z="288.09305"/>
 			<Orientation y="-1.42161"/>
 		</Entity>
 		<Entity uid="2853">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="687.67896" z="292.78303"/>
 			<Orientation y="-1.75821"/>
 		</Entity>
 		<Entity uid="2854">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="692.96589" z="288.3407"/>
 			<Orientation y="-1.56453"/>
 		</Entity>
 		<Entity uid="2855">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="697.91285" z="290.92493"/>
 			<Orientation y="-2.39911"/>
 		</Entity>
 		<Entity uid="2856">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="699.18335" z="301.37122"/>
 			<Orientation y="-2.17548"/>
 		</Entity>
 		<Entity uid="2857">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="704.12989" z="300.59104"/>
 			<Orientation y="-2.4522"/>
 		</Entity>
 		<Entity uid="2858">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="714.33185" z="316.76291"/>
 			<Orientation y="-1.80022"/>
 		</Entity>
 		<Entity uid="2859">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="716.73841" z="318.4087"/>
 			<Orientation y="-2.1821"/>
 		</Entity>
 		<Entity uid="2860">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="721.32953" z="317.90125"/>
 			<Orientation y="-2.32638"/>
 		</Entity>
 		<Entity uid="2861">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="722.58442" z="324.998"/>
 			<Orientation y="3.04751"/>
 		</Entity>
 		<Entity uid="2862">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="726.64844" z="333.16135"/>
 			<Orientation y="3.00904"/>
 		</Entity>
 		<Entity uid="2863">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="723.15845" z="328.761"/>
 			<Orientation y="-2.74711"/>
 		</Entity>
 		<Entity uid="2864">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="729.43464" z="340.6692"/>
 			<Orientation y="2.86861"/>
 		</Entity>
 		<Entity uid="2865">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="726.05115" z="341.6232"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2866">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="723.8404" z="344.07898"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2867">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="719.93421" z="347.98157"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2868">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="702.70435" z="353.51941"/>
 			<Orientation y="3.00686"/>
 		</Entity>
 		<Entity uid="2869">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="701.76526" z="357.99756"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2870">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="698.17316" z="361.3985"/>
 			<Orientation y="2.35085"/>
 		</Entity>
 		<Entity uid="2871">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="695.74598" z="364.07212"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2872">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="691.30768" z="367.41016"/>
 			<Orientation y="2.01575"/>
 		</Entity>
 		<Entity uid="2873">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="684.27729" z="369.0294"/>
 			<Orientation y="1.4229"/>
 		</Entity>
 		<Entity uid="2874">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="679.0522" z="363.01642"/>
 			<Orientation y="1.3751"/>
 		</Entity>
 		<Entity uid="2875">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="672.54822" z="362.63065"/>
 			<Orientation y="0.683"/>
 		</Entity>
 		<Entity uid="2876">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="660.72852" z="345.87946"/>
 			<Orientation y="0.69042"/>
 		</Entity>
 		<Entity uid="2877">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="670.52619" z="359.05161"/>
 			<Orientation y="0.5557"/>
 		</Entity>
 		<Entity uid="2878">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="655.00214" z="340.57923"/>
 			<Orientation y="0.94704"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="2879">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="651.36713" z="336.12598"/>
 			<Orientation y="0.46546"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="2880">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="649.7345" z="332.45417"/>
 			<Orientation y="0.25284"/>
 		</Entity>
 		<Entity uid="2881">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="648.935" z="328.39548"/>
 			<Orientation y="0.01598"/>
 		</Entity>
 		<Entity uid="2882">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="650.99775" z="324.19266"/>
 			<Orientation y="0.06107"/>
 		</Entity>
 		<Entity uid="2883">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.24299" z="749.10236"/>
 			<Orientation y="-0.00702"/>
 		</Entity>
 		<Entity uid="2884">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.59592" z="740.86127"/>
 			<Orientation y="-0.50715"/>
 		</Entity>
 		<Entity uid="2885">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="493.29261" z="734.26764"/>
 			<Orientation y="-0.67898"/>
 		</Entity>
 		<Entity uid="2886">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="489.53187" z="738.32642"/>
 			<Orientation y="-0.86304"/>
 		</Entity>
 		<Entity uid="2887">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="496.33817" z="731.9834"/>
 			<Orientation y="-1.16538"/>
 		</Entity>
 		<Entity uid="2888">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="509.31885" z="720.3921"/>
 			<Orientation y="-0.87647"/>
 		</Entity>
 		<Entity uid="2889">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="512.92438" z="715.10462"/>
 			<Orientation y="-0.82251"/>
 		</Entity>
 		<Entity uid="2890">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="516.00458" z="712.14997"/>
 			<Orientation y="-1.27614"/>
 		</Entity>
 		<Entity uid="2891">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="520.76581" z="710.31745"/>
 			<Orientation y="-1.37185"/>
 		</Entity>
 		<Entity uid="2892">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="523.75538" z="709.80964"/>
 			<Orientation y="-1.57604"/>
 		</Entity>
 		<Entity uid="2893">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="527.29871" z="709.76325"/>
 			<Orientation y="-1.76961"/>
 		</Entity>
 		<Entity uid="2894">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="531.2234" z="712.94092"/>
 			<Orientation y="-1.74183"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="2895">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="535.57294" z="714.8888"/>
 			<Orientation y="-2.17205"/>
 		</Entity>
 		<Entity uid="2896">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="539.27808" z="720.41205"/>
 			<Orientation y="-2.32165"/>
 		</Entity>
 		<Entity uid="2897">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="541.88831" z="726.39582"/>
 			<Orientation y="-2.38575"/>
 		</Entity>
 		<Entity uid="2898">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="552.43116" z="735.5746"/>
 			<Orientation y="-2.30597"/>
 		</Entity>
 		<Entity uid="2899">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="558.83088" z="738.67023"/>
 			<Orientation y="-2.51851"/>
 		</Entity>
 		<Entity uid="2900">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="560.92945" z="744.74311"/>
 			<Orientation y="-2.7452"/>
 		</Entity>
 		<Entity uid="2901">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="563.73938" z="752.93024"/>
 			<Orientation y="3.05733"/>
 		</Entity>
 		<Entity uid="2902">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="560.80475" z="767.31702"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2903">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="564.8418" z="758.30445"/>
 			<Orientation y="2.81827"/>
 		</Entity>
 		<Entity uid="2904">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="563.84766" z="765.32544"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2905">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="557.50605" z="767.2367"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2906">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="552.09668" z="768.20875"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2907">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="554.85712" z="770.71106"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2908">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="541.93866" z="783.54487"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2909">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="538.19416" z="786.88123"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2910">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="534.67688" z="788.47327"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2911">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="530.04267" z="789.56434"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2912">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="527.43018" z="790.53357"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2913">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="523.60145" z="790.44257"/>
 			<Orientation y="1.52717"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="518.84314" z="789.35407"/>
 			<Orientation y="1.24521"/>
 		</Entity>
 		<Entity uid="2915">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="516.83735" z="786.22309"/>
 			<Orientation y="1.81464"/>
 		</Entity>
 		<Entity uid="2916">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="510.76075" z="788.40809"/>
 			<Orientation y="1.11846"/>
 		</Entity>
 		<Entity uid="2917">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="507.77594" z="784.81489"/>
 			<Orientation y="0.32105"/>
 		</Entity>
 		<Entity uid="2918">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="494.91541" z="764.33021"/>
 			<Orientation y="0.72265"/>
 		</Entity>
 		<Entity uid="2919">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="491.62031" z="760.31684"/>
 			<Orientation y="0.89811"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="2920">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.46906" z="753.0901"/>
 			<Orientation y="0.07598"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="2921">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="488.01618" z="757.7483"/>
 			<Orientation y="0.74415"/>
 		</Entity>
 		<Entity uid="2922">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="486.75815" z="745.06702"/>
 			<Orientation y="-0.16294"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
@@ -154,232 +154,232 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="482.20899" z="466.5011"/>
 			<Orientation y="0.798"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="476.24488" z="485.9672"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="474.18104" z="477.94306"/>
 			<Orientation y="-3.13718"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="478.70936" z="470.50977"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="471.67286" z="483.37357"/>
 			<Orientation y="3.01175"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="476.61084" z="492.29947"/>
 			<Orientation y="-2.15049"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="17">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>1</Player>
 			<Position x="469.74146" z="484.21293"/>
 			<Orientation y="-3.02302"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="483.19153" z="490.37943"/>
 			<Orientation y="0.89289"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="19">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="610.99646" z="511.39365"/>
 			<Orientation y="2.45415"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="21">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="487.53614" z="493.36875"/>
 			<Orientation y="2.45597"/>
 		</Entity>
 		<Entity uid="22">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="514.24177" z="388.66071"/>
 			<Orientation y="0.78141"/>
 		</Entity>
 		<Entity uid="23">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="518.357" z="384.61481"/>
 			<Orientation y="-0.85848"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="24">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="526.18671" z="380.61622"/>
 			<Orientation y="1.6486"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="25">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="533.08259" z="381.76783"/>
 			<Orientation y="-0.80591"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="607.53028" z="515.9892"/>
 			<Orientation y="-2.36693"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="616.34473" z="507.865"/>
 			<Orientation y="-2.31174"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="618.3755" z="499.64411"/>
 			<Orientation y="-0.07187"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="614.79957" z="492.62623"/>
 			<Orientation y="-2.28614"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="536.74286" z="387.66364"/>
 			<Orientation y="0.78063"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="528.35297" z="377.89344"/>
 			<Orientation y="1.46691"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="538.6479" z="385.08393"/>
 			<Orientation y="-2.65601"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="610.68348" z="489.12134"/>
 			<Orientation y="-0.93099"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="540.60822" z="391.53864"/>
 			<Orientation y="-0.77671"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="475.37781" z="469.84174"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="517.82917" z="381.92432"/>
 			<Orientation y="-0.83996"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="614.49573" z="513.33027"/>
 			<Orientation y="1.99071"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="41">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="622.45093" z="502.36292"/>
 			<Orientation y="-0.08655"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="618.1869" z="490.72931"/>
 			<Orientation y="0.84478"/>
 		</Entity>
 		<Entity uid="45">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>1</Player>
 			<Position x="539.58967" z="383.23609"/>
 			<Orientation y="-2.54506"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="528.98426" z="523.93824"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="59">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="521.3584" z="531.83594"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="60">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="512.36524" z="532.22291"/>
 			<Orientation y="0.8262"/>
 		</Entity>
 		<Entity uid="61">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="505.78309" z="529.50135"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="62">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="499.60462" z="531.76966"/>
 			<Orientation y="-2.39812"/>
 		</Entity>
 		<Entity uid="63">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="480.51575" z="497.88965"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="64">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="620.88758" z="510.52118"/>
 			<Orientation y="2.35621"/>
@@ -1182,242 +1182,242 @@
 			<Orientation y="-0.68833"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="684.05396" z="297.92887"/>
 			<Orientation y="1.57081"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="655.0287" z="325.88776"/>
 			<Orientation y="-3.12851"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="719.38245" z="329.00669"/>
 			<Orientation y="0.019"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="211">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="659.87806" z="317.39954"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="212">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="675.45868" z="302.58637"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="213">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="656.33838" z="334.16984"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="214">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="663.99408" z="312.55082"/>
 			<Orientation y="0.85485"/>
 		</Entity>
 		<Entity uid="215">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="671.18451" z="306.51273"/>
 			<Orientation y="0.98328"/>
 		</Entity>
 		<Entity uid="216">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="693.20221" z="298.94587"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="217">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="697.03986" z="304.8022"/>
 			<Orientation y="-2.32073"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="218">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="701.25336" z="308.86518"/>
 			<Orientation y="-0.9034"/>
 		</Entity>
 		<Entity uid="219">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="714.81586" z="321.14939"/>
 			<Orientation y="-2.32953"/>
 		</Entity>
 		<Entity uid="220">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="710.23035" z="317.17475"/>
 			<Orientation y="-0.82479"/>
 		</Entity>
 		<Entity uid="221">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="717.75721" z="335.52997"/>
 			<Orientation y="-2.29558"/>
 		</Entity>
 		<Entity uid="222">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="712.4311" z="339.22507"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="223">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="662.96521" z="338.20402"/>
 			<Orientation y="-2.39802"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="224">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="666.95826" z="342.83884"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="225">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="653.11017" z="314.27317"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="704.35474" z="297.19034"/>
 			<Orientation y="-2.14817"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="701.71216" z="300.51105"/>
 			<Orientation y="-2.44234"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="228">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="693.07361" z="291.96988"/>
 			<Orientation y="1.03708"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="229">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="682.4422" z="291.07633"/>
 			<Orientation y="1.8888"/>
 		</Entity>
 		<Entity uid="230">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="673.86945" z="296.69202"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="231">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="655.08265" z="315.04798"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="232">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="651.6211" z="324.66071"/>
 			<Orientation y="3.07378"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="233">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="659.42688" z="342.44599"/>
 			<Orientation y="-2.10112"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="234">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="698.97632" z="355.64368"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="235">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="714.56366" z="344.34357"/>
 			<Orientation y="-1.35111"/>
 		</Entity>
 		<Entity uid="236">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="721.93232" z="334.15006"/>
 			<Orientation y="-0.13688"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="237">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="718.29987" z="319.1367"/>
 			<Orientation y="-2.47904"/>
 		</Entity>
 		<Entity uid="238">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="722.13477" z="320.52903"/>
 			<Orientation y="-2.55782"/>
 		</Entity>
 		<Entity uid="239">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="672.78663" z="296.10804"/>
 			<Orientation y="2.13321"/>
 		</Entity>
 		<Entity uid="240">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="651.22596" z="331.41044"/>
 			<Orientation y="0.33802"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="241">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="701.39045" z="357.88242"/>
 			<Orientation y="-0.79641"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="691.37531" z="363.18299"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="684.69452" z="364.70035"/>
 			<Orientation y="-2.32055"/>
 		</Entity>
 		<Entity uid="244">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="677.42066" z="361.29361"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="672.14405" z="360.46451"/>
 			<Orientation y="0.71708"/>
@@ -6838,255 +6838,255 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1199">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="492.33674" z="747.0647"/>
 			<Orientation y="3.04125"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1200">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="556.52302" z="748.91492"/>
 			<Orientation y="0.13331"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1201">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="523.2497" z="717.52527"/>
 			<Orientation y="1.64791"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1202">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="493.73768" z="754.77186"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1203">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="530.94361" z="719.4095"/>
 			<Orientation y="-0.79741"/>
 		</Entity>
 		<Entity uid="1204">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="497.521" z="738.9048"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1205">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="515.03748" z="721.39338"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1206">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="500.11237" z="759.49286"/>
 			<Orientation y="0.78994"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1207">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="501.16196" z="735.24567"/>
 			<Orientation y="0.86066"/>
 		</Entity>
 		<Entity uid="1208">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="510.82416" z="726.23407"/>
 			<Orientation y="0.70745"/>
 		</Entity>
 		<Entity uid="1209">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="535.49274" z="725.50745"/>
 			<Orientation y="-2.40027"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1210">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="551.21705" z="740.73426"/>
 			<Orientation y="0.78866"/>
 		</Entity>
 		<Entity uid="1211">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="549.47571" z="760.52247"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1212">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="554.79676" z="757.65796"/>
 			<Orientation y="0.73365"/>
 		</Entity>
 		<Entity uid="1213">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="545.48652" z="764.6034"/>
 			<Orientation y="-2.2079"/>
 		</Entity>
 		<Entity uid="1214">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="539.18036" z="730.37482"/>
 			<Orientation y="-0.8873"/>
 		</Entity>
 		<Entity uid="1215">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="547.5373" z="737.01307"/>
 			<Orientation y="-0.91549"/>
 		</Entity>
 		<Entity uid="1216">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="503.88523" z="763.0005"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1217">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="529.79188" z="784.65223"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1218">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="537.66755" z="777.00178"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1219">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="523.20289" z="787.95887"/>
 			<Orientation y="-2.25115"/>
 		</Entity>
 		<Entity uid="1220">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="516.67939" z="786.54712"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1221">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="511.17219" z="785.4126"/>
 			<Orientation y="-2.29975"/>
 		</Entity>
 		<Entity uid="1222">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="498.48908" z="766.07898"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1223">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="496.61084" z="761.81751"/>
 			<Orientation y="-2.3148"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1224">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="488.82264" z="753.06788"/>
 			<Orientation y="0.20873"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1225">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="491.10233" z="741.93824"/>
 			<Orientation y="-0.53002"/>
 		</Entity>
 		<Entity uid="1226">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="495.40784" z="736.47083"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1227">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="512.1609" z="719.02485"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1228">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="520.12793" z="713.16321"/>
 			<Orientation y="1.71013"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1229">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="528.99933" z="712.53443"/>
 			<Orientation y="1.4199"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1230">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="537.6883" z="721.14771"/>
 			<Orientation y="-2.77094"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1231">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="555.98835" z="739.03309"/>
 			<Orientation y="-2.24331"/>
 		</Entity>
 		<Entity uid="1232">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="559.21705" z="751.85297"/>
 			<Orientation y="3.03222"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1233">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="553.83185" z="764.43342"/>
 			<Orientation y="2.02135"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1235">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="510.13163" z="717.089"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1236">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="490.00794" z="739.16767"/>
 			<Orientation y="2.58219"/>
 		</Entity>
 		<Entity uid="1237">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="540.9997" z="725.49866"/>
 			<Orientation y="-3.02762"/>
 		</Entity>
 		<Entity uid="1238">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="537.4734" z="782.25226"/>
 			<Orientation y="2.17074"/>
 		</Entity>
 		<Entity uid="1239">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="560.39753" z="746.3235"/>
 			<Orientation y="0.76757"/>
@@ -16483,669 +16483,669 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2813">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="472.01038" z="468.24732"/>
 			<Orientation y="-0.70112"/>
 		</Entity>
 		<Entity uid="2814">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.90992" z="474.31525"/>
 			<Orientation y="0.07686"/>
 		</Entity>
 		<Entity uid="2815">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="477.87183" z="466.14332"/>
 			<Orientation y="-0.8854"/>
 		</Entity>
 		<Entity uid="2816">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="542.24238" z="388.53327"/>
 			<Orientation y="-2.16036"/>
 		</Entity>
 		<Entity uid="2817">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="518.06708" z="378.56788"/>
 			<Orientation y="-0.97393"/>
 		</Entity>
 		<Entity uid="2818">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="513.35163" z="386.16688"/>
 			<Orientation y="-0.87737"/>
 		</Entity>
 		<Entity uid="2819">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="479.91993" z="465.45447"/>
 			<Orientation y="-0.69239"/>
 		</Entity>
 		<Entity uid="2820">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="523.27387" z="375.42914"/>
 			<Orientation y="-1.37801"/>
 		</Entity>
 		<Entity uid="2821">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="530.53693" z="375.76423"/>
 			<Orientation y="-1.70125"/>
 		</Entity>
 		<Entity uid="2822">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="539.97602" z="381.84424"/>
 			<Orientation y="-3.07622"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="2823">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="535.66413" z="376.92823"/>
 			<Orientation y="-1.97432"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="2824">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="515.27973" z="379.20667"/>
 			<Orientation y="-1.03014"/>
 		</Entity>
 		<Entity uid="2825">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="538.58295" z="379.14258"/>
 			<Orientation y="-2.15874"/>
 		</Entity>
 		<Entity uid="2826">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="620.93213" z="489.00702"/>
 			<Orientation y="-2.4399"/>
 		</Entity>
 		<Entity uid="2827">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="625.71766" z="497.99378"/>
 			<Orientation y="-2.91565"/>
 		</Entity>
 		<Entity uid="2828">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="626.34742" z="508.18137"/>
 			<Orientation y="2.76719"/>
 		</Entity>
 		<Entity uid="2829">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.61707" z="489.40665"/>
 			<Orientation y="0.40384"/>
 		</Entity>
 		<Entity uid="2830">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="477.85718" z="497.22999"/>
 			<Orientation y="0.46006"/>
 		</Entity>
 		<Entity uid="2831">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="472.89136" z="494.66279"/>
 			<Orientation y="0.68361"/>
 		</Entity>
 		<Entity uid="2832">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.87281" z="483.74381"/>
 			<Orientation y="-0.42118"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="2833">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="469.511" z="479.6084"/>
 			<Orientation y="-0.01011"/>
 		</Entity>
 		<Entity uid="2834">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="622.84778" z="513.60016"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2835">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="610.30414" z="522.59626"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2836">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="533.4065" z="525.636"/>
 			<Orientation y="2.46938"/>
 		</Entity>
 		<Entity uid="2837">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="527.26124" z="535.02637"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2838">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="521.0116" z="536.56934"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2839">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="511.83973" z="535.75794"/>
 			<Orientation y="0.90784"/>
 		</Entity>
 		<Entity uid="2840">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="506.81495" z="533.73548"/>
 			<Orientation y="1.89846"/>
 		</Entity>
 		<Entity uid="2841">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="502.90137" z="536.00892"/>
 			<Orientation y="1.3971"/>
 		</Entity>
 		<Entity uid="2842">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="497.14222" z="533.72693"/>
 			<Orientation y="0.16437"/>
 		</Entity>
 		<Entity uid="2843">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="650.45765" z="319.86661"/>
 			<Orientation y="-0.00403"/>
 		</Entity>
 		<Entity uid="2844">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="652.77576" z="313.2079"/>
 			<Orientation y="-0.94945"/>
 		</Entity>
 		<Entity uid="2845">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="656.70746" z="314.5224"/>
 			<Orientation y="-0.95185"/>
 		</Entity>
 		<Entity uid="2846">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="659.87409" z="312.04157"/>
 			<Orientation y="-0.96984"/>
 		</Entity>
 		<Entity uid="2847">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="660.00635" z="309.53974"/>
 			<Orientation y="-1.15148"/>
 		</Entity>
 		<Entity uid="2848">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="669.43104" z="300.72223"/>
 			<Orientation y="-0.76438"/>
 		</Entity>
 		<Entity uid="2849">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="672.28089" z="294.32456"/>
 			<Orientation y="-1.1818"/>
 		</Entity>
 		<Entity uid="2850">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="679.23224" z="291.83704"/>
 			<Orientation y="-1.20165"/>
 		</Entity>
 		<Entity uid="2851">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="677.43885" z="295.14255"/>
 			<Orientation y="-1.0089"/>
 		</Entity>
 		<Entity uid="2852">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="683.62421" z="288.09305"/>
 			<Orientation y="-1.42161"/>
 		</Entity>
 		<Entity uid="2853">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="687.67896" z="292.78303"/>
 			<Orientation y="-1.75821"/>
 		</Entity>
 		<Entity uid="2854">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="692.96589" z="288.3407"/>
 			<Orientation y="-1.56453"/>
 		</Entity>
 		<Entity uid="2855">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="697.91285" z="290.92493"/>
 			<Orientation y="-2.39911"/>
 		</Entity>
 		<Entity uid="2856">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="699.18335" z="301.37122"/>
 			<Orientation y="-2.17548"/>
 		</Entity>
 		<Entity uid="2857">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="704.12989" z="300.59104"/>
 			<Orientation y="-2.4522"/>
 		</Entity>
 		<Entity uid="2858">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="714.33185" z="316.76291"/>
 			<Orientation y="-1.80022"/>
 		</Entity>
 		<Entity uid="2859">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="716.73841" z="318.4087"/>
 			<Orientation y="-2.1821"/>
 		</Entity>
 		<Entity uid="2860">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="721.32953" z="317.90125"/>
 			<Orientation y="-2.32638"/>
 		</Entity>
 		<Entity uid="2861">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="722.58442" z="324.998"/>
 			<Orientation y="3.04751"/>
 		</Entity>
 		<Entity uid="2862">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="726.64844" z="333.16135"/>
 			<Orientation y="3.00904"/>
 		</Entity>
 		<Entity uid="2863">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="723.15845" z="328.761"/>
 			<Orientation y="-2.74711"/>
 		</Entity>
 		<Entity uid="2864">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="729.43464" z="340.6692"/>
 			<Orientation y="2.86861"/>
 		</Entity>
 		<Entity uid="2865">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="726.05115" z="341.6232"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2866">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="723.8404" z="344.07898"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2867">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="719.93421" z="347.98157"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2868">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="702.70435" z="353.51941"/>
 			<Orientation y="3.00686"/>
 		</Entity>
 		<Entity uid="2869">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="701.76526" z="357.99756"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2870">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="698.17316" z="361.3985"/>
 			<Orientation y="2.35085"/>
 		</Entity>
 		<Entity uid="2871">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="695.74598" z="364.07212"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2872">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="691.30768" z="367.41016"/>
 			<Orientation y="2.01575"/>
 		</Entity>
 		<Entity uid="2873">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="684.27729" z="369.0294"/>
 			<Orientation y="1.4229"/>
 		</Entity>
 		<Entity uid="2874">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="679.0522" z="363.01642"/>
 			<Orientation y="1.3751"/>
 		</Entity>
 		<Entity uid="2875">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="672.54822" z="362.63065"/>
 			<Orientation y="0.683"/>
 		</Entity>
 		<Entity uid="2876">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="660.72852" z="345.87946"/>
 			<Orientation y="0.69042"/>
 		</Entity>
 		<Entity uid="2877">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="670.52619" z="359.05161"/>
 			<Orientation y="0.5557"/>
 		</Entity>
 		<Entity uid="2878">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="655.00214" z="340.57923"/>
 			<Orientation y="0.94704"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="2879">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="651.36713" z="336.12598"/>
 			<Orientation y="0.46546"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="2880">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="649.7345" z="332.45417"/>
 			<Orientation y="0.25284"/>
 		</Entity>
 		<Entity uid="2881">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="648.935" z="328.39548"/>
 			<Orientation y="0.01598"/>
 		</Entity>
 		<Entity uid="2882">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="650.99775" z="324.19266"/>
 			<Orientation y="0.06107"/>
 		</Entity>
 		<Entity uid="2883">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.24299" z="749.10236"/>
 			<Orientation y="-0.00702"/>
 		</Entity>
 		<Entity uid="2884">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.59592" z="740.86127"/>
 			<Orientation y="-0.50715"/>
 		</Entity>
 		<Entity uid="2885">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="493.29261" z="734.26764"/>
 			<Orientation y="-0.67898"/>
 		</Entity>
 		<Entity uid="2886">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="489.53187" z="738.32642"/>
 			<Orientation y="-0.86304"/>
 		</Entity>
 		<Entity uid="2887">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="496.33817" z="731.9834"/>
 			<Orientation y="-1.16538"/>
 		</Entity>
 		<Entity uid="2888">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="509.31885" z="720.3921"/>
 			<Orientation y="-0.87647"/>
 		</Entity>
 		<Entity uid="2889">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="512.92438" z="715.10462"/>
 			<Orientation y="-0.82251"/>
 		</Entity>
 		<Entity uid="2890">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="516.00458" z="712.14997"/>
 			<Orientation y="-1.27614"/>
 		</Entity>
 		<Entity uid="2891">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="520.76581" z="710.31745"/>
 			<Orientation y="-1.37185"/>
 		</Entity>
 		<Entity uid="2892">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="523.75538" z="709.80964"/>
 			<Orientation y="-1.57604"/>
 		</Entity>
 		<Entity uid="2893">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="527.29871" z="709.76325"/>
 			<Orientation y="-1.76961"/>
 		</Entity>
 		<Entity uid="2894">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="531.2234" z="712.94092"/>
 			<Orientation y="-1.74183"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="2895">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="535.57294" z="714.8888"/>
 			<Orientation y="-2.17205"/>
 		</Entity>
 		<Entity uid="2896">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="539.27808" z="720.41205"/>
 			<Orientation y="-2.32165"/>
 		</Entity>
 		<Entity uid="2897">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="541.88831" z="726.39582"/>
 			<Orientation y="-2.38575"/>
 		</Entity>
 		<Entity uid="2898">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="552.43116" z="735.5746"/>
 			<Orientation y="-2.30597"/>
 		</Entity>
 		<Entity uid="2899">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="558.83088" z="738.67023"/>
 			<Orientation y="-2.51851"/>
 		</Entity>
 		<Entity uid="2900">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="560.92945" z="744.74311"/>
 			<Orientation y="-2.7452"/>
 		</Entity>
 		<Entity uid="2901">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="563.73938" z="752.93024"/>
 			<Orientation y="3.05733"/>
 		</Entity>
 		<Entity uid="2902">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="560.80475" z="767.31702"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2903">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="564.8418" z="758.30445"/>
 			<Orientation y="2.81827"/>
 		</Entity>
 		<Entity uid="2904">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="563.84766" z="765.32544"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2905">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="557.50605" z="767.2367"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2906">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="552.09668" z="768.20875"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2907">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="554.85712" z="770.71106"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2908">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="541.93866" z="783.54487"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2909">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="538.19416" z="786.88123"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2910">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="534.67688" z="788.47327"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2911">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="530.04267" z="789.56434"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2912">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="527.43018" z="790.53357"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2913">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="523.60145" z="790.44257"/>
 			<Orientation y="1.52717"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="518.84314" z="789.35407"/>
 			<Orientation y="1.24521"/>
 		</Entity>
 		<Entity uid="2915">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="516.83735" z="786.22309"/>
 			<Orientation y="1.81464"/>
 		</Entity>
 		<Entity uid="2916">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="510.76075" z="788.40809"/>
 			<Orientation y="1.11846"/>
 		</Entity>
 		<Entity uid="2917">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="507.77594" z="784.81489"/>
 			<Orientation y="0.32105"/>
 		</Entity>
 		<Entity uid="2918">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="494.91541" z="764.33021"/>
 			<Orientation y="0.72265"/>
 		</Entity>
 		<Entity uid="2919">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="491.62031" z="760.31684"/>
 			<Orientation y="0.89811"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="2920">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.46906" z="753.0901"/>
 			<Orientation y="0.07598"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="2921">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="488.01618" z="757.7483"/>
 			<Orientation y="0.74415"/>
 		</Entity>
 		<Entity uid="2922">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="486.75815" z="745.06702"/>
 			<Orientation y="-0.16294"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
@@ -7466,25 +7466,25 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1434">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="297.48676" z="224.19314"/>
 			<Orientation y="1.52569"/>
 		</Entity>
 		<Entity uid="1435">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="291.49662" z="229.8158"/>
 			<Orientation y="-3.12156"/>
 		</Entity>
 		<Entity uid="1436">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="297.4051" z="235.61033"/>
 			<Orientation y="-1.58844"/>
 		</Entity>
 		<Entity uid="1437">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="302.9293" z="230.01813"/>
 			<Orientation y="-0.0153"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml
@@ -72,49 +72,49 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="270.55387" z="442.97876"/>
 			<Orientation y="2.47875"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="259.71671" z="433.55439"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="239.28556" z="415.3831"/>
 			<Orientation y="2.55188"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="264.8035" z="438.69425"/>
 			<Orientation y="-0.75977"/>
 		</Entity>
 		<Entity uid="19">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="232.72893" z="411.21995"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="20">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="229.19108" z="407.94178"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="21">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="244.67365" z="419.10062"/>
 			<Orientation y="0.81717"/>
 		</Entity>
 		<Entity uid="22">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="218.6339" z="408.04947"/>
 			<Orientation y="0.51221"/>
@@ -156,157 +156,157 @@
 			<Orientation y="0.7188"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="211.6433" z="411.96891"/>
 			<Orientation y="-2.50968"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="276.507" z="447.12378"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="207.60697" z="415.72556"/>
 			<Orientation y="0.73171"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="279.33396" z="452.27723"/>
 			<Orientation y="2.01922"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="254.8094" z="428.64615"/>
 			<Orientation y="2.37195"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="275.53934" z="459.5381"/>
 			<Orientation y="-2.74526"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="268.42551" z="462.63685"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="262.91715" z="469.00577"/>
 			<Orientation y="-2.26597"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="257.64652" z="474.77591"/>
 			<Orientation y="0.8008"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>1</Player>
 			<Position x="252.93671" z="480.07694"/>
 			<Orientation y="-2.28014"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="247.78177" z="485.66285"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="245.56145" z="490.21464"/>
 			<Orientation y="1.2133"/>
 		</Entity>
 		<Entity uid="41">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="214.10457" z="465.89286"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="42">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="237.77" z="489.8206"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="43">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="225.9741" z="479.9087"/>
 			<Orientation y="-0.63851"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="217.06466" z="470.66068"/>
 			<Orientation y="2.1536"/>
 		</Entity>
 		<Entity uid="46">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="220.05912" z="475.16361"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="47">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="231.96775" z="483.73734"/>
 			<Orientation y="-2.21383"/>
 		</Entity>
 		<Entity uid="50">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="197.406" z="449.97608"/>
 			<Orientation y="-0.84993"/>
 		</Entity>
 		<Entity uid="51">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="187.9334" z="438.5911"/>
 			<Orientation y="2.19277"/>
 		</Entity>
 		<Entity uid="52">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>1</Player>
 			<Position x="197.38566" z="421.28086"/>
 			<Orientation y="0.39844"/>
 		</Entity>
 		<Entity uid="54">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="186.93627" z="428.4415"/>
 			<Orientation y="-2.33838"/>
 		</Entity>
 		<Entity uid="55">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="202.74271" z="454.27442"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="56">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="192.65566" z="444.76197"/>
 			<Orientation y="-2.47948"/>
 		</Entity>
 		<Entity uid="57">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="190.5204" z="424.33945"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="204.02767" z="418.71006"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/WallTest.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/WallTest.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/WallTest.xml
@@ -101,25 +101,25 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="280.52155" z="152.9048"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="405.53681" z="237.12357"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="273.05485" z="368.58619"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>1</Player>
 			<Position x="162.9825" z="248.80494"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
@@ -158,20 +158,20 @@
 
 experiments.enclosed = {
 	"spawn": () => {
-		QuickSpawn(gx, gy - 8, "other/palisades_rocks_long");
-		QuickSpawn(gx, gy + 8, "other/palisades_rocks_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "other/palisades_rocks_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long"));
+		QuickSpawn(gx, gy - 8, "structures/palisades_long");
+		QuickSpawn(gx, gy + 8, "structures/palisades_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "structures/palisades_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "structures/palisades_long"));
 
 		WalkTo(gx + 100, gy + 100, QuickSpawn(gx - 1, gy - 1, UNIT_TEMPLATE));
 		WalkTo(gx - 100, gy + 100, QuickSpawn(gx + 1, gy - 1, UNIT_TEMPLATE));
 		WalkTo(gx - 100, gy - 100, QuickSpawn(gx + 1, gy + 1, UNIT_TEMPLATE));
 		WalkTo(gx + 100, gy - 100, QuickSpawn(gx - 1, gy + 1, UNIT_TEMPLATE));
 
-		QuickSpawn(gx, gy + 20, "other/palisades_rocks_long");
-		experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "other/palisades_rocks_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "other/palisades_rocks_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "other/palisades_rocks_long"));
+		QuickSpawn(gx, gy + 20, "structures/palisades_long");
+		experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "structures/palisades_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "structures/palisades_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "structures/palisades_long"));
 		WalkTo(gx, gy + 100, QuickSpawn(gx, gy + 28, UNIT_TEMPLATE));
 	},
 
@@ -221,18 +221,18 @@
 
 experiments.u_shape_tight_exit = {
 	"spawn": () => {
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "other/palisades_rocks_long"));
-		QuickSpawn(gx, gy + 16, "other/palisades_rocks_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "other/palisades_rocks_medium"));
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "other/palisades_rocks_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "other/palisades_rocks_long"));
-		QuickSpawn(gx - 4, gy, "other/palisades_rocks_medium");
-		QuickSpawn(gx - 12, gy, "other/palisades_rocks_medium");
-		Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "other/palisades_rocks_short"));
-		QuickSpawn(gx, gy - 10, "other/palisades_rocks_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "other/palisades_rocks_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "structures/palisades_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "structures/palisades_long"));
+		QuickSpawn(gx, gy + 16, "structures/palisades_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "structures/palisades_medium"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "structures/palisades_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "structures/palisades_long"));
+		QuickSpawn(gx - 4, gy, "structures/palisades_medium");
+		QuickSpawn(gx - 12, gy, "structures/palisades_medium");
+		Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "structures/palisades_short"));
+		QuickSpawn(gx, gy - 10, "structures/palisades_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "structures/palisades_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "structures/palisades_long"));
 
 		let tree = QuickSpawn(gx, gy + 80, "gaia/flora_tree_acacia");
 
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
@@ -2393,105 +2393,105 @@
 			<Actor seed="23504"/>
 		</Entity>
 		<Entity uid="3311">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="642.3075" z="202.46955"/>
 			<Orientation y="2.22141"/>
 			<Actor seed="35648"/>
 		</Entity>
 		<Entity uid="3312">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="636.11817" z="196.0839"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42654"/>
 		</Entity>
 		<Entity uid="3313">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="631.89106" z="194.01825"/>
 			<Orientation y="-0.4813"/>
 			<Actor seed="18400"/>
 		</Entity>
 		<Entity uid="3314">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="627.35822" z="192.7381"/>
 			<Orientation y="-0.28862"/>
 			<Actor seed="14760"/>
 		</Entity>
 		<Entity uid="3315">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="622.69727" z="192.05562"/>
 			<Orientation y="0.15485"/>
 			<Actor seed="7804"/>
 		</Entity>
 		<Entity uid="3316">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="618.3943" z="190.93973"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26892"/>
 		</Entity>
 		<Entity uid="3317">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="624.96637" z="192.373"/>
 			<Orientation y="3.034"/>
 			<Actor seed="11796"/>
 		</Entity>
 		<Entity uid="3319">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="648.60206" z="206.4668"/>
 			<Orientation y="0.7324"/>
 			<Actor seed="38056"/>
 		</Entity>
 		<Entity uid="3320">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="652.56574" z="206.52439"/>
 			<Orientation y="-0.06841"/>
 			<Actor seed="57826"/>
 		</Entity>
 		<Entity uid="3321">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="655.97065" z="208.86828"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28924"/>
 		</Entity>
 		<Entity uid="3322">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="659.87183" z="209.9356"/>
 			<Orientation y="0.12533"/>
 			<Actor seed="54062"/>
 		</Entity>
 		<Entity uid="3323">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="642.99018" z="208.09455"/>
 			<Orientation y="1.0123"/>
 			<Actor seed="40498"/>
 		</Entity>
 		<Entity uid="3324">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="634.57105" z="198.10552"/>
 			<Orientation y="1.11675"/>
 			<Actor seed="31920"/>
 		</Entity>
 		<Entity uid="3325">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="629.89502" z="195.3716"/>
 			<Orientation y="1.3444"/>
 			<Actor seed="58992"/>
 		</Entity>
 		<Entity uid="3326">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>0</Player>
 			<Position x="619.64728" z="193.86794"/>
 			<Orientation y="1.37975"/>
@@ -2561,7 +2561,7 @@
 			<Actor seed="58540"/>
 		</Entity>
 		<Entity uid="3336">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>0</Player>
 			<Position x="662.60041" z="209.16376"/>
 			<Orientation y="-0.85045"/>
@@ -2575,35 +2575,35 @@
 			<Actor seed="62512"/>
 		</Entity>
 		<Entity uid="3338">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="713.97004" z="198.97066"/>
 			<Orientation y="-2.13648"/>
 			<Actor seed="26644"/>
 		</Entity>
 		<Entity uid="3339">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="710.93256" z="190.8357"/>
 			<Orientation y="2.76867"/>
 			<Actor seed="12410"/>
 		</Entity>
 		<Entity uid="3340">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="722.91443" z="192.69628"/>
 			<Orientation y="-0.27985"/>
 			<Actor seed="828"/>
 		</Entity>
 		<Entity uid="3341">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>0</Player>
 			<Position x="723.38111" z="187.74131"/>
 			<Orientation y="0.4271"/>
 			<Actor seed="31008"/>
 		</Entity>
 		<Entity uid="3342">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>0</Player>
 			<Position x="713.5254" z="186.50889"/>
 			<Orientation y="-1.08841"/>
@@ -2661,7 +2661,7 @@
 			<Actor seed="18962"/>
 		</Entity>
 		<Entity uid="3358">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="745.14509" z="231.71297"/>
 			<Orientation y="-0.96099"/>
@@ -2669,7 +2669,7 @@
 			<Actor seed="19036"/>
 		</Entity>
 		<Entity uid="3359">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="770.79694" z="251.28957"/>
 			<Orientation y="-0.26012"/>
@@ -2677,7 +2677,7 @@
 			<Actor seed="59864"/>
 		</Entity>
 		<Entity uid="3360">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="777.2209" z="251.65534"/>
 			<Orientation y="0.30723"/>
@@ -2685,7 +2685,7 @@
 			<Actor seed="15800"/>
 		</Entity>
 		<Entity uid="3361">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="784.77814" z="246.77945"/>
 			<Orientation y="0.86486"/>
@@ -2693,7 +2693,7 @@
 			<Actor seed="8070"/>
 		</Entity>
 		<Entity uid="3362">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="762.98926" z="247.16028"/>
 			<Orientation y="-0.57334"/>
@@ -2701,7 +2701,7 @@
 			<Actor seed="52384"/>
 		</Entity>
 		<Entity uid="3363">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="755.29407" z="241.84137"/>
 			<Orientation y="-0.51215"/>
@@ -2709,56 +2709,56 @@
 			<Actor seed="18498"/>
 		</Entity>
 		<Entity uid="3364">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="751.9361" z="239.98955"/>
 			<Orientation y="-0.67829"/>
 			<Actor seed="31956"/>
 		</Entity>
 		<Entity uid="3365">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="746.89924" z="235.19239"/>
 			<Orientation y="-0.59661"/>
 			<Actor seed="63034"/>
 		</Entity>
 		<Entity uid="3366">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="781.59876" z="249.87717"/>
 			<Orientation y="-2.53087"/>
 			<Actor seed="53812"/>
 		</Entity>
 		<Entity uid="3367">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="773.33582" z="252.45267"/>
 			<Orientation y="2.93302"/>
 			<Actor seed="26970"/>
 		</Entity>
 		<Entity uid="3368">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="766.47974" z="250.1431"/>
 			<Orientation y="2.88854"/>
 			<Actor seed="26048"/>
 		</Entity>
 		<Entity uid="3369">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="786.89759" z="241.29126"/>
 			<Orientation y="-1.3879"/>
 			<Actor seed="50670"/>
 		</Entity>
 		<Entity uid="3370">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>0</Player>
 			<Position x="788.82801" z="217.2882"/>
 			<Orientation y="3.03515"/>
 			<Actor seed="21098"/>
 		</Entity>
 		<Entity uid="3371">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="791.00959" z="210.33454"/>
 			<Orientation y="-2.15171"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
@@ -6372,28 +6372,28 @@
 			<Actor seed="62656"/>
 		</Entity>
 		<Entity uid="2156">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="315.06391" z="2227.88306"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="642"/>
 		</Entity>
 		<Entity uid="2157">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="320.50181" z="2237.89795"/>
 			<Orientation y="-0.01615"/>
 			<Actor seed="29114"/>
 		</Entity>
 		<Entity uid="2158">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="303.76871" z="2228.29957"/>
 			<Orientation y="1.7219"/>
 			<Actor seed="47168"/>
 		</Entity>
 		<Entity uid="2159">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="304.25928" z="2222.1084"/>
 			<Orientation y="1.39026"/>
@@ -7547,63 +7547,63 @@
 			<Orientation y="1.23557"/>
 		</Entity>
 		<Entity uid="3028">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="2387.06739" z="1795.83753"/>
 			<Orientation y="0.9729"/>
 			<Obstruction group="3050"/>
 		</Entity>
 		<Entity uid="3030">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="2384.82447" z="1803.42676"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3050"/>
 		</Entity>
 		<Entity uid="3032">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="2427.98096" z="1750.68116"/>
 			<Orientation y="1.99671"/>
 			<Obstruction group="3045"/>
 		</Entity>
 		<Entity uid="3033">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="2453.41163" z="1732.57667"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3047"/>
 		</Entity>
 		<Entity uid="3034">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>0</Player>
 			<Position x="2420.00367" z="1756.74146"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3045"/>
 		</Entity>
 		<Entity uid="3035">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>0</Player>
 			<Position x="2413.44336" z="1763.48316"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3044"/>
 		</Entity>
 		<Entity uid="3036">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>0</Player>
 			<Position x="2406.2981" z="1770.7898"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3044" group2="3043"/>
 		</Entity>
 		<Entity uid="3037">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>0</Player>
 			<Position x="2399.22168" z="1777.96827"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3043" group2="3049"/>
 		</Entity>
 		<Entity uid="3038">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>0</Player>
 			<Position x="2393.39039" z="1785.88648"/>
 			<Orientation y="2.57348"/>
@@ -7622,127 +7622,127 @@
 			<Actor seed="18986"/>
 		</Entity>
 		<Entity uid="3043">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2402.54664" z="1775.3069"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3044">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2412.2671" z="1764.39393"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3045">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2433.25147" z="1749.08863"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3046">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2449.88331" z="1737.87415"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3047">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2458.18409" z="1730.00257"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3048">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="2463.26368" z="1726.787"/>
 			<Orientation y="1.86847"/>
 			<Obstruction group="3047" group2="3061"/>
 		</Entity>
 		<Entity uid="3049">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2393.71241" z="1784.97144"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3050">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2387.9297" z="1794.36792"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3051">
-			<Template>other/palisades_rocks_watchtower</Template>
+			<Template>structures/palisades_watchtower</Template>
 			<Player>0</Player>
 			<Position x="2436.73047" z="1759.44166"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3052">
-			<Template>other/palisades_rocks_watchtower</Template>
+			<Template>structures/palisades_watchtower</Template>
 			<Player>0</Player>
 			<Position x="2455.53614" z="1744.08106"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3053">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="2471.01441" z="1730.0918"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3061" group2="3063"/>
 		</Entity>
 		<Entity uid="3055">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="2481.83301" z="1740.42554"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3060" group2="3059"/>
 		</Entity>
 		<Entity uid="3056">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="2489.40284" z="1746.82789"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3060" group2="3059"/>
 		</Entity>
 		<Entity uid="3057">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="2496.73804" z="1751.29822"/>
 			<Orientation y="2.8894"/>
 			<Obstruction group="3058"/>
 		</Entity>
 		<Entity uid="3058">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2492.62647" z="1749.93519"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3059">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2484.81031" z="1743.37208"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3060">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2477.21216" z="1737.01514"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3061">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2467.36548" z="1726.59339"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3062">
-			<Template>other/palisades_rocks_short</Template>
+			<Template>structures/palisades_short</Template>
 			<Player>0</Player>
 			<Position x="2476.22461" z="1735.25306"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3060" group2="3063"/>
 		</Entity>
 		<Entity uid="3063">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="2473.4502" z="1733.8534"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
@@ -150,35 +150,35 @@
 			<Actor seed="32012"/>
 		</Entity>
 		<Entity uid="304">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="361.99195" z="254.9381"/>
 			<Orientation y="2.345"/>
 			<Actor seed="11948"/>
 		</Entity>
 		<Entity uid="305">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="349.51023" z="270.28919"/>
 			<Orientation y="2.36324"/>
 			<Actor seed="40678"/>
 		</Entity>
 		<Entity uid="306">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="355.79337" z="343.90931"/>
 			<Orientation y="-0.87058"/>
 			<Actor seed="8700"/>
 		</Entity>
 		<Entity uid="307">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="366.86753" z="360.75342"/>
 			<Orientation y="-0.8089"/>
 			<Actor seed="27722"/>
 		</Entity>
 		<Entity uid="308">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="343.54853" z="349.45792"/>
 			<Orientation y="-2.96256"/>
@@ -186,7 +186,7 @@
 			<Actor seed="38668"/>
 		</Entity>
 		<Entity uid="309">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="345.75647" z="354.54068"/>
 			<Orientation y="2.35621"/>
@@ -194,21 +194,21 @@
 			<Actor seed="32818"/>
 		</Entity>
 		<Entity uid="310">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="358.17524" z="369.00248"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61338"/>
 		</Entity>
 		<Entity uid="311">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="350.98902" z="361.90473"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58338"/>
 		</Entity>
 		<Entity uid="312">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="343.89582" z="337.8328"/>
 			<Orientation y="-1.71988"/>
@@ -216,7 +216,7 @@
 			<Actor seed="14192"/>
 		</Entity>
 		<Entity uid="313">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="346.10972" z="324.51603"/>
 			<Orientation y="-1.71988"/>
@@ -224,56 +224,56 @@
 			<Actor seed="0"/>
 		</Entity>
 		<Entity uid="314">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="343.00214" z="344.23368"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1376"/>
 		</Entity>
 		<Entity uid="315">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="344.83729" z="330.31751"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46488"/>
 		</Entity>
 		<Entity uid="316">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="347.30594" z="316.65775"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9140"/>
 		</Entity>
 		<Entity uid="317">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="347.70908" z="252.46506"/>
 			<Orientation y="0.68512"/>
 			<Actor seed="63188"/>
 		</Entity>
 		<Entity uid="318">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="340.22239" z="256.02564"/>
 			<Orientation y="-2.74897"/>
 			<Actor seed="10156"/>
 		</Entity>
 		<Entity uid="319">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="352.23865" z="246.46105"/>
 			<Orientation y="0.73432"/>
 			<Actor seed="20036"/>
 		</Entity>
 		<Entity uid="320">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="335.22217" z="260.05481"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34010"/>
 		</Entity>
 		<Entity uid="321">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="348.3696" z="309.00297"/>
 			<Orientation y="1.62118"/>
@@ -281,42 +281,42 @@
 			<Actor seed="24196"/>
 		</Entity>
 		<Entity uid="322">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="416.04786" z="361.48987"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28372"/>
 		</Entity>
 		<Entity uid="323">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="431.46357" z="345.02338"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30600"/>
 		</Entity>
 		<Entity uid="324">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="425.2306" z="275.94751"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40990"/>
 		</Entity>
 		<Entity uid="325">
-			<Template>other/palisades_rocks_outpost</Template>
+			<Template>structures/palisades_outpost</Template>
 			<Player>0</Player>
 			<Position x="408.45276" z="259.5318"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57258"/>
 		</Entity>
 		<Entity uid="326">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="347.63172" z="301.12467"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9582"/>
 		</Entity>
 		<Entity uid="328">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="338.44883" z="282.11298"/>
 			<Orientation y="-1.10331"/>
@@ -324,7 +324,7 @@
 			<Actor seed="19470"/>
 		</Entity>
 		<Entity uid="329">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="334.1915" z="270.23731"/>
 			<Orientation y="-1.35698"/>
@@ -332,21 +332,21 @@
 			<Actor seed="8670"/>
 		</Entity>
 		<Entity uid="330">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="335.66175" z="276.43998"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33206"/>
 		</Entity>
 		<Entity uid="331">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="340.53434" z="286.41691"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2542"/>
 		</Entity>
 		<Entity uid="333">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>0</Player>
 			<Position x="364.70307" z="372.73771"/>
 			<Orientation y="-1.76446"/>
@@ -354,7 +354,7 @@
 			<Actor seed="40476"/>
 		</Entity>
 		<Entity uid="334">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="376.77897" z="372.8447"/>
 			<Orientation y="0.14722"/>
@@ -362,21 +362,21 @@
 			<Actor seed="60006"/>
 		</Entity>
 		<Entity uid="335">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="370.8584" z="372.84519"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10120"/>
 		</Entity>
 		<Entity uid="336">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="383.42356" z="372.09244"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61322"/>
 		</Entity>
 		<Entity uid="337">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="390.85245" z="371.0463"/>
 			<Orientation y="0.11083"/>
@@ -384,7 +384,7 @@
 			<Actor seed="1382"/>
 		</Entity>
 		<Entity uid="338">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="401.35853" z="376.63151"/>
 			<Orientation y="2.35621"/>
@@ -392,49 +392,49 @@
 			<Actor seed="30344"/>
 		</Entity>
 		<Entity uid="339">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="396.59339" z="370.5435"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25398"/>
 		</Entity>
 		<Entity uid="340">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="439.4691" z="361.94169"/>
 			<Orientation y="0.95945"/>
 			<Actor seed="45898"/>
 		</Entity>
 		<Entity uid="341">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="443.37314" z="356.01215"/>
 			<Orientation y="0.9702"/>
 			<Actor seed="58382"/>
 		</Entity>
 		<Entity uid="342">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="443.06434" z="351.65094"/>
 			<Orientation y="1.49837"/>
 			<Actor seed="27228"/>
 		</Entity>
 		<Entity uid="343">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="442.93033" z="345.4274"/>
 			<Orientation y="-1.45333"/>
 			<Actor seed="25164"/>
 		</Entity>
 		<Entity uid="344">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="441.83841" z="337.24665"/>
 			<Orientation y="-1.2995"/>
 			<Actor seed="172"/>
 		</Entity>
 		<Entity uid="345">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="417.74302" z="250.79224"/>
 			<Orientation y="2.35621"/>
@@ -442,21 +442,21 @@
 			<Actor seed="46520"/>
 		</Entity>
 		<Entity uid="346">
-			<Template>other/palisades_rocks_gate</Template>
+			<Template>structures/palisades_gate</Template>
 			<Player>0</Player>
 			<Position x="429.2946" z="262.39756"/>
 			<Orientation y="2.21154"/>
 			<Actor seed="45118"/>
 		</Entity>
 		<Entity uid="347">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="433.39084" z="269.49683"/>
 			<Orientation y="2.01365"/>
 			<Actor seed="7998"/>
 		</Entity>
 		<Entity uid="348">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>0</Player>
 			<Position x="424.06214" z="256.2964"/>
 			<Orientation y="2.35621"/>
@@ -464,7 +464,7 @@
 			<Actor seed="60794"/>
 		</Entity>
 		<Entity uid="349">
-			<Template>other/palisades_rocks_long</Template>
+			<Template>structures/palisades_long</Template>
 			<Player>0</Player>
 			<Position x="436.27823" z="278.45456"/>
 			<Orientation y="1.80324"/>
@@ -472,7 +472,7 @@
 			<Actor seed="32752"/>
 		</Entity>
 		<Entity uid="350">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="437.9455" z="287.11158"/>
 			<Orientation y="1.69327"/>
@@ -480,7 +480,7 @@
 			<Actor seed="61018"/>
 		</Entity>
 		<Entity uid="351">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>0</Player>
 			<Position x="411.0178" z="244.49476"/>
 			<Orientation y="-0.57746"/>
@@ -488,28 +488,28 @@
 			<Actor seed="61570"/>
 		</Entity>
 		<Entity uid="352">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="407.39563" z="241.94378"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33426"/>
 		</Entity>
 		<Entity uid="353">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="412.33518" z="245.97785"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32954"/>
 		</Entity>
 		<Entity uid="354">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="438.09849" z="284.72483"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62534"/>
 		</Entity>
 		<Entity uid="355">
-			<Template>other/palisades_rocks_tower</Template>
+			<Template>structures/palisades_tower</Template>
 			<Player>0</Player>
 			<Position x="439.35462" z="292.01001"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
@@ -103,223 +103,223 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="295.88685" z="356.25528"/>
 			<Orientation y="0.798"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="289.92295" z="375.72123"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="287.85877" z="367.69724"/>
 			<Orientation y="-3.13718"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="292.38743" z="360.26392"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="285.35068" z="373.1276"/>
 			<Orientation y="3.01175"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="290.28885" z="382.0536"/>
 			<Orientation y="-2.15049"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="17">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>1</Player>
 			<Position x="283.41926" z="373.96698"/>
 			<Orientation y="-3.02302"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="294.1279" z="379.68699"/>
 			<Orientation y="0.89289"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="19">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="338.67505" z="380.85877"/>
 			<Orientation y="2.45415"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="21">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="298.6674" z="383.00681"/>
 			<Orientation y="2.45597"/>
 		</Entity>
 		<Entity uid="22">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="303.05506" z="348.4564"/>
 			<Orientation y="0.78141"/>
 		</Entity>
 		<Entity uid="23">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="307.17038" z="344.4105"/>
 			<Orientation y="-0.85848"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="24">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="314.99994" z="340.41187"/>
 			<Orientation y="1.6486"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="25">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="321.89603" z="341.56351"/>
 			<Orientation y="-0.80591"/>
 		</Entity>
 		<Entity uid="29">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="335.32374" z="385.18281"/>
 			<Orientation y="-2.36693"/>
 		</Entity>
 		<Entity uid="30">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="344.02344" z="377.32981"/>
 			<Orientation y="-2.31174"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>1</Player>
 			<Position x="345.10413" z="369.99659"/>
 			<Orientation y="-0.07187"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="341.52817" z="362.9787"/>
 			<Orientation y="-2.28614"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>1</Player>
 			<Position x="325.55634" z="347.4593"/>
 			<Orientation y="0.78063"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="317.1662" z="337.68906"/>
 			<Orientation y="1.46691"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="327.46134" z="344.87958"/>
 			<Orientation y="-2.65601"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="337.41211" z="359.47382"/>
 			<Orientation y="-0.93099"/>
 		</Entity>
 		<Entity uid="37">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="329.42164" z="351.33426"/>
 			<Orientation y="-0.77671"/>
 		</Entity>
 		<Entity uid="38">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="289.05576" z="359.5959"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="39">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="306.64246" z="341.71998"/>
 			<Orientation y="-0.83996"/>
 		</Entity>
 		<Entity uid="40">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="341.22443" z="383.68326"/>
 			<Orientation y="1.99071"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="41">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="349.17948" z="372.71537"/>
 			<Orientation y="-0.08655"/>
 			<Obstruction group="30"/>
 		</Entity>
 		<Entity uid="44">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="344.91556" z="361.0818"/>
 			<Orientation y="0.84478"/>
 		</Entity>
 		<Entity uid="45">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>1</Player>
 			<Position x="328.40302" z="343.03174"/>
 			<Orientation y="-2.54506"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="327.15226" z="402.46583"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="59">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="321.49881" z="408.47571"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3869"/>
 		</Entity>
 		<Entity uid="60">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="316.7323" z="407.0652"/>
 			<Orientation y="0.8262"/>
 			<Obstruction group="3869"/>
 		</Entity>
 		<Entity uid="62">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="309.12592" z="402.55607"/>
 			<Orientation y="-2.39812"/>
 			<Obstruction group="3869"/>
 		</Entity>
 		<Entity uid="64">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>1</Player>
 			<Position x="347.61612" z="380.87418"/>
 			<Orientation y="2.35621"/>
@@ -1117,237 +1117,237 @@
 			<Orientation y="-0.68833"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="684.05396" z="297.92887"/>
 			<Orientation y="1.57081"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="655.0287" z="325.88776"/>
 			<Orientation y="-3.12851"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>2</Player>
 			<Position x="719.38245" z="329.00669"/>
 			<Orientation y="0.019"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="211">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="659.87806" z="317.39954"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="212">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="675.45868" z="302.58637"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="213">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="656.33838" z="334.16984"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="214">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="663.99408" z="312.55082"/>
 			<Orientation y="0.85485"/>
 		</Entity>
 		<Entity uid="215">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="671.18451" z="306.51273"/>
 			<Orientation y="0.98328"/>
 		</Entity>
 		<Entity uid="216">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="693.20221" z="298.94587"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="217">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="697.03986" z="304.8022"/>
 			<Orientation y="-2.32073"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="218">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="701.25336" z="308.86518"/>
 			<Orientation y="-0.9034"/>
 		</Entity>
 		<Entity uid="219">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="714.81586" z="321.14939"/>
 			<Orientation y="-2.32953"/>
 		</Entity>
 		<Entity uid="220">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="710.23035" z="317.17475"/>
 			<Orientation y="-0.82479"/>
 		</Entity>
 		<Entity uid="221">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="717.75721" z="335.52997"/>
 			<Orientation y="-2.29558"/>
 		</Entity>
 		<Entity uid="222">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="712.4311" z="339.22507"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="223">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>2</Player>
 			<Position x="662.96521" z="338.20402"/>
 			<Orientation y="-2.39802"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="224">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="666.95826" z="342.83884"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="225">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="653.11017" z="314.27317"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="704.35474" z="297.19034"/>
 			<Orientation y="-2.14817"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="701.71216" z="300.51105"/>
 			<Orientation y="-2.44234"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="228">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="693.07361" z="291.96988"/>
 			<Orientation y="1.03708"/>
 			<Obstruction group="216"/>
 		</Entity>
 		<Entity uid="229">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="682.4422" z="291.07633"/>
 			<Orientation y="1.8888"/>
 		</Entity>
 		<Entity uid="230">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="673.86945" z="296.69202"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="231">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="655.08265" z="315.04798"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="232">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="651.6211" z="324.66071"/>
 			<Orientation y="3.07378"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="233">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="659.42688" z="342.44599"/>
 			<Orientation y="-2.10112"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="234">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="697.15223" z="357.681"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="235">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="714.56366" z="344.34357"/>
 			<Orientation y="-1.35111"/>
 		</Entity>
 		<Entity uid="236">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="721.93232" z="334.15006"/>
 			<Orientation y="-0.13688"/>
 			<Obstruction group="221"/>
 		</Entity>
 		<Entity uid="237">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="718.29987" z="319.1367"/>
 			<Orientation y="-2.47904"/>
 		</Entity>
 		<Entity uid="238">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="722.13477" z="320.52903"/>
 			<Orientation y="-2.55782"/>
 		</Entity>
 		<Entity uid="239">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="672.78663" z="296.10804"/>
 			<Orientation y="2.13321"/>
 		</Entity>
 		<Entity uid="240">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="651.22596" z="331.41044"/>
 			<Orientation y="0.33802"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="241">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>2</Player>
 			<Position x="701.39045" z="357.88242"/>
 			<Orientation y="-0.79641"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="691.37531" z="363.18299"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="684.69452" z="364.70035"/>
 			<Orientation y="-2.32055"/>
 			<Obstruction group="3879"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>2</Player>
 			<Position x="677.89936" z="357.10566"/>
 			<Orientation y="0.71708"/>
@@ -6722,245 +6722,245 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1199">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="492.33674" z="747.0647"/>
 			<Orientation y="3.04125"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1200">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="556.52302" z="748.91492"/>
 			<Orientation y="0.13331"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1201">
-			<Template>other/palisades_rocks_curve</Template>
+			<Template>structures/palisades_curve</Template>
 			<Player>3</Player>
 			<Position x="523.2497" z="717.52527"/>
 			<Orientation y="1.64791"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1202">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="493.73768" z="754.77186"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1203">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="530.94361" z="719.4095"/>
 			<Orientation y="-0.79741"/>
 		</Entity>
 		<Entity uid="1204">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="497.521" z="738.9048"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1205">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="515.03748" z="721.39338"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1206">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="500.11237" z="759.49286"/>
 			<Orientation y="0.78994"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1207">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="501.16196" z="735.24567"/>
 			<Orientation y="0.86066"/>
 		</Entity>
 		<Entity uid="1208">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="510.82416" z="726.23407"/>
 			<Orientation y="0.70745"/>
 		</Entity>
 		<Entity uid="1209">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="535.49274" z="725.50745"/>
 			<Orientation y="-2.40027"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1210">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="551.21705" z="740.73426"/>
 			<Orientation y="0.78866"/>
 		</Entity>
 		<Entity uid="1211">
-			<Template>other/palisades_rocks_straight</Template>
+			<Template>structures/palisades_straight</Template>
 			<Player>3</Player>
 			<Position x="549.47571" z="760.52247"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1212">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="554.79676" z="757.65796"/>
 			<Orientation y="0.73365"/>
 		</Entity>
 		<Entity uid="1213">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="545.48652" z="764.6034"/>
 			<Orientation y="-2.2079"/>
 		</Entity>
 		<Entity uid="1214">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="539.18036" z="730.37482"/>
 			<Orientation y="-0.8873"/>
 		</Entity>
 		<Entity uid="1215">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="547.5373" z="737.01307"/>
 			<Orientation y="-0.91549"/>
 		</Entity>
 		<Entity uid="1216">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="503.88523" z="763.0005"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1217">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="529.79188" z="784.65223"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3874"/>
 		</Entity>
 		<Entity uid="1218">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="535.83057" z="778.9964"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1219">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="524.5785" z="785.71814"/>
 			<Orientation y="-2.25115"/>
 			<Obstruction group="3874"/>
 		</Entity>
 		<Entity uid="1221">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="517.37855" z="779.68537"/>
 			<Orientation y="-2.29975"/>
 			<Obstruction group="3874"/>
 		</Entity>
 		<Entity uid="1223">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="496.61084" z="761.81751"/>
 			<Orientation y="-2.3148"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1224">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="488.82264" z="753.06788"/>
 			<Orientation y="0.20873"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="1225">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="491.10233" z="741.93824"/>
 			<Orientation y="-0.53002"/>
 		</Entity>
 		<Entity uid="1226">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="495.40784" z="736.47083"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1227">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="512.1609" z="719.02485"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1228">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="520.12793" z="713.16321"/>
 			<Orientation y="1.71013"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1229">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="528.99933" z="712.53443"/>
 			<Orientation y="1.4199"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1230">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="537.6883" z="721.14771"/>
 			<Orientation y="-2.77094"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="1231">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="555.98835" z="739.03309"/>
 			<Orientation y="-2.24331"/>
 		</Entity>
 		<Entity uid="1232">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="559.21705" z="751.85297"/>
 			<Orientation y="3.03222"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1233">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>3</Player>
 			<Position x="553.83185" z="764.43342"/>
 			<Orientation y="2.02135"/>
 			<Obstruction group="1212"/>
 		</Entity>
 		<Entity uid="1235">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="510.13163" z="717.089"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1236">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="490.00794" z="739.16767"/>
 			<Orientation y="2.58219"/>
 		</Entity>
 		<Entity uid="1237">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="540.9997" z="725.49866"/>
 			<Orientation y="-3.02762"/>
 		</Entity>
 		<Entity uid="1238">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="537.4734" z="782.25226"/>
 			<Orientation y="2.17074"/>
 		</Entity>
 		<Entity uid="1239">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>3</Player>
 			<Position x="560.39753" z="746.3235"/>
 			<Orientation y="0.76757"/>
@@ -16326,675 +16326,675 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2813">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="285.68824" z="358.00144"/>
 			<Orientation y="-0.70112"/>
 		</Entity>
 		<Entity uid="2814">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="283.58768" z="364.06943"/>
 			<Orientation y="0.07686"/>
 		</Entity>
 		<Entity uid="2815">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="291.5496" z="355.8975"/>
 			<Orientation y="-0.8854"/>
 		</Entity>
 		<Entity uid="2816">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="331.05576" z="348.32892"/>
 			<Orientation y="-2.16036"/>
 		</Entity>
 		<Entity uid="2817">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="306.88041" z="338.36353"/>
 			<Orientation y="-0.97393"/>
 		</Entity>
 		<Entity uid="2818">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="302.16492" z="345.96253"/>
 			<Orientation y="-0.87737"/>
 		</Entity>
 		<Entity uid="2819">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="293.59797" z="355.20862"/>
 			<Orientation y="-0.69239"/>
 		</Entity>
 		<Entity uid="2820">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="312.08716" z="335.22477"/>
 			<Orientation y="-1.37801"/>
 		</Entity>
 		<Entity uid="2821">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="319.35026" z="335.55988"/>
 			<Orientation y="-1.70125"/>
 		</Entity>
 		<Entity uid="2822">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="328.78934" z="341.6399"/>
 			<Orientation y="-3.07622"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="2823">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="324.47761" z="336.72385"/>
 			<Orientation y="-1.97432"/>
 			<Obstruction group="25"/>
 		</Entity>
 		<Entity uid="2824">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="304.09305" z="339.00235"/>
 			<Orientation y="-1.03014"/>
 		</Entity>
 		<Entity uid="2825">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="327.3964" z="338.93821"/>
 			<Orientation y="-2.15874"/>
 		</Entity>
 		<Entity uid="2826">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="347.66062" z="359.35947"/>
 			<Orientation y="-2.4399"/>
 		</Entity>
 		<Entity uid="2827">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="352.44623" z="368.34626"/>
 			<Orientation y="-2.91565"/>
 		</Entity>
 		<Entity uid="2828">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="353.07593" z="378.53394"/>
 			<Orientation y="2.76719"/>
 		</Entity>
 		<Entity uid="2829">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="283.29484" z="379.16065"/>
 			<Orientation y="0.40384"/>
 		</Entity>
 		<Entity uid="2830">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="291.53498" z="386.98432"/>
 			<Orientation y="0.46006"/>
 		</Entity>
 		<Entity uid="2831">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="286.56928" z="384.417"/>
 			<Orientation y="0.68361"/>
 		</Entity>
 		<Entity uid="2832">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="283.55054" z="373.4979"/>
 			<Orientation y="-0.42118"/>
 			<Obstruction group="12"/>
 		</Entity>
 		<Entity uid="2833">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="283.18873" z="369.36255"/>
 			<Orientation y="-0.01011"/>
 		</Entity>
 		<Entity uid="2834">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="349.57636" z="383.95325"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2835">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="342.33567" z="386.88431"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2836">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="330.61377" z="404.59964"/>
 			<Orientation y="2.46938"/>
 		</Entity>
 		<Entity uid="2837">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="327.40168" z="411.66602"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2838">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="321.15201" z="413.20914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2839">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="316.2068" z="410.6002"/>
 			<Orientation y="0.90784"/>
 			<Obstruction group="3869"/>
 		</Entity>
 		<Entity uid="2840">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="311.18201" z="408.57773"/>
 			<Orientation y="1.89846"/>
 		</Entity>
 		<Entity uid="2841">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="308.89121" z="405.99369"/>
 			<Orientation y="1.3971"/>
 		</Entity>
 		<Entity uid="2842">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>1</Player>
 			<Position x="305.72318" z="403.34116"/>
 			<Orientation y="0.16437"/>
 		</Entity>
 		<Entity uid="2843">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="650.45765" z="319.86661"/>
 			<Orientation y="-0.00403"/>
 		</Entity>
 		<Entity uid="2844">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="652.77576" z="313.2079"/>
 			<Orientation y="-0.94945"/>
 		</Entity>
 		<Entity uid="2845">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="656.70746" z="314.5224"/>
 			<Orientation y="-0.95185"/>
 		</Entity>
 		<Entity uid="2846">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="659.87409" z="312.04157"/>
 			<Orientation y="-0.96984"/>
 		</Entity>
 		<Entity uid="2847">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="660.00635" z="309.53974"/>
 			<Orientation y="-1.15148"/>
 		</Entity>
 		<Entity uid="2848">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="669.43104" z="300.72223"/>
 			<Orientation y="-0.76438"/>
 		</Entity>
 		<Entity uid="2849">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="672.28089" z="294.32456"/>
 			<Orientation y="-1.1818"/>
 		</Entity>
 		<Entity uid="2850">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="679.23224" z="291.83704"/>
 			<Orientation y="-1.20165"/>
 		</Entity>
 		<Entity uid="2851">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="677.43885" z="295.14255"/>
 			<Orientation y="-1.0089"/>
 		</Entity>
 		<Entity uid="2852">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="683.62421" z="288.09305"/>
 			<Orientation y="-1.42161"/>
 		</Entity>
 		<Entity uid="2853">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="687.67896" z="292.78303"/>
 			<Orientation y="-1.75821"/>
 		</Entity>
 		<Entity uid="2854">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="692.96589" z="288.3407"/>
 			<Orientation y="-1.56453"/>
 		</Entity>
 		<Entity uid="2855">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="697.91285" z="290.92493"/>
 			<Orientation y="-2.39911"/>
 		</Entity>
 		<Entity uid="2856">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="699.18335" z="301.37122"/>
 			<Orientation y="-2.17548"/>
 		</Entity>
 		<Entity uid="2857">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="704.12989" z="300.59104"/>
 			<Orientation y="-2.4522"/>
 		</Entity>
 		<Entity uid="2858">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="714.33185" z="316.76291"/>
 			<Orientation y="-1.80022"/>
 		</Entity>
 		<Entity uid="2859">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="716.73841" z="318.4087"/>
 			<Orientation y="-2.1821"/>
 		</Entity>
 		<Entity uid="2860">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="721.32953" z="317.90125"/>
 			<Orientation y="-2.32638"/>
 		</Entity>
 		<Entity uid="2861">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="722.58442" z="324.998"/>
 			<Orientation y="3.04751"/>
 		</Entity>
 		<Entity uid="2862">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="726.64844" z="333.16135"/>
 			<Orientation y="3.00904"/>
 		</Entity>
 		<Entity uid="2863">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="723.15845" z="328.761"/>
 			<Orientation y="-2.74711"/>
 		</Entity>
 		<Entity uid="2864">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="728.41498" z="337.6331"/>
 			<Orientation y="2.86861"/>
 		</Entity>
 		<Entity uid="2865">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="726.05115" z="341.6232"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2866">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="723.8404" z="344.07898"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2867">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="719.93421" z="347.98157"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2868">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="701.42774" z="354.22046"/>
 			<Orientation y="3.00686"/>
 		</Entity>
 		<Entity uid="2869">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="701.76526" z="357.99756"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2870">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="698.17316" z="361.3985"/>
 			<Orientation y="2.35085"/>
 		</Entity>
 		<Entity uid="2871">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="695.74598" z="364.07212"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2872">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="691.30768" z="367.41016"/>
 			<Orientation y="2.01575"/>
 		</Entity>
 		<Entity uid="2873">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="684.9867" z="367.43665"/>
 			<Orientation y="1.4229"/>
 			<Obstruction group="3879"/>
 		</Entity>
 		<Entity uid="2874">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="679.0522" z="363.01642"/>
 			<Orientation y="1.3751"/>
 			<Obstruction group="3879"/>
 		</Entity>
 		<Entity uid="2875">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="676.31104" z="360.987"/>
 			<Orientation y="0.683"/>
 		</Entity>
 		<Entity uid="2876">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="660.72852" z="345.87946"/>
 			<Orientation y="0.69042"/>
 		</Entity>
 		<Entity uid="2877">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="674.93787" z="356.80835"/>
 			<Orientation y="0.5557"/>
 		</Entity>
 		<Entity uid="2878">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="655.00214" z="340.57923"/>
 			<Orientation y="0.94704"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="2879">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="651.36713" z="336.12598"/>
 			<Orientation y="0.46546"/>
 			<Obstruction group="213"/>
 		</Entity>
 		<Entity uid="2880">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="649.7345" z="332.45417"/>
 			<Orientation y="0.25284"/>
 		</Entity>
 		<Entity uid="2881">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="648.935" z="328.39548"/>
 			<Orientation y="0.01598"/>
 		</Entity>
 		<Entity uid="2882">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>2</Player>
 			<Position x="650.99775" z="324.19266"/>
 			<Orientation y="0.06107"/>
 		</Entity>
 		<Entity uid="2883">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.24299" z="749.10236"/>
 			<Orientation y="-0.00702"/>
 		</Entity>
 		<Entity uid="2884">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.59592" z="740.86127"/>
 			<Orientation y="-0.50715"/>
 		</Entity>
 		<Entity uid="2885">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="493.29261" z="734.26764"/>
 			<Orientation y="-0.67898"/>
 		</Entity>
 		<Entity uid="2886">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="489.53187" z="738.32642"/>
 			<Orientation y="-0.86304"/>
 		</Entity>
 		<Entity uid="2887">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="496.33817" z="731.9834"/>
 			<Orientation y="-1.16538"/>
 		</Entity>
 		<Entity uid="2888">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="509.31885" z="720.3921"/>
 			<Orientation y="-0.87647"/>
 		</Entity>
 		<Entity uid="2889">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="512.92438" z="715.10462"/>
 			<Orientation y="-0.82251"/>
 		</Entity>
 		<Entity uid="2890">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="516.00458" z="712.14997"/>
 			<Orientation y="-1.27614"/>
 		</Entity>
 		<Entity uid="2891">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="520.76581" z="710.31745"/>
 			<Orientation y="-1.37185"/>
 		</Entity>
 		<Entity uid="2892">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="523.75538" z="709.80964"/>
 			<Orientation y="-1.57604"/>
 		</Entity>
 		<Entity uid="2893">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="527.29871" z="709.76325"/>
 			<Orientation y="-1.76961"/>
 		</Entity>
 		<Entity uid="2894">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="531.2234" z="712.94092"/>
 			<Orientation y="-1.74183"/>
 			<Obstruction group="1203"/>
 		</Entity>
 		<Entity uid="2895">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="535.57294" z="714.8888"/>
 			<Orientation y="-2.17205"/>
 		</Entity>
 		<Entity uid="2896">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="539.27808" z="720.41205"/>
 			<Orientation y="-2.32165"/>
 		</Entity>
 		<Entity uid="2897">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="541.88831" z="726.39582"/>
 			<Orientation y="-2.38575"/>
 		</Entity>
 		<Entity uid="2898">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="552.43116" z="735.5746"/>
 			<Orientation y="-2.30597"/>
 		</Entity>
 		<Entity uid="2899">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="558.83088" z="738.67023"/>
 			<Orientation y="-2.51851"/>
 		</Entity>
 		<Entity uid="2900">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="560.92945" z="744.74311"/>
 			<Orientation y="-2.7452"/>
 		</Entity>
 		<Entity uid="2901">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="563.73938" z="752.93024"/>
 			<Orientation y="3.05733"/>
 		</Entity>
 		<Entity uid="2902">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="560.80475" z="767.31702"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2903">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="564.8418" z="758.30445"/>
 			<Orientation y="2.81827"/>
 		</Entity>
 		<Entity uid="2904">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="563.84766" z="765.32544"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2905">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="557.50605" z="767.2367"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2906">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="552.09668" z="768.20875"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2907">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="554.85712" z="770.71106"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2908">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="539.72461" z="782.3396"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2909">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="535.98011" z="785.67597"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2910">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="534.67688" z="788.47327"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2911">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="530.04267" z="789.56434"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3874"/>
 		</Entity>
 		<Entity uid="2912">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="527.43018" z="790.53357"/>
 			<Orientation y="2.35621"/>
 			<Obstruction group="3874"/>
 		</Entity>
 		<Entity uid="2913">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="524.97706" z="788.20185"/>
 			<Orientation y="1.52717"/>
 			<Obstruction group="3874"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="520.31666" z="788.10468"/>
 			<Orientation y="1.24521"/>
 		</Entity>
 		<Entity uid="2915">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="516.83735" z="786.22309"/>
 			<Orientation y="0.83747"/>
 		</Entity>
 		<Entity uid="2916">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="515.44562" z="781.94434"/>
 			<Orientation y="0.56672"/>
 		</Entity>
 		<Entity uid="2917">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="512.74994" z="777.45331"/>
 			<Orientation y="0.32105"/>
 		</Entity>
 		<Entity uid="2918">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="494.91541" z="764.33021"/>
 			<Orientation y="0.72265"/>
 		</Entity>
 		<Entity uid="2919">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="491.62031" z="760.31684"/>
 			<Orientation y="0.89811"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="2920">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="487.46906" z="753.0901"/>
 			<Orientation y="0.07598"/>
 			<Obstruction group="1202"/>
 		</Entity>
 		<Entity uid="2921">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="488.01618" z="757.7483"/>
 			<Orientation y="0.74415"/>
 		</Entity>
 		<Entity uid="2922">
-			<Template>other/palisades_angle_spike</Template>
+			<Template>structures/palisades_spike_angle</Template>
 			<Player>3</Player>
 			<Position x="486.75815" z="745.06702"/>
 			<Orientation y="-0.16294"/>
@@ -21565,14 +21565,14 @@
 			<Actor seed="5780"/>
 		</Entity>
 		<Entity uid="3869">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>1</Player>
 			<Position x="317.66807" z="401.14701"/>
 			<Orientation y="-2.37346"/>
 			<Actor seed="19298"/>
 		</Entity>
 		<Entity uid="3870">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="312.53263" z="396.3606"/>
 			<Orientation y="2.35621"/>
@@ -21580,7 +21580,7 @@
 			<Actor seed="42534"/>
 		</Entity>
 		<Entity uid="3871">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>1</Player>
 			<Position x="322.23017" z="397.12381"/>
 			<Orientation y="-2.33703"/>
@@ -21588,28 +21588,28 @@
 			<Actor seed="35068"/>
 		</Entity>
 		<Entity uid="3872">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="309.14554" z="393.305"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28816"/>
 		</Entity>
 		<Entity uid="3873">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>1</Player>
 			<Position x="325.58054" z="393.72211"/>
 			<Orientation y="-2.19675"/>
 			<Actor seed="47726"/>
 		</Entity>
 		<Entity uid="3874">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>3</Player>
 			<Position x="524.96369" z="779.71595"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29124"/>
 		</Entity>
 		<Entity uid="3875">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>3</Player>
 			<Position x="519.58533" z="774.34968"/>
 			<Orientation y="2.35621"/>
@@ -21617,7 +21617,7 @@
 			<Actor seed="49508"/>
 		</Entity>
 		<Entity uid="3876">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>3</Player>
 			<Position x="530.57416" z="777.4657"/>
 			<Orientation y="-2.43427"/>
@@ -21625,28 +21625,28 @@
 			<Actor seed="14304"/>
 		</Entity>
 		<Entity uid="3877">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="515.77753" z="770.66028"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40290"/>
 		</Entity>
 		<Entity uid="3878">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>3</Player>
 			<Position x="534.33106" z="773.66523"/>
 			<Orientation y="-2.21425"/>
 			<Actor seed="12374"/>
 		</Entity>
 		<Entity uid="3879">
-			<Template>other/palisades_rocks_fort</Template>
+			<Template>structures/palisades_fort</Template>
 			<Player>2</Player>
 			<Position x="686.3147" z="359.39997"/>
 			<Orientation y="-2.34272"/>
 			<Actor seed="49210"/>
 		</Entity>
 		<Entity uid="3880">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>2</Player>
 			<Position x="680.47761" z="354.5824"/>
 			<Orientation y="2.35621"/>
@@ -21654,7 +21654,7 @@
 			<Actor seed="63920"/>
 		</Entity>
 		<Entity uid="3881">
-			<Template>other/palisades_rocks_medium</Template>
+			<Template>structures/palisades_medium</Template>
 			<Player>2</Player>
 			<Position x="692.47938" z="354.84348"/>
 			<Orientation y="-2.49183"/>
@@ -21662,14 +21662,14 @@
 			<Actor seed="49990"/>
 		</Entity>
 		<Entity uid="3882">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="676.56354" z="351.12208"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21528"/>
 		</Entity>
 		<Entity uid="3883">
-			<Template>other/palisades_rocks_end</Template>
+			<Template>structures/palisades_end</Template>
 			<Player>2</Player>
 			<Position x="696.83796" z="352.09629"/>
 			<Orientation y="-2.44382"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
@@ -11579,154 +11579,154 @@
 			<Actor seed="59604"/>
 		</Entity>
 		<Entity uid="1811">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="135.91846" z="282.78129"/>
 			<Orientation y="1.04583"/>
 			<Actor seed="13820"/>
 		</Entity>
 		<Entity uid="1812">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="129.84812" z="298.91822"/>
 			<Orientation y="1.30466"/>
 			<Actor seed="50184"/>
 		</Entity>
 		<Entity uid="1813">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="150.6196" z="299.05851"/>
 			<Orientation y="2.44657"/>
 			<Actor seed="8798"/>
 		</Entity>
 		<Entity uid="1814">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="137.4697" z="319.00559"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="47324"/>
 		</Entity>
 		<Entity uid="1815">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="123.91373" z="334.6858"/>
 			<Orientation y="-0.96505"/>
 			<Actor seed="64"/>
 		</Entity>
 		<Entity uid="1816">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="99.9943" z="347.36863"/>
 			<Orientation y="-1.52073"/>
 			<Actor seed="11096"/>
 		</Entity>
 		<Entity uid="1817">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="68.41358" z="349.9021"/>
 			<Orientation y="-1.56557"/>
 			<Actor seed="49318"/>
 		</Entity>
 		<Entity uid="1818">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="155.17652" z="283.21494"/>
 			<Orientation y="-3.10311"/>
 			<Actor seed="60890"/>
 		</Entity>
 		<Entity uid="1819">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="152.95255" z="268.43677"/>
 			<Orientation y="-2.61452"/>
 			<Actor seed="35912"/>
 		</Entity>
 		<Entity uid="1820">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="149.34131" z="254.9603"/>
 			<Orientation y="-2.41472"/>
 			<Actor seed="63158"/>
 		</Entity>
 		<Entity uid="1821">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="136.95539" z="239.39747"/>
 			<Orientation y="-2.35169"/>
 			<Actor seed="16032"/>
 		</Entity>
 		<Entity uid="1822">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="112.65658" z="341.35068"/>
 			<Orientation y="-0.95612"/>
 			<Actor seed="18482"/>
 		</Entity>
 		<Entity uid="1823">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="85.95788" z="349.88151"/>
 			<Orientation y="-1.57111"/>
 			<Actor seed="41708"/>
 		</Entity>
 		<Entity uid="1824">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="133.43863" z="306.17014"/>
 			<Orientation y="0.19605"/>
 			<Actor seed="23110"/>
 		</Entity>
 		<Entity uid="1825">
-			<Template>other/palisades_tall_spikes</Template>
+			<Template>structures/palisades_spikes_tall</Template>
 			<Player>0</Player>
 			<Position x="147.16681" z="285.07328"/>
 			<Orientation y="1.38276"/>
 			<Actor seed="54264"/>
 		</Entity>
 		<Entity uid="1832">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="148.35608" z="278.00443"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41346"/>
 		</Entity>
 		<Entity uid="1833">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="146.71518" z="274.90653"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42310"/>
 		</Entity>
 		<Entity uid="1834">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="146.5044" z="270.93552"/>
 			<Orientation y="-1.35843"/>
 			<Actor seed="37358"/>
 		</Entity>
 		<Entity uid="1835">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="135.4697" z="312.69224"/>
 			<Orientation y="-2.1269"/>
 			<Actor seed="46080"/>
 		</Entity>
 		<Entity uid="1836">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="129.80057" z="312.84107"/>
 			<Orientation y="0.99877"/>
 			<Actor seed="42512"/>
 		</Entity>
 		<Entity uid="1837">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="131.40348" z="316.06345"/>
 			<Orientation y="-1.59162"/>
 			<Actor seed="5614"/>
 		</Entity>
 		<Entity uid="1838">
-			<Template>other/palisades_small_spikes</Template>
+			<Template>structures/palisades_spikes_small</Template>
 			<Player>0</Player>
 			<Position x="135.51438" z="316.94553"/>
 			<Orientation y="-0.98455"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>8</BuildTime>
-    <Resources>
-      <wood>5</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="3.5" depth="1.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.5</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Angle Spike</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="3.5" depth="1.5"/>
-  </Obstruction>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/palisade_angle_spike.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Indent>-0.7</Indent>
-    <Length>3</Length>
-    <Orientation>1.5</Orientation>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>12</BuildTime>
-    <Resources>
-      <wood>10</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="3.5" depth="8.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Palisade Curve</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="3.0" depth="8.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_curve.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>8.0</Length>
-    <Orientation>0.75</Orientation>
-    <Indent>2.8</Indent>
-    <Bend>0.5</Bend>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>8</BuildTime>
-    <Resources>
-      <wood>5</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Palisade End</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="1.5" depth="3.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_end.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>0.8</Length>
-    <Orientation>1.5</Orientation>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_sentry">
-  <Capturable disable=""/>
-  <Footprint>
-    <Square width="9.5" depth="8.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Palisade Fort</SpecificName>
-    <GenericName>Wooden Tower</GenericName>
-    <Icon>structures/palisade_fort.png</Icon>
-    <Classes datatype="tokens">Palisade</Classes>
-  </Identity>
-  <Obstruction>
-    <Static width="9.0" depth="7.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Upgrade disable=""/>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_fort.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>8.0</Length>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>11</BuildTime>
-    <Resources>
-      <wood>20</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="16" depth="3.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Gate>
-    <PassRange>20</PassRange>
-  </Gate>
-  <Health>
-    <Max op="mul">0.64</Max>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">Gates</Classes>
-    <SpecificName>Palisade Gate</SpecificName>
-    <Icon>structures/wooden_gate.png</Icon>
-    <Tooltip>Allow units access through a palisade wall. Can be locked to prevent access.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Obstructions>
-      <Right width="2" depth="2" x="6" z="0"/>
-      <Left width="2" depth="2" x="-6" z="0"/>
-      <Door width="10" depth="2" x="0" z="0"/>
-    </Obstructions>
-  </Obstruction>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_gate.xml</select>
-      <constructed>interface/complete/building/complete_gate.xml</constructed>
-      <gate_closing>actor/gate/stonegate_close.xml</gate_closing>
-      <gate_opening>actor/gate/stonegate_open.xml</gate_opening>
-      <gate_locked>interface/select/building/sel_gate.xml</gate_locked>
-      <gate_unlocked>interface/select/building/sel_gate.xml</gate_unlocked>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>9.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <FoundationActor>structures/fndn_3x1.xml</FoundationActor>
-    <Actor>props/special/palisade_rocks_gate.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>11.0</Length>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>11</BuildTime>
-    <Resources>
-      <wood>13</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="15" depth="3.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.75</Max>
-  </Health>
-  <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
-    <SpecificName>Palisade</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="14" depth="2.0"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>9.0</HeightOffset>
-  </StatusBars>
-  <Upgrade>
-    <Gate>
-      <Entity>other/palisades_rocks_gate</Entity>
-      <Cost>
-        <wood>20</wood>
-      </Cost>
-      <Time>5</Time>
-      <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
-    </Gate>
-  </Upgrade>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_long.xml</Actor>
-    <FoundationActor>structures/fndn_3x1.xml</FoundationActor>
-  </VisualActor>
-  <WallPiece>
-    <Length>14.0</Length>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>8</BuildTime>
-    <Resources>
-      <wood>7</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="11" depth="3.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.5</Max>
-  </Health>
-  <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
-    <SpecificName>Palisade</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="10" depth="2.0"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>9.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_medium.xml</Actor>
-    <FoundationActor>structures/fndn_3x1.xml</FoundationActor>
-  </VisualActor>
-  <WallPiece>
-    <Length>9.2</Length>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>18</BuildTime>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="6.0" depth="6.0"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">2.0</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Outpost</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="6.0" depth="6.0"/>
-  </Obstruction>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_outpost.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>5</BuildTime>
-    <Resources>
-      <wood>4</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="5.5" depth="3.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.25</Max>
-  </Health>
-  <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
-    <SpecificName>Palisade</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="4.5" depth="2.0"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>9.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_short.xml</Actor>
-    <FoundationActor>structures/fndn_1x1pal.xml</FoundationActor>
-  </VisualActor>
-  <WallPiece>
-    <Length>4.8</Length>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>12</BuildTime>
-    <Resources>
-      <wood>10</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="3.0" depth="15.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Palisade</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="3.0" depth="15.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_straight.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>7</BuildTime>
-    <Resources>
-      <wood>5</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="5" depth="5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.75</Max>
-  </Health>
-  <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
-    <SpecificName>Palisade</SpecificName>
-    <Classes datatype="tokens">Tower</Classes>
-  </Identity>
-  <Obstruction>
-    <Static width="4.0" depth="4.0"/>
-    <ControlPersist/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>9.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_tower.xml</Actor>
-    <FoundationActor>structures/fndn_1x1pal.xml</FoundationActor>
-  </VisualActor>
-  <WallPiece>
-    <Length>4.0</Length>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>18</BuildTime>
-    <Resources>
-      <wood>15</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="5.0" depth="5.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Watchtower</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="5.0" depth="5.0"/>
-    <ControlPersist/>
-  </Obstruction>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_watchtower.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>12</BuildTime>
-    <Resources>
-      <wood>3</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="3.0" depth="11.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.2</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Small Spikes</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="3.0" depth="11.0"/>
-  </Obstruction>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/palisade_small_spikes.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>11</Length>
-    <Orientation>0.5</Orientation>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_palisade">
-  <Cost>
-    <BuildTime>12</BuildTime>
-    <Resources>
-      <wood>9</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="3.0" depth="11.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">0.5</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Tall Spikes</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="3.0" depth="11.0"/>
-  </Obstruction>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/palisade_tall_spikes.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>11</Length>
-    <Orientation>0.5</Orientation>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_gate">
+<Entity parent="structures/palisades_gate">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_long">
+<Entity parent="structures/palisades_long">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_medium">
+<Entity parent="structures/palisades_medium">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_short">
+<Entity parent="structures/palisades_short">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_tower">
+<Entity parent="structures/palisades_tower">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_curve.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_curve.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_curve.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <wood>10</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="3.5" depth="8.5"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Palisade Curve</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="3.0" depth="8.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_curve.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>8.0</Length>
+    <Orientation>0.75</Orientation>
+    <Indent>2.8</Indent>
+    <Bend>0.5</Bend>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_end.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_end.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_end.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>8</BuildTime>
+    <Resources>
+      <wood>5</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="1.5" depth="3.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Palisade End</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="1.5" depth="3.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_end.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>0.8</Length>
+    <Orientation>1.5</Orientation>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_tower_sentry">
+  <Capturable disable=""/>
+  <Footprint>
+    <Square width="9.5" depth="8.5"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Palisade Fort</SpecificName>
+    <GenericName>Wooden Tower</GenericName>
+    <Icon>structures/palisade_fort.png</Icon>
+    <Classes datatype="tokens">Palisade</Classes>
+  </Identity>
+  <Obstruction>
+    <Static width="9.0" depth="7.5"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Upgrade disable=""/>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_fort.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>8.0</Length>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>11</BuildTime>
+    <Resources>
+      <wood>20</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="16" depth="3.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Gate>
+    <PassRange>20</PassRange>
+  </Gate>
+  <Health>
+    <Max op="mul">0.64</Max>
+  </Health>
+  <Identity>
+    <Classes datatype="tokens">Gates</Classes>
+    <SpecificName>Palisade Gate</SpecificName>
+    <Icon>structures/wooden_gate.png</Icon>
+    <Tooltip>Allow units access through a palisade wall. Can be locked to prevent access.</Tooltip>
+  </Identity>
+  <Obstruction>
+    <Obstructions>
+      <Right width="2" depth="2" x="6" z="0"/>
+      <Left width="2" depth="2" x="-6" z="0"/>
+      <Door width="10" depth="2" x="0" z="0"/>
+    </Obstructions>
+  </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_gate.xml</select>
+      <constructed>interface/complete/building/complete_gate.xml</constructed>
+      <gate_closing>actor/gate/stonegate_close.xml</gate_closing>
+      <gate_opening>actor/gate/stonegate_open.xml</gate_opening>
+      <gate_locked>interface/select/building/sel_gate.xml</gate_locked>
+      <gate_unlocked>interface/select/building/sel_gate.xml</gate_unlocked>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <FoundationActor>structures/fndn_3x1.xml</FoundationActor>
+    <Actor>props/special/palisade_rocks_gate.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>11.0</Length>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>11</BuildTime>
+    <Resources>
+      <wood>13</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="15" depth="3.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.75</Max>
+  </Health>
+  <Identity>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
+    <SpecificName>Palisade</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="14" depth="2.0"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
+  <Upgrade>
+    <Gate>
+      <Entity>other/palisades_rocks_gate</Entity>
+      <Cost>
+        <wood>20</wood>
+      </Cost>
+      <Time>5</Time>
+      <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
+    </Gate>
+  </Upgrade>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_long.xml</Actor>
+    <FoundationActor>structures/fndn_3x1.xml</FoundationActor>
+  </VisualActor>
+  <WallPiece>
+    <Length>14.0</Length>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>8</BuildTime>
+    <Resources>
+      <wood>7</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="11" depth="3.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.5</Max>
+  </Health>
+  <Identity>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
+    <SpecificName>Palisade</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="10" depth="2.0"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_medium.xml</Actor>
+    <FoundationActor>structures/fndn_3x1.xml</FoundationActor>
+  </VisualActor>
+  <WallPiece>
+    <Length>9.2</Length>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_outpost.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_outpost.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_outpost.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>18</BuildTime>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="6.0" depth="6.0"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">2.0</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Outpost</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="6.0" depth="6.0"/>
+  </Obstruction>
+  <TerritoryInfluence disable=""/>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_outpost.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>5</BuildTime>
+    <Resources>
+      <wood>4</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="5.5" depth="3.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.25</Max>
+  </Health>
+  <Identity>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
+    <SpecificName>Palisade</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="4.5" depth="2.0"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_short.xml</Actor>
+    <FoundationActor>structures/fndn_1x1pal.xml</FoundationActor>
+  </VisualActor>
+  <WallPiece>
+    <Length>4.8</Length>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spike_angle.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spike_angle.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spike_angle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>8</BuildTime>
+    <Resources>
+      <wood>5</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="3.5" depth="1.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.5</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Angle Spike</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="3.5" depth="1.5"/>
+  </Obstruction>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/palisade_angle_spike.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Indent>-0.7</Indent>
+    <Length>3</Length>
+    <Orientation>1.5</Orientation>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_small.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_small.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_small.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <wood>3</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="3.0" depth="11.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.2</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Small Spikes</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="3.0" depth="11.0"/>
+  </Obstruction>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/palisade_small_spikes.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>11</Length>
+    <Orientation>0.5</Orientation>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_tall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_tall.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_tall.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <wood>9</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="3.0" depth="11.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.5</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Tall Spikes</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="3.0" depth="11.0"/>
+  </Obstruction>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/palisade_tall_spikes.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>11</Length>
+    <Orientation>0.5</Orientation>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_straight.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_straight.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_straight.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <wood>10</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="3.0" depth="15.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Palisade</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="3.0" depth="15.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_straight.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>7</BuildTime>
+    <Resources>
+      <wood>5</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="5" depth="5"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Health>
+    <Max op="mul">0.75</Max>
+  </Health>
+  <Identity>
+    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
+    <SpecificName>Palisade</SpecificName>
+    <Classes datatype="tokens">Tower</Classes>
+  </Identity>
+  <Obstruction>
+    <Static width="4.0" depth="4.0"/>
+    <ControlPersist/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_tower.xml</Actor>
+    <FoundationActor>structures/fndn_1x1pal.xml</FoundationActor>
+  </VisualActor>
+  <WallPiece>
+    <Length>4.0</Length>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_watchtower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_watchtower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_watchtower.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defensive_palisade">
+  <Cost>
+    <BuildTime>18</BuildTime>
+    <Resources>
+      <wood>15</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="5.0" depth="5.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Watchtower</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="5.0" depth="5.0"/>
+    <ControlPersist/>
+  </Obstruction>
+  <TerritoryInfluence disable=""/>
+  <VisualActor>
+    <Actor>props/special/palisade_rocks_watchtower.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
@@ -9,16 +9,14 @@
   </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>
+      <Tower>structures/palisades_tower</Tower>
+      <Gate>structures/palisades_gate</Gate>
+      <Fort>structures/palisades_fort</Fort>
+      <WallLong>structures/palisades_long</WallLong>
+      <WallMedium>structures/palisades_medium</WallMedium>
+      <WallShort>structures/palisades_short</WallShort>
+      <WallCurves>structures/palisades_curve</WallCurves>
+      <WallEnd>structures/palisades_end</WallEnd>
     </Templates>
   </WallSet>
 </Entity>