Index: ps/trunk/binaries/data/mods/public/maps/random/caledonian_meadows.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/caledonian_meadows.js
+++ ps/trunk/binaries/data/mods/public/maps/random/caledonian_meadows.js
@@ -39,9 +39,9 @@
 // Food, fences with domestic animals
 g_WallStyles.other = {
 	"overlap": 0,
-	"fence": readyWallElement("other/fence_long", "gaia"),
-	"fence_short": readyWallElement("other/fence_short", "gaia"),
-	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "other/bench" },
+	"fence": readyWallElement("structures/fence_long", "gaia"),
+	"fence_short": readyWallElement("structures/fence_short", "gaia"),
+	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "structures/bench" },
 	"sheep":     { "angle": 0,           "length": 0,    "indent": 0.75, "bend": 0, "templateName": "gaia/fauna_sheep" },
 	"foodBin":   { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "gaia/treasure/food_bin" },
 	"farmstead": { "angle": Math.PI,     "length": 0,    "indent": -3,   "bend": 0, "templateName": "structures/brit_farmstead" }
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
@@ -65,8 +65,8 @@
 const oTemple = "uncapturable|structures/gaul_temple";
 const oTavern = "uncapturable|structures/gaul_tavern";
 const oHouse = "uncapturable|structures/gaul_house";
-const oLongHouse = "uncapturable|other/celt_longhouse";
-const oHut = "uncapturable|other/celt_hut";
+const oLongHouse = "uncapturable|structures/celt_longhouse";
+const oHut = "uncapturable|structures/celt_hut";
 const oSentryTower = "uncapturable|structures/gaul_sentry_tower";
 const oWatchTower = "uncapturable|structures/palisades_watchtower";
 
Index: ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
+++ ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
@@ -97,7 +97,7 @@
 			},
 			"athen": {
 				"columns": "gaia/ruins/column_doric",
-				"stoa": "other/hellenic_stoa"
+				"stoa": "structures/hellenic_stoa"
 			}
 		},
 		"actors":
Index: ps/trunk/binaries/data/mods/public/maps/random/island_stronghold.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/island_stronghold.js
+++ ps/trunk/binaries/data/mods/public/maps/random/island_stronghold.js
@@ -35,7 +35,7 @@
 const oWhale = "gaia/fauna_whale_humpback";
 const oShipwreck = "gaia/treasure/shipwreck";
 const oShipDebris = "gaia/treasure/shipwreck_debris";
-const oObelisk = "other/obelisk";
+const oObelisk = "structures/obelisk";
 
 const aGrass = g_Decoratives.grass;
 const aGrassShort = g_Decoratives.grassShort;
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
@@ -24,7 +24,7 @@
 		for (let path of civInfo.WallSets)
 		{
 			// File naming conventions:
-			// - other/wallset_{style}
+			// - structures/wallset_{style}
 			// - structures/{civ}_wallset_{style}
 			let style = basename(path).split("_");
 			style = style[0] == "wallset" ? style[1] : style[0] + "_" + style[2];
Index: ps/trunk/binaries/data/mods/public/maps/random/the_nile.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/the_nile.js
+++ ps/trunk/binaries/data/mods/public/maps/random/the_nile.js
@@ -25,7 +25,7 @@
 var oMetalLarge = "gaia/ore/desert_large";
 var oDatePalm = "gaia/tree/date_palm";
 var oSDatePalm = "gaia/tree/cretan_date_palm_short";
-var eObelisk = "other/obelisk";
+var eObelisk = "structures/obelisk";
 var ePyramid = "gaia/ruins/pyramid_minor";
 var oWoodTreasure = "gaia/treasure/wood";
 var oFoodTreasure = "gaia/treasure/food_bin";
Index: ps/trunk/binaries/data/mods/public/maps/random/wall_demo.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/wall_demo.js
+++ ps/trunk/binaries/data/mods/public/maps/random/wall_demo.js
@@ -107,7 +107,7 @@
 		new Vector2D(styleIndex * buildableMapSize / wallStyleList.length, 0)
 	]);
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, pos, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, pos, orientation);
 	placeFortress(pos, type, style, playerID, orientation);
 }
 
@@ -135,7 +135,7 @@
 		new Vector2D(styleIndex * buildableMapSize / wallStyleList.length, 0)
 	]);
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, pos, 0);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, pos, 0);
 	placeGenericFortress(pos, radius, playerID, style);
 }
 
@@ -176,7 +176,7 @@
 	// If less than Pi * 2, then the wall will be an arc.
 	let maxAngle = Math.PI / 2 * (styleIndex % 3 + 2);
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, center, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, center, orientation);
 	placeCircularWall(center, radius, wallPart, style, playerID, orientation, maxAngle);
 }
 
@@ -225,7 +225,7 @@
 	// If true, the first side will not be drawn, leaving the wall open.
 	let skipFirstWall = true;
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, centerPosition, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, centerPosition, orientation);
 	placePolygonalWall(centerPosition, radius, wallParts, cornerWallElement, style, playerID, orientation, numCorners, skipFirstWall);
 }
 
@@ -283,7 +283,7 @@
 	// If true, the first side will not be drawn, leaving the wall open.
 	let skipFirstWall = true;
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, centerPosition, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, centerPosition, orientation);
 	placeIrregularPolygonalWall(centerPosition, radius, cornerWallElement, style, playerID, orientation, numCorners, irregularity, skipFirstWall);
 }
 
Index: ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js
+++ ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js
@@ -279,9 +279,9 @@
 
 g_WallStyles.other = {
 	"overlap": 0,
-	"fence": readyWallElement("other/fence_long", "gaia"),
-	"fence_short": readyWallElement("other/fence_short", "gaia"),
-	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "other/bench" },
+	"fence": readyWallElement("structures/fence_long", "gaia"),
+	"fence_short": readyWallElement("structures/fence_short", "gaia"),
+	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "structures/bench" },
 	"foodBin":   { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "gaia/treasure/food_bin" },
 	"animal":    { "angle": 0,           "length": 0,    "indent": 0.75, "bend": 0, "templateName": farmEntities[currentBiome()].animal },
 	"farmstead": { "angle": Math.PI,     "length": 0,    "indent": -3,   "bend": 0, "templateName": farmEntities[currentBiome()].building }
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/arcadia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/arcadia.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/arcadia.xml
@@ -4031,103 +4031,103 @@
 			<Orientation y="0.56312"/>
 		</Entity>
 		<Entity uid="1002">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="698.57471" z="694.81324"/>
 			<Orientation y="2.26606"/>
 		</Entity>
 		<Entity uid="1003">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="713.24494" z="680.77295"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1004">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="720.80164" z="679.76587"/>
 			<Orientation y="0.8361"/>
 		</Entity>
 		<Entity uid="1005">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="727.3957" z="687.72376"/>
 			<Orientation y="0.54383"/>
 		</Entity>
 		<Entity uid="1006">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="733.55146" z="696.11683"/>
 			<Orientation y="-2.46326"/>
 		</Entity>
 		<Entity uid="1007">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="739.06922" z="704.2179"/>
 			<Orientation y="0.50362"/>
 		</Entity>
 		<Entity uid="1008">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="744.35334" z="713.00165"/>
 			<Orientation y="-2.529"/>
 		</Entity>
 		<Entity uid="1010">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="697.98401" z="702.68842"/>
 			<Orientation y="0.54497"/>
 		</Entity>
 		<Entity uid="1011">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="703.96863" z="711.26526"/>
 			<Orientation y="0.58532"/>
 		</Entity>
 		<Entity uid="1012">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="708.65357" z="720.23298"/>
 			<Orientation y="0.26818"/>
 		</Entity>
 		<Entity uid="1013">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="714.06226" z="728.81891"/>
 			<Orientation y="-2.28736"/>
 		</Entity>
 		<Entity uid="1014">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="720.82087" z="736.12726"/>
 			<Orientation y="0.59"/>
 		</Entity>
 		<Entity uid="1015">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="727.54413" z="736.01508"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1016">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="734.99347" z="728.39075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1017">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="742.67206" z="720.8069"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1018">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="664.06275" z="700.01471"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1019">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="659.83619" z="682.7613"/>
 			<Orientation y="1.69478"/>
@@ -9099,25 +9099,25 @@
 			<Orientation y="0.61725"/>
 		</Entity>
 		<Entity uid="2028">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="79.73963" z="62.98061"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2029">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="71.41976" z="71.93627"/>
 			<Orientation y="2.42869"/>
 		</Entity>
 		<Entity uid="2031">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="54.76291" z="75.04055"/>
 			<Orientation y="1.32277"/>
 		</Entity>
 		<Entity uid="2032">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="64.1228" z="76.33954"/>
 			<Orientation y="1.54908"/>
@@ -12529,7 +12529,7 @@
 			<Orientation y="2.29662"/>
 		</Entity>
 		<Entity uid="2718">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="630.23548" z="658.82721"/>
 			<Orientation y="-2.41614"/>
@@ -21439,25 +21439,25 @@
 			<Orientation y="-0.26815"/>
 		</Entity>
 		<Entity uid="4444">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="134.64338" z="100.94608"/>
 			<Orientation y="2.36779"/>
 		</Entity>
 		<Entity uid="4445">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="121.03122" z="84.07525"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4446">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="586.29877" z="711.04682"/>
 			<Orientation y="2.1231"/>
 		</Entity>
 		<Entity uid="4447">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="576.172" z="689.5625"/>
 			<Orientation y="2.13614"/>
@@ -21595,7 +21595,7 @@
 			<Orientation y="1.84865"/>
 		</Entity>
 		<Entity uid="4511">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>2</Player>
 			<Position x="74.71795" z="153.22724"/>
 			<Orientation y="2.33184"/>
@@ -21643,25 +21643,25 @@
 			<Orientation y="-2.35447"/>
 		</Entity>
 		<Entity uid="4586">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="708.01874" z="225.287"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4588">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="712.77582" z="223.53736"/>
 			<Orientation y="-0.26554"/>
 		</Entity>
 		<Entity uid="4589">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="705.60016" z="206.5236"/>
 			<Orientation y="1.5513"/>
 		</Entity>
 		<Entity uid="4590">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="699.8025" z="217.19782"/>
 			<Orientation y="-2.1455"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml
@@ -1470,13 +1470,13 @@
 			<Orientation y="-2.08684"/>
 		</Entity>
 		<Entity uid="598">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1365.51587" z="643.61646"/>
 			<Orientation y="-2.35868"/>
 		</Entity>
 		<Entity uid="599">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1372.89563" z="650.29218"/>
 			<Orientation y="0.78431"/>
@@ -2748,13 +2748,13 @@
 			<Orientation y="-2.31571"/>
 		</Entity>
 		<Entity uid="833">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="815.3263" z="776.36982"/>
 			<Orientation y="-1.57053"/>
 		</Entity>
 		<Entity uid="834">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="820.74518" z="776.95618"/>
 			<Orientation y="1.5738"/>
@@ -8931,7 +8931,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1973">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="191.1149" z="759.61524"/>
 			<Orientation y="-0.30507"/>
@@ -13715,13 +13715,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2881">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="821.66456" z="1259.52503"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2882">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="818.7292" z="1253.07313"/>
 			<Orientation y="1.82416"/>
@@ -28141,13 +28141,13 @@
 			<Orientation y="-0.82096"/>
 		</Entity>
 		<Entity uid="5509">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="348.50211" z="1075.27088"/>
 			<Orientation y="-0.13453"/>
 		</Entity>
 		<Entity uid="5510">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="354.62348" z="1076.33338"/>
 			<Orientation y="-0.42757"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml
@@ -1490,13 +1490,13 @@
 			<Orientation y="-2.08684"/>
 		</Entity>
 		<Entity uid="598">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1369.75806" z="640.25141"/>
 			<Orientation y="-2.35868"/>
 		</Entity>
 		<Entity uid="599">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1375.65699" z="646.32117"/>
 			<Orientation y="0.78431"/>
@@ -2768,13 +2768,13 @@
 			<Orientation y="-2.31571"/>
 		</Entity>
 		<Entity uid="833">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="815.3263" z="776.36982"/>
 			<Orientation y="-1.57053"/>
 		</Entity>
 		<Entity uid="834">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="820.74518" z="776.95618"/>
 			<Orientation y="1.5738"/>
@@ -8951,7 +8951,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1973">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="191.1149" z="759.61524"/>
 			<Orientation y="-0.30507"/>
@@ -13735,13 +13735,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2881">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="821.66456" z="1259.52503"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2882">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="818.7292" z="1253.07313"/>
 			<Orientation y="1.82416"/>
@@ -28161,13 +28161,13 @@
 			<Orientation y="-0.82096"/>
 		</Entity>
 		<Entity uid="5509">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="348.50211" z="1075.27088"/>
 			<Orientation y="-0.13453"/>
 		</Entity>
 		<Entity uid="5510">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="354.62348" z="1076.33338"/>
 			<Orientation y="-0.42757"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml
@@ -1542,13 +1542,13 @@
 			<Orientation y="-2.08684"/>
 		</Entity>
 		<Entity uid="598">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1366.97352" z="643.02607"/>
 			<Orientation y="-2.35868"/>
 		</Entity>
 		<Entity uid="599">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1373.39185" z="649.1366"/>
 			<Orientation y="0.78431"/>
@@ -2820,13 +2820,13 @@
 			<Orientation y="-2.31571"/>
 		</Entity>
 		<Entity uid="833">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="815.3263" z="776.36982"/>
 			<Orientation y="-1.57053"/>
 		</Entity>
 		<Entity uid="834">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="820.74518" z="776.95618"/>
 			<Orientation y="1.5738"/>
@@ -9003,7 +9003,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1973">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="191.1149" z="759.61524"/>
 			<Orientation y="-0.30507"/>
@@ -13790,13 +13790,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2881">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="821.66456" z="1259.52503"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2882">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="818.7292" z="1253.07313"/>
 			<Orientation y="1.82416"/>
@@ -28218,13 +28218,13 @@
 			<Orientation y="-0.82096"/>
 		</Entity>
 		<Entity uid="5509">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="348.50211" z="1075.27088"/>
 			<Orientation y="-0.13453"/>
 		</Entity>
 		<Entity uid="5510">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="354.62348" z="1076.33338"/>
 			<Orientation y="-0.42757"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
@@ -12454,229 +12454,229 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3515">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="891.99042" z="1413.9032"/>
 			<Orientation y="-2.13431"/>
 		</Entity>
 		<Entity uid="3516">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="865.60029" z="1433.78602"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3517">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="866.23407" z="1453.51233"/>
 			<Orientation y="-2.39946"/>
 		</Entity>
 		<Entity uid="3518">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="878.50873" z="1457.07044"/>
 			<Orientation y="0.83712"/>
 		</Entity>
 		<Entity uid="3519">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="891.34559" z="1455.69666"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3520">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="901.72614" z="1418.1355"/>
 			<Orientation y="-1.92284"/>
 		</Entity>
 		<Entity uid="3521">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="883.57056" z="1419.58204"/>
 			<Orientation y="-0.74813"/>
 		</Entity>
 		<Entity uid="3522">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="888.50696" z="1418.27405"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3523">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="895.06592" z="1422.59913"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3524">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="899.08582" z="1410.31934"/>
 			<Orientation y="-2.08594"/>
 		</Entity>
 		<Entity uid="3525">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="886.65992" z="1403.73511"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3526">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="860.45441" z="1444.86976"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3527">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="870.41431" z="1453.64747"/>
 			<Orientation y="-0.84855"/>
 		</Entity>
 		<Entity uid="3528">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="575.54151" z="850.07319"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3529">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="585.70685" z="854.00947"/>
 			<Orientation y="0.22309"/>
 		</Entity>
 		<Entity uid="3530">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="611.97376" z="821.9198"/>
 			<Orientation y="-1.6266"/>
 		</Entity>
 		<Entity uid="3531">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="581.02253" z="818.92243"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3532">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="572.96296" z="838.65656"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3533">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="577.08796" z="842.19727"/>
 			<Orientation y="1.38094"/>
 		</Entity>
 		<Entity uid="3534">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="583.77491" z="845.36121"/>
 			<Orientation y="0.59195"/>
 		</Entity>
 		<Entity uid="3535">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="609.49457" z="835.12464"/>
 			<Orientation y="-2.04274"/>
 		</Entity>
 		<Entity uid="3536">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="602.26301" z="825.93836"/>
 			<Orientation y="1.29918"/>
 		</Entity>
 		<Entity uid="3537">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="610.02527" z="828.51392"/>
 			<Orientation y="-2.26378"/>
 		</Entity>
 		<Entity uid="3538">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="598.35376" z="817.83643"/>
 			<Orientation y="1.26758"/>
 		</Entity>
 		<Entity uid="3539">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="592.30799" z="855.13923"/>
 			<Orientation y="-2.33675"/>
 		</Entity>
 		<Entity uid="3540">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="585.36493" z="820.8755"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3541">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="591.93012" z="825.01478"/>
 			<Orientation y="-2.23362"/>
 		</Entity>
 		<Entity uid="3542">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="608.22858" z="819.69623"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3543">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="616.27839" z="817.65662"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3544">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1262.35596" z="858.92853"/>
 			<Orientation y="-2.05765"/>
 		</Entity>
 		<Entity uid="3545">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1255.9242" z="864.9756"/>
 			<Orientation y="0.28136"/>
 		</Entity>
 		<Entity uid="3546">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1253.53089" z="876.40943"/>
 			<Orientation y="-1.93824"/>
 		</Entity>
 		<Entity uid="3547">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1291.17579" z="871.4795"/>
 			<Orientation y="1.03689"/>
 		</Entity>
 		<Entity uid="3548">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1286.6526" z="883.14637"/>
 			<Orientation y="-2.33463"/>
 		</Entity>
 		<Entity uid="3549">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1286.36768" z="847.41889"/>
 			<Orientation y="0.0768"/>
 		</Entity>
 		<Entity uid="3550">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1268.40052" z="854.12092"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3551">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1294.12574" z="852.45057"/>
 			<Orientation y="-1.93851"/>
 		</Entity>
 		<Entity uid="3552">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1255.75391" z="882.90625"/>
 			<Orientation y="0.21567"/>
@@ -36635,12 +36635,12 @@
 			<Orientation y="-2.91497"/>
 		</Entity>
 		<Entity uid="8376">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Position x="1271.1172" z="219.5622"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8377">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Position x="1256.511" z="231.80895"/>
 			<Orientation y="-0.77454"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/belgian_bog_night.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/belgian_bog_night.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/belgian_bog_night.xml
@@ -4793,19 +4793,19 @@
 			<Orientation y="-0.87851"/>
 		</Entity>
 		<Entity uid="938">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>0</Player>
 			<Position x="532.4751" z="477.37851"/>
 			<Orientation y="-2.1608"/>
 		</Entity>
 		<Entity uid="939">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="467.54902" z="716.503"/>
 			<Orientation y="-0.73435"/>
 		</Entity>
 		<Entity uid="940">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="642.63227" z="450.34711"/>
 			<Orientation y="2.35621"/>
@@ -4931,13 +4931,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="965">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>1</Player>
 			<Position x="859.69135" z="476.29636"/>
 			<Orientation y="0.83816"/>
 		</Entity>
 		<Entity uid="966">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>1</Player>
 			<Position x="850.23536" z="483.2761"/>
 			<Orientation y="-2.44721"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/bridge_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/bridge_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/bridge_demo.xml
@@ -3983,103 +3983,103 @@
 			<Orientation y="0.56312"/>
 		</Entity>
 		<Entity uid="1002">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="698.57471" z="694.81324"/>
 			<Orientation y="2.26606"/>
 		</Entity>
 		<Entity uid="1003">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="713.24494" z="680.77295"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1004">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="720.80164" z="679.76587"/>
 			<Orientation y="0.8361"/>
 		</Entity>
 		<Entity uid="1005">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="727.3957" z="687.72376"/>
 			<Orientation y="0.54383"/>
 		</Entity>
 		<Entity uid="1006">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="733.55146" z="696.11683"/>
 			<Orientation y="-2.46326"/>
 		</Entity>
 		<Entity uid="1007">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="739.06922" z="704.2179"/>
 			<Orientation y="0.50362"/>
 		</Entity>
 		<Entity uid="1008">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="744.35334" z="713.00165"/>
 			<Orientation y="-2.529"/>
 		</Entity>
 		<Entity uid="1010">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="697.98401" z="702.68842"/>
 			<Orientation y="0.54497"/>
 		</Entity>
 		<Entity uid="1011">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="703.96863" z="711.26526"/>
 			<Orientation y="0.58532"/>
 		</Entity>
 		<Entity uid="1012">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="708.65357" z="720.23298"/>
 			<Orientation y="0.26818"/>
 		</Entity>
 		<Entity uid="1013">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="714.06226" z="728.81891"/>
 			<Orientation y="-2.28736"/>
 		</Entity>
 		<Entity uid="1014">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="720.82087" z="736.12726"/>
 			<Orientation y="0.59"/>
 		</Entity>
 		<Entity uid="1015">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="727.54413" z="736.01508"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1016">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="734.99347" z="728.39075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1017">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="742.67206" z="720.8069"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1018">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="664.06275" z="700.01471"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1019">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="659.83619" z="682.7613"/>
 			<Orientation y="1.69478"/>
@@ -8915,25 +8915,25 @@
 			<Orientation y="0.61725"/>
 		</Entity>
 		<Entity uid="2028">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="79.73963" z="62.98061"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2029">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="71.41976" z="71.93627"/>
 			<Orientation y="2.42869"/>
 		</Entity>
 		<Entity uid="2031">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="54.76291" z="75.04055"/>
 			<Orientation y="1.32277"/>
 		</Entity>
 		<Entity uid="2032">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="64.1228" z="76.33954"/>
 			<Orientation y="1.54908"/>
@@ -21234,25 +21234,25 @@
 			<Orientation y="-0.26815"/>
 		</Entity>
 		<Entity uid="4444">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="134.64338" z="100.94608"/>
 			<Orientation y="2.36779"/>
 		</Entity>
 		<Entity uid="4445">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="121.03122" z="84.07525"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4446">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="586.29877" z="711.04682"/>
 			<Orientation y="2.1231"/>
 		</Entity>
 		<Entity uid="4447">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="576.172" z="689.5625"/>
 			<Orientation y="2.13614"/>
@@ -21444,25 +21444,25 @@
 			<Orientation y="-2.35447"/>
 		</Entity>
 		<Entity uid="4586">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="708.01874" z="225.287"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4588">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="712.77582" z="223.53736"/>
 			<Orientation y="-0.26554"/>
 		</Entity>
 		<Entity uid="4589">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="705.60016" z="206.5236"/>
 			<Orientation y="1.5513"/>
 		</Entity>
 		<Entity uid="4590">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="699.8025" z="217.19782"/>
 			<Orientation y="-2.1455"/>
@@ -22275,13 +22275,13 @@
 			<Orientation y="1.79245"/>
 		</Entity>
 		<Entity uid="4782">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="470.26487" z="459.39109"/>
 			<Orientation y="3.13555"/>
 		</Entity>
 		<Entity uid="4783">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="469.23807" z="463.83787"/>
 			<Orientation y="-0.00602"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
@@ -16250,13 +16250,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3452">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="580.02662" z="515.81104"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3453">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="567.91913" z="528.1955"/>
 			<Orientation y="-0.77804"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/fast_oasis.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/fast_oasis.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/fast_oasis.xml
@@ -6521,13 +6521,13 @@
 			<Orientation y="-1.93735"/>
 		</Entity>
 		<Entity uid="8653">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="262.64264" z="267.06995"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8654">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="299.83655" z="402.72248"/>
 			<Orientation y="-3.00841"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/gold_rush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/gold_rush.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/gold_rush.xml
@@ -558,25 +558,25 @@
 			<Orientation y="-0.73954"/>
 		</Entity>
 		<Entity uid="122">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="367.48752" z="325.67438"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="123">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="433.54966" z="379.62983"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="125">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="375.30542" z="465.76502"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="126">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="297.57651" z="398.50513"/>
 			<Orientation y="2.35621"/>
@@ -594,13 +594,13 @@
 			<Orientation y="0.68854"/>
 		</Entity>
 		<Entity uid="129">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="409.2003" z="228.53986"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="130">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="402.76355" z="227.08548"/>
 			<Orientation y="-0.99254"/>
@@ -4807,61 +4807,61 @@
 			<Orientation y="-2.91897"/>
 		</Entity>
 		<Entity uid="932">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="710.73035" z="53.41126"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="933">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="44.13752" z="706.01191"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="934">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="621.30262" z="550.97217"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="935">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="629.9062" z="558.79542"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="936">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="182.73328" z="135.58164"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="937">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="190.92182" z="143.09217"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="938">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="159.3992" z="551.84412"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="939">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="166.58016" z="558.16334"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="940">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="608.02283" z="155.81"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="941">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="615.24396" z="163.8837"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
@@ -5397,7 +5397,7 @@
 			<Orientation y="0.79418"/>
 		</Entity>
 		<Entity uid="913">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="457.23688" z="254.65085"/>
 			<Orientation y="-2.32995"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/migration.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/migration.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/migration.xml
@@ -4621,19 +4621,19 @@
 			<Orientation y="1.68725"/>
 		</Entity>
 		<Entity uid="1003">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="761.41498" z="760.20765"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1004">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="763.13929" z="732.98194"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1005">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="749.76618" z="733.04975"/>
 			<Orientation y="-2.72584"/>
@@ -7164,19 +7164,19 @@
 			<Orientation y="0.27446"/>
 		</Entity>
 		<Entity uid="1499">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="496.66214" z="964.2522"/>
 			<Orientation y="-1.3763"/>
 		</Entity>
 		<Entity uid="1500">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="484.32667" z="960.55842"/>
 			<Orientation y="-2.75812"/>
 		</Entity>
 		<Entity uid="1502">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>0</Player>
 			<Position x="491.73304" z="955.448"/>
 			<Orientation y="-1.5926"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/miletus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/miletus.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/miletus.xml
@@ -93,13 +93,13 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="13">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="249.42031" z="219.11031"/>
 			<Orientation y="-0.79975"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="244.84145" z="270.95362"/>
 			<Orientation y="-2.32988"/>
@@ -1810,7 +1810,7 @@
 			<Obstruction group="399"/>
 		</Entity>
 		<Entity uid="360">
-			<Template>other/hellenic_epic_temple</Template>
+			<Template>structures/hellenic_epic_temple</Template>
 			<Player>1</Player>
 			<Position x="348.88273" z="360.96283"/>
 			<Orientation y="2.35621"/>
@@ -1828,13 +1828,13 @@
 			<Orientation y="0.78383"/>
 		</Entity>
 		<Entity uid="363">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="291.5966" z="384.29517"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="364">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="314.94446" z="406.20496"/>
 			<Orientation y="2.35621"/>
@@ -2901,61 +2901,61 @@
 			<Orientation y="-1.65445"/>
 		</Entity>
 		<Entity uid="633">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="372.05018" z="322.25669"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="634">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="375.8625" z="326.53849"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="635">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="380.57877" z="330.55387"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="636">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="384.62739" z="335.02131"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="637">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="388.95981" z="338.91749"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="638">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="393.30018" z="343.39283"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="639">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="397.41938" z="347.9546"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="640">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="401.63175" z="352.02588"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="641">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="367.85804" z="317.68992"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="642">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>1</Player>
 			<Position x="363.68921" z="313.62552"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
@@ -62,111 +62,111 @@
 			<Actor seed="47243"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1171.58924" z="1077.12354"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1184.56324" z="1063.82874"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1178.01429" z="1070.46412"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1151.87574" z="1097.00293"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="31">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1151.85462" z="1103.98841"/>
 			<Orientation y="0.79261"/>
 		</Entity>
 		<Entity uid="32">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1165.12708" z="1116.98536"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1158.50306" z="1110.42505"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="34">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1205.047" z="1077.41163"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="35">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1198.4231" z="1070.85145"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="36">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1191.77454" z="1064.41492"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="41">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1211.32374" z="1090.51404"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="42">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1204.77503" z="1097.14942"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="43">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1178.63611" z="1123.68824"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="47">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1198.34986" z="1103.80896"/>
 			<Orientation y="2.36512"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="48">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1211.6261" z="1083.92896"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="49">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1171.7063" z="1123.50245"/>
 			<Orientation y="0.79261"/>
@@ -645,98 +645,98 @@
 			<Actor seed="28521"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1190.75684" z="1077.50831"/>
 			<Orientation y="0.788"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1194.96204" z="1081.70899"/>
 			<Orientation y="0.788"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="244">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1197.38953" z="1083.98523"/>
 			<Orientation y="0.788"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1171.24305" z="1105.22693"/>
 			<Orientation y="0.788"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="246">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1167.43201" z="1101.59437"/>
 			<Orientation y="0.788"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="247">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1174.03138" z="1108.08362"/>
 			<Orientation y="0.788"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="248">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1179.95496" z="1084.1388"/>
 			<Orientation y="2.3605"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="249">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1186.53431" z="1077.53345"/>
 			<Orientation y="2.36052"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="250">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1173.30872" z="1090.71705"/>
 			<Orientation y="2.36052"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="251">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1166.72938" z="1097.32203"/>
 			<Orientation y="2.36052"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="252">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1191.68946" z="1095.79505"/>
 			<Orientation y="2.3605"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="253">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1198.26868" z="1089.18982"/>
 			<Orientation y="2.36052"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="254">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1185.04322" z="1102.37342"/>
 			<Orientation y="2.36052"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="255">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1178.46387" z="1108.9784"/>
 			<Orientation y="2.36052"/>
@@ -4014,147 +4014,147 @@
 			<Actor seed="63501"/>
 		</Entity>
 		<Entity uid="868">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1154.59473" z="1004.61243"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="869">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1148.00953" z="1011.17945"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="870">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1141.4452" z="1017.79944"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="871">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1135.00452" z="1024.44385"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="872">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1107.89698" z="1051.75806"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="873">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1101.33265" z="1058.37806"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="874">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1094.89197" z="1065.02259"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="875">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1088.26258" z="1071.5796"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="876">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1081.69825" z="1078.1996"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="877">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1075.25757" z="1084.84412"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="878">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1128.53028" z="1031.12012"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="879">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1122.62293" z="1037.10511"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="881">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1143.71741" z="1055.93421"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="882">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1197.91724" z="1053.6825"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="883">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1204.52588" z="1060.25843"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="884">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1211.15931" z="1066.71058"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="885">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1217.76783" z="1073.28626"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="886">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1224.33167" z="1079.81897"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="894">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1130.422" z="1073.04053"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="896">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1126.30201" z="1045.547"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="897">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1116.92237" z="1055.99195"/>
 			<Orientation y="7.05626"/>
@@ -4167,14 +4167,14 @@
 			<Actor seed="19109"/>
 		</Entity>
 		<Entity uid="900">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1123.39673" z="1042.57508"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="901">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1113.7422" z="1052.71021"/>
 			<Orientation y="7.05626"/>
@@ -4235,126 +4235,126 @@
 			<Actor seed="63501"/>
 		</Entity>
 		<Entity uid="913">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="986.39234" z="992.77131"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="914">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="992.81592" z="986.11023"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="915">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="999.36316" z="979.47333"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="916">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1005.97565" z="972.8993"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="917">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1012.39924" z="966.23823"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="918">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1018.94654" z="959.60138"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="919">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1032.8578" z="945.65668"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="920">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1038.74988" z="939.6565"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="921">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1045.2068" z="932.96363"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="922">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1051.63038" z="926.30262"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="923">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1058.17774" z="919.66578"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="924">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1064.74598" z="913.08185"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="927">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1026.28907" z="952.39118"/>
 			<Orientation y="2.36536"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="928">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1072.85181" z="912.57483"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="929">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1079.01661" z="918.73047"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="930">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1085.62525" z="925.3064"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="931">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1092.25867" z="931.75855"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="932">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1098.8672" z="938.33423"/>
 			<Orientation y="0.79026"/>
@@ -4379,28 +4379,28 @@
 			<Actor seed="63501"/>
 		</Entity>
 		<Entity uid="939">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1157.469" z="1001.9369"/>
 			<Orientation y="2.34318"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="940">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1157.27356" z="995.31653"/>
 			<Orientation y="0.77065"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="941">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1150.7953" z="988.61255"/>
 			<Orientation y="0.77065"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="942">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1144.28968" z="982.03156"/>
 			<Orientation y="0.77065"/>
@@ -4431,336 +4431,336 @@
 			<Actor seed="63501"/>
 		</Entity>
 		<Entity uid="947">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1138.18433" z="975.94172"/>
 			<Orientation y="0.77065"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="976">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1051.72535" z="1103.47193"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="977">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1071.79688" z="1123.2151"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="978">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1065.16346" z="1116.76294"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="979">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1058.55481" z="1110.18702"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="980">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="957.3039" z="1063.75379"/>
 			<Orientation y="1.43371"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="981">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="980.31421" z="1081.39698"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="982">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="973.6808" z="1074.94483"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="983">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="970.86927" z="1072.12244"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="984">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="985.04664" z="1064.3495"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="985">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1004.90137" z="1083.96595"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="986">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="998.26795" z="1077.5138"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="987">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="991.65931" z="1070.93787"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="988">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1068.01197" z="1099.45777"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="989">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1087.8667" z="1119.07422"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="990">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1081.23328" z="1112.62208"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="991">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1074.62464" z="1106.04615"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="992">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1020.75477" z="1087.13831"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="993">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1048.66443" z="1086.87879"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="994">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1039.412" z="1087.03711"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="995">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1030.08924" z="1087.0907"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="996">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1012.14765" z="1101.06873"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="998">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1030.80494" z="1100.96753"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="999">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1021.48212" z="1101.02112"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1000">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1092.6377" z="1136.0785"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1001">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1120.54737" z="1135.81897"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1002">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1111.29493" z="1135.9773"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1003">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1101.97217" z="1136.03089"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1005">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1100.74976" z="1112.2079"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1006">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1107.38318" z="1118.66004"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1007">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1096.2428" z="1122.22437"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1008">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1105.56556" z="1122.17078"/>
 			<Orientation y="1.57892"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1010">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1100.99231" z="1105.64063"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1011">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1107.43299" z="1098.9961"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1012">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1060.0022" z="1080.57422"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1013">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1053.43506" z="1074.05445"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1014">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1047.27283" z="1068.02222"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1015">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1066.5431" z="1087.21717"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1016">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1034.19532" z="1054.72632"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1017">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1027.62818" z="1048.20655"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1018">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1021.46595" z="1042.17432"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1019">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1040.73621" z="1061.36927"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1020">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1008.64271" z="1029.14026"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1021">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1002.07557" z="1022.62049"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1022">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="995.91334" z="1016.58826"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1023">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1015.1836" z="1035.78321"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1024">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="982.60444" z="1003.62006"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1027">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="989.14533" z="1010.26301"/>
 			<Orientation y="0.78002"/>
@@ -5582,28 +5582,28 @@
 			<Actor seed="58859"/>
 		</Entity>
 		<Entity uid="1246">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1036.59314" z="975.60395"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1247">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1066.78235" z="965.02973"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1248">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1081.71033" z="951.84424"/>
 			<Orientation y="1.66894"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1249">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1091.01221" z="950.35438"/>
 			<Orientation y="1.85084"/>
@@ -5611,203 +5611,203 @@
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1250">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1010.852" z="1001.20295"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1251">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1016.85468" z="995.3136"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1252">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1023.43525" z="988.74213"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1253">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1029.98182" z="982.20197"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1254">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1015.88721" z="1015.47577"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1255">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1009.34632" z="1008.83283"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1256">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1041.92554" z="1040.99598"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1257">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1022.65522" z="1021.80103"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1258">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1028.81739" z="1027.83326"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1259">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1035.38453" z="1034.35303"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1260">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1048.20777" z="1047.3871"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1261">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1054.37012" z="1053.41932"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1262">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1064.54847" z="1063.78138"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1263">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1058.38611" z="1057.74915"/>
 			<Orientation y="0.78002"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1264">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1084.51526" z="1052.07166"/>
 			<Orientation y="2.11255"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1265">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1076.9911" z="1057.80481"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1266">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1070.98841" z="1063.6941"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1267">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1091.14661" z="1047.38843"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1268">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1097.1493" z="1041.49915"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1269">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1103.69666" z="1041.80445"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1270">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1107.0746" z="1045.44666"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1271">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1116.01832" z="1036.69983"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1272">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1113.76771" z="1034.45777"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1273">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1112.80384" z="1026.98853"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1274">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1119.27808" z="1020.31226"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1275">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1125.33594" z="1014.03742"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1276">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1131.81019" z="1007.36115"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1277">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1125.54505" z="994.43042"/>
 			<Orientation y="0.77065"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1278">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1131.6504" z="1000.52027"/>
 			<Orientation y="0.77065"/>
@@ -6001,63 +6001,63 @@
 			<Actor seed="62559"/>
 		</Entity>
 		<Entity uid="1448">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1128.25306" z="1139.19043"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1449">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1148.2439" z="1128.45936"/>
 			<Orientation y="1.5908"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1453">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1185.4657" z="1116.85584"/>
 			<Orientation y="2.36513"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1454">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1166.11023" z="1082.50647"/>
 			<Orientation y="2.36513"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1455">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1170.30457" z="1144.57557"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1456">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1163.72535" z="1138.05848"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1457">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1157.10132" z="1131.49817"/>
 			<Orientation y="0.79261"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1458">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1139.9557" z="1131.60523"/>
 			<Orientation y="2.36358"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1459">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1133.52015" z="1138.25489"/>
 			<Orientation y="2.36358"/>
@@ -6099,7 +6099,7 @@
 			<Actor seed="28521"/>
 		</Entity>
 		<Entity uid="1465">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1133.60401" z="971.23823"/>
 			<Orientation y="0.77065"/>
@@ -6494,7 +6494,7 @@
 			<Actor seed="17707"/>
 		</Entity>
 		<Entity uid="1568">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1897.64649" z="956.63501"/>
 			<Orientation y="7.83045"/>
@@ -6509,14 +6509,14 @@
 			<Actor seed="47057"/>
 		</Entity>
 		<Entity uid="1570">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1907.24378" z="880.90723"/>
 			<Orientation y="3.1414"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1571">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1904.10657" z="872.65821"/>
 			<Orientation y="3.8672"/>
@@ -6524,104 +6524,104 @@
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1572">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1903.03663" z="888.03779"/>
 			<Orientation y="8.41587"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1574">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1943.92042" z="916.27186"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1576">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1925.34412" z="916.25336"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1578">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1943.87525" z="927.42798"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1580">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1925.29896" z="927.4095"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1583">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1932.74402" z="999.34388"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1585">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1914.00977" z="999.58515"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1586">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1932.33362" z="988.39087"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1588">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1913.75696" z="988.28187"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1590">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1946.98475" z="921.70594"/>
 			<Orientation y="3.14141"/>
 		</Entity>
 		<Entity uid="1591">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1945.65125" z="994.04096"/>
 			<Orientation y="3.14141"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1592">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1903.9983" z="1007.28437"/>
 			<Orientation y="3.14141"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1593">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1906.8202" z="1000.96796"/>
 			<Orientation y="8.47385"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1594">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1899.05848" z="1012.54499"/>
 			<Orientation y="1.5531"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="1595">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1899.82093" z="1031.78138"/>
 			<Orientation y="4.10407"/>
@@ -6629,56 +6629,56 @@
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1596">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1905.57422" z="985.589"/>
 			<Orientation y="7.10312"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1597">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1907.0022" z="928.50574"/>
 			<Orientation y="8.23714"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1598">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1906.9347" z="914.80335"/>
 			<Orientation y="7.52781"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1599">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1900.71155" z="909.3675"/>
 			<Orientation y="6.72014"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="1600">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1916.78553" z="925.15973"/>
 			<Orientation y="0.02149"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="1601">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1917.36548" z="918.74213"/>
 			<Orientation y="3.12526"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="1602">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1914.67518" z="990.81885"/>
 			<Orientation y="3.1376"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="1603">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1913.86866" z="997.07557"/>
 			<Orientation y="0.02149"/>
@@ -24613,7 +24613,7 @@
 			<Actor seed="38059"/>
 		</Entity>
 		<Entity uid="5335">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1896.10743" z="836.60621"/>
 			<Orientation y="7.88788"/>
@@ -24621,84 +24621,84 @@
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="5336">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1893.89112" z="1073.09888"/>
 			<Orientation y="7.82573"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="5337">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1910.86817" z="1113.24292"/>
 			<Orientation y="0.02149"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="5338">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1911.67493" z="1107.69568"/>
 			<Orientation y="3.13761"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="5340">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1929.33338" z="1105.26771"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5341">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1902.57398" z="1102.46583"/>
 			<Orientation y="7.10312"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="5343">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1903.81995" z="1117.84473"/>
 			<Orientation y="8.47385"/>
 			<Actor seed="12039"/>
 		</Entity>
 		<Entity uid="5344">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1910.75672" z="1105.1587"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5345">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1929.74378" z="1116.22071"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5347">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1911.00953" z="1116.46192"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5357">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1917.49976" z="795.02356"/>
 			<Orientation y="3.12526"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="5358">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1917.48023" z="800.37732"/>
 			<Orientation y="0.01534"/>
 			<Actor seed="49793"/>
 		</Entity>
 		<Entity uid="5359">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1924.0918" z="803.88672"/>
 			<Orientation y="1.56652"/>
@@ -24711,21 +24711,21 @@
 			<Actor seed="622"/>
 		</Entity>
 		<Entity uid="5362">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1924.01404" z="792.37665"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5364">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1942.91041" z="792.64002"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5365">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1942.50562" z="804.05793"/>
 			<Orientation y="1.56652"/>
@@ -24750,21 +24750,21 @@
 			<Actor seed="36423"/>
 		</Entity>
 		<Entity uid="5369">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1906.85926" z="791.78394"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5370">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1907.71949" z="803.99335"/>
 			<Orientation y="1.56652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5371">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1947.35303" z="797.86622"/>
 			<Orientation y="3.14141"/>
@@ -24778,7 +24778,7 @@
 			<Actor seed="8325"/>
 		</Entity>
 		<Entity uid="5373">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1940.09632" z="1110.02332"/>
 			<Orientation y="3.14312"/>
@@ -26165,35 +26165,35 @@
 			<Actor seed="48703"/>
 		</Entity>
 		<Entity uid="5601">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1839.8429" z="1098.83582"/>
 			<Orientation y="1.58417"/>
 			<Actor seed="119"/>
 		</Entity>
 		<Entity uid="5602">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1856.1421" z="1128.34217"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61674"/>
 		</Entity>
 		<Entity uid="5603">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1863.2356" z="1130.36341"/>
 			<Orientation y="-3.10938"/>
 			<Actor seed="27967"/>
 		</Entity>
 		<Entity uid="5604">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1873.73206" z="1129.63086"/>
 			<Orientation y="-2.72995"/>
 			<Actor seed="47345"/>
 		</Entity>
 		<Entity uid="5605">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1875.80567" z="1116.58558"/>
 			<Orientation y="-1.61561"/>
@@ -26243,35 +26243,35 @@
 			<Actor seed="16498"/>
 		</Entity>
 		<Entity uid="5613">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1859.11341" z="1067.07251"/>
 			<Orientation y="1.60654"/>
 			<Actor seed="21989"/>
 		</Entity>
 		<Entity uid="5614">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1852.89356" z="1079.62122"/>
 			<Orientation y="-1.64333"/>
 			<Actor seed="8400"/>
 		</Entity>
 		<Entity uid="5615">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1855.30237" z="1086.70264"/>
 			<Orientation y="-1.593"/>
 			<Actor seed="61680"/>
 		</Entity>
 		<Entity uid="5616">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1855.34449" z="1060.32117"/>
 			<Orientation y="-1.5698"/>
 			<Actor seed="47344"/>
 		</Entity>
 		<Entity uid="5617">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1877.45618" z="1061.90894"/>
 			<Orientation y="-1.53959"/>
@@ -26292,7 +26292,7 @@
 			<Actor seed="24787"/>
 		</Entity>
 		<Entity uid="5620">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1886.13721" z="1056.87842"/>
 			<Orientation y="2.35621"/>
@@ -26601,63 +26601,63 @@
 			<Actor seed="6626"/>
 		</Entity>
 		<Entity uid="5670">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1861.47681" z="784.42164"/>
 			<Orientation y="-0.54014"/>
 			<Actor seed="16121"/>
 		</Entity>
 		<Entity uid="5671">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1854.4983" z="785.02112"/>
 			<Orientation y="-0.05571"/>
 			<Actor seed="8786"/>
 		</Entity>
 		<Entity uid="5672">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1824.4596" z="799.9018"/>
 			<Orientation y="1.53196"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="5673">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1827.45813" z="784.81495"/>
 			<Orientation y="0.55266"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="5674">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1843.03711" z="841.93091"/>
 			<Orientation y="1.67255"/>
 			<Actor seed="39152"/>
 		</Entity>
 		<Entity uid="5675">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1863.5796" z="830.30091"/>
 			<Orientation y="-0.0207"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="5676">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1861.7328" z="849.44092"/>
 			<Orientation y="-3.13593"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="5677">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1885.39881" z="828.36402"/>
 			<Orientation y="-1.6566"/>
 			<Actor seed="39979"/>
 		</Entity>
 		<Entity uid="5678">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1889.06458" z="824.159"/>
 			<Orientation y="-3.13714"/>
@@ -26772,42 +26772,42 @@
 			<Actor seed="57639"/>
 		</Entity>
 		<Entity uid="5697">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1841.64014" z="794.24207"/>
 			<Orientation y="-1.6286"/>
 			<Actor seed="60015"/>
 		</Entity>
 		<Entity uid="5698">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1840.42408" z="806.57795"/>
 			<Orientation y="0.01438"/>
 			<Actor seed="3484"/>
 		</Entity>
 		<Entity uid="5699">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1863.38453" z="813.29157"/>
 			<Orientation y="3.08185"/>
 			<Actor seed="48203"/>
 		</Entity>
 		<Entity uid="5700">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1877.17566" z="840.7547"/>
 			<Orientation y="1.65409"/>
 			<Actor seed="23520"/>
 		</Entity>
 		<Entity uid="5701">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1873.17273" z="841.06928"/>
 			<Orientation y="-1.52343"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="5702">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1875.32337" z="836.00397"/>
 			<Orientation y="-3.12565"/>
@@ -27053,42 +27053,42 @@
 			<Actor seed="1461"/>
 		</Entity>
 		<Entity uid="5740">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1809.34375" z="850.69965"/>
 			<Orientation y="0.91243"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="5741">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1809.04432" z="856.3006"/>
 			<Orientation y="1.48813"/>
 			<Actor seed="49248"/>
 		</Entity>
 		<Entity uid="5742">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1809.09791" z="863.45746"/>
 			<Orientation y="2.00582"/>
 			<Actor seed="32402"/>
 		</Entity>
 		<Entity uid="5743">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1813.0088" z="867.99738"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39633"/>
 		</Entity>
 		<Entity uid="5744">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1826.06995" z="871.86982"/>
 			<Orientation y="3.16631"/>
 			<Actor seed="35376"/>
 		</Entity>
 		<Entity uid="5745">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1834.98292" z="871.82697"/>
 			<Orientation y="3.09032"/>
@@ -28523,14 +28523,14 @@
 			<Actor seed="1461"/>
 		</Entity>
 		<Entity uid="5998">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="955.5644" z="1089.79664"/>
 			<Orientation y="10.2058"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="5999">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="948.95966" z="1083.24952"/>
 			<Orientation y="10.2058"/>
@@ -28544,21 +28544,21 @@
 			<Actor seed="1461"/>
 		</Entity>
 		<Entity uid="6001">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1006.63697" z="1039.22046"/>
 			<Orientation y="3.90207"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6002">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="993.81379" z="1025.60376"/>
 			<Orientation y="3.90207"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6003">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1000.16822" z="1032.53943"/>
 			<Orientation y="3.90207"/>
@@ -28573,7 +28573,7 @@
 			<Actor seed="1461"/>
 		</Entity>
 		<Entity uid="6005">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="987.34473" z="1018.92237"/>
 			<Orientation y="3.90207"/>
@@ -28589,70 +28589,70 @@
 			<Actor seed="1461"/>
 		</Entity>
 		<Entity uid="6007">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1010.11725" z="1042.74085"/>
 			<Orientation y="3.90207"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6008">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1016.58637" z="1049.42237"/>
 			<Orientation y="3.90207"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6009">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1015.88172" z="1056.21924"/>
 			<Orientation y="2.34371"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6010">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1009.28107" z="1062.77088"/>
 			<Orientation y="2.34371"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6011">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1004.46448" z="1045.06434"/>
 			<Orientation y="2.34371"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6012">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="997.86426" z="1051.61597"/>
 			<Orientation y="2.34371"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6013">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="997.80115" z="1066.93946"/>
 			<Orientation y="0.79125"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6014">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="991.1297" z="1060.46033"/>
 			<Orientation y="0.79125"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6015">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="992.16321" z="1057.35462"/>
 			<Orientation y="2.34371"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6016">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1003.3224" z="1068.68458"/>
 			<Orientation y="2.34371"/>
@@ -28791,98 +28791,98 @@
 			<Actor seed="14630"/>
 		</Entity>
 		<Entity uid="6039">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="959.5763" z="1067.7096"/>
 			<Orientation y="-0.59075"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6040">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="964.88251" z="1072.34046"/>
 			<Orientation y="-0.59075"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6041">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="949.89722" z="1066.49134"/>
 			<Orientation y="-0.76124"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6042">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="943.48035" z="1073.25232"/>
 			<Orientation y="-0.76125"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6043">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="937.15558" z="1079.98731"/>
 			<Orientation y="-0.76125"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6062">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1103.03687" z="980.16047"/>
 			<Orientation y="2.32515"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6063">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1091.87855" z="966.28803"/>
 			<Orientation y="2.35236"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6066">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1098.1858" z="960.00593"/>
 			<Orientation y="2.35238"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6067">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1109.12586" z="974.0652"/>
 			<Orientation y="2.32515"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6094">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1093.53455" z="977.25715"/>
 			<Orientation y="-2.36623"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6097">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1115.01258" z="968.29773"/>
 			<Orientation y="2.34266"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6098">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1103.3672" z="954.63074"/>
 			<Orientation y="2.35238"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6099">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1108.8158" z="948.8459"/>
 			<Orientation y="2.35238"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6100">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1119.30774" z="964.19001"/>
 			<Orientation y="2.35238"/>
@@ -29698,231 +29698,231 @@
 			<Actor seed="13931"/>
 		</Entity>
 		<Entity uid="6409">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1090.24183" z="973.7978"/>
 			<Orientation y="-2.36623"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6410">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1096.70911" z="980.62708"/>
 			<Orientation y="-2.36623"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6495">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1115.31067" z="948.51612"/>
 			<Orientation y="-2.36353"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6496">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1118.6128" z="951.96656"/>
 			<Orientation y="-2.36353"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6497">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1121.7964" z="955.32789"/>
 			<Orientation y="-2.36353"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6498">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1121.75281" z="961.50007"/>
 			<Orientation y="2.35238"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="6499">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1179.18396" z="959.24793"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6500">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1172.61963" z="965.86792"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6501">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1159.70472" z="979.1886"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6503">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1153.79737" z="985.17359"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6504">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1111.02662" z="892.37342"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6505">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1104.46229" z="898.99341"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6506">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1091.54737" z="912.3141"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6507">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1098.02161" z="905.63782"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6508">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1085.64002" z="918.29908"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6515">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1187.3567" z="945.28998"/>
 			<Orientation y="-2.652"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6519">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1185.87171" z="952.59748"/>
 			<Orientation y="2.35576"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6520">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1115.03724" z="888.4112"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6521">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1093.31507" z="926.14441"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6522">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1103.67066" z="915.72168"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6523">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1099.22242" z="920.15943"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6524">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1147.90906" z="979.66871"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6526">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1153.81641" z="973.68372"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6527">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1170.6875" z="956.0235"/>
 			<Orientation y="2.36202"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6529">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1176.5995" z="950.04303"/>
 			<Orientation y="2.36202"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6539">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1149.02503" z="919.05365"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6540">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1161.53455" z="931.58844"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6541">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1154.9375" z="925.03345"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6542">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1145.09681" z="914.8816"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6543">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1132.66272" z="902.27515"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6545">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1138.57544" z="908.25489"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6546">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1128.73475" z="898.10315"/>
 			<Orientation y="-5.5034"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="6547">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1120.57007" z="898.79401"/>
 			<Orientation y="2.36278"/>
@@ -30606,28 +30606,28 @@
 			<Actor seed="3944"/>
 		</Entity>
 		<Entity uid="6664">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1375.09144" z="1240.6753"/>
 			<Orientation y="0.8078"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="6665">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1375.24952" z="1247.09937"/>
 			<Orientation y="2.3708"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="6666">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1368.68702" z="1247.18592"/>
 			<Orientation y="0.8078"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="6667">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1368.47278" z="1240.87452"/>
 			<Orientation y="2.3749"/>
@@ -35334,21 +35334,21 @@
 			<Actor seed="41669"/>
 		</Entity>
 		<Entity uid="8934">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1662.70398" z="277.88032"/>
 			<Orientation y="-0.05945"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8935">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1691.33838" z="280.37055"/>
 			<Orientation y="-0.05945"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8936">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1632.3274" z="275.7085"/>
 			<Orientation y="-0.05945"/>
@@ -35362,21 +35362,21 @@
 			<Actor seed="31967"/>
 		</Entity>
 		<Entity uid="8938">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1607.57947" z="253.3006"/>
 			<Orientation y="-0.05945"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8939">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1578.22254" z="251.50416"/>
 			<Orientation y="-0.05945"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8940">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1548.49927" z="249.2443"/>
 			<Orientation y="-0.05945"/>
@@ -35481,21 +35481,21 @@
 			<Actor seed="26582"/>
 		</Entity>
 		<Entity uid="8955">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1542.43177" z="403.60837"/>
 			<Orientation y="-0.00628"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8956">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1572.23304" z="404.28516"/>
 			<Orientation y="-0.00628"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8957">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1601.64405" z="404.51862"/>
 			<Orientation y="-0.00628"/>
@@ -35509,21 +35509,21 @@
 			<Actor seed="31967"/>
 		</Entity>
 		<Entity uid="8959">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1627.54798" z="425.57938"/>
 			<Orientation y="-0.00628"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8960">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1686.7234" z="427.09818"/>
 			<Orientation y="-0.00628"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8961">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1657.99708" z="426.13349"/>
 			<Orientation y="-0.00628"/>
@@ -35614,70 +35614,70 @@
 			<Actor seed="33664"/>
 		</Entity>
 		<Entity uid="8974">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1515.16944" z="378.47214"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8975">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1486.6006" z="377.93592"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8976">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1514.0951" z="407.94513"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8977">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1483.06946" z="405.79963"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8978">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1488.76417" z="432.98371"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8979">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1525.73646" z="534.94672"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8980">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1526.05201" z="562.78321"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8981">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1551.93152" z="563.27863"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8982">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1578.50684" z="563.56629"/>
 			<Orientation y="-0.0063"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="8984">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1580.87159" z="536.07227"/>
 			<Orientation y="-0.0063"/>
@@ -35789,70 +35789,70 @@
 			<Actor seed="18315"/>
 		</Entity>
 		<Entity uid="9001">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1778.94483" z="557.8683"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9002">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1766.77845" z="568.64698"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9003">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1632.19544" z="740.59827"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9004">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1605.73841" z="741.09174"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9005">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1581.76417" z="741.44275"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9006">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1584.53602" z="713.43592"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9007">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1584.87452" z="684.80176"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9008">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1558.85084" z="683.88593"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9009">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1533.45838" z="684.35254"/>
 			<Orientation y="-0.00631"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9010">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1683.12342" z="682.47736"/>
 			<Orientation y="-0.00631"/>
@@ -35992,42 +35992,42 @@
 			<Actor seed="40171"/>
 		</Entity>
 		<Entity uid="9030">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1504.78675" z="685.82496"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9031">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1521.01868" z="660.8307"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9032">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1504.05677" z="660.99921"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9033">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1475.21094" z="721.52051"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9034">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1474.89075" z="693.44867"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9035">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1477.73365" z="663.2212"/>
 			<Orientation y="-0.00632"/>
@@ -36742,28 +36742,28 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="9150">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1528.641" z="851.00373"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9164">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1666.64625" z="870.51142"/>
 			<Orientation y="3.1166"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9165">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1670.05311" z="840.3423"/>
 			<Orientation y="3.1166"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9168">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1640.0199" z="847.40638"/>
 			<Orientation y="3.1166"/>
@@ -36798,7 +36798,7 @@
 			<Actor seed="55236"/>
 		</Entity>
 		<Entity uid="9176">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1611.32581" z="848.34308"/>
 			<Orientation y="3.1166"/>
@@ -36875,21 +36875,21 @@
 			<Actor seed="40171"/>
 		</Entity>
 		<Entity uid="9190">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1682.44971" z="882.5323"/>
 			<Orientation y="3.11661"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9191">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1761.81775" z="802.4958"/>
 			<Orientation y="3.11661"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9192">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1762.54676" z="780.64277"/>
 			<Orientation y="3.11661"/>
@@ -37250,7 +37250,7 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="9252">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1780.56543" z="645.47242"/>
 			<Orientation y="-0.00632"/>
@@ -37264,14 +37264,14 @@
 			<Actor seed="43934"/>
 		</Entity>
 		<Entity uid="9254">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1763.35389" z="668.91651"/>
 			<Orientation y="-0.00632"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="9255">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1756.69703" z="693.27778"/>
 			<Orientation y="-0.00632"/>
@@ -39806,49 +39806,49 @@
 			<Actor seed="16515"/>
 		</Entity>
 		<Entity uid="9653">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1537.69703" z="326.39313"/>
 			<Orientation y="1.67133"/>
 			<Actor seed="23236"/>
 		</Entity>
 		<Entity uid="9654">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1557.39063" z="324.29108"/>
 			<Orientation y="1.55286"/>
 			<Actor seed="29134"/>
 		</Entity>
 		<Entity uid="9655">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1566.63233" z="360.97312"/>
 			<Orientation y="1.46021"/>
 			<Actor seed="57716"/>
 		</Entity>
 		<Entity uid="9656">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1622.39844" z="359.97959"/>
 			<Orientation y="1.45803"/>
 			<Actor seed="26215"/>
 		</Entity>
 		<Entity uid="9657">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1619.47059" z="325.8284"/>
 			<Orientation y="1.68409"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9658">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1630.94813" z="324.59067"/>
 			<Orientation y="1.6841"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9659">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1644.08313" z="325.15104"/>
 			<Orientation y="1.55088"/>
@@ -39946,70 +39946,70 @@
 			<Actor seed="27036"/>
 		</Entity>
 		<Entity uid="9673">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1494.47486" z="206.14353"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50999"/>
 		</Entity>
 		<Entity uid="9674">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1504.35084" z="217.6854"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39534"/>
 		</Entity>
 		<Entity uid="9675">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1526.24354" z="195.8979"/>
 			<Orientation y="0.82863"/>
 			<Actor seed="12973"/>
 		</Entity>
 		<Entity uid="9676">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1508.26038" z="228.67151"/>
 			<Orientation y="0.79337"/>
 			<Actor seed="9783"/>
 		</Entity>
 		<Entity uid="9677">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1445.26429" z="193.52381"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3784"/>
 		</Entity>
 		<Entity uid="9678">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1455.9004" z="219.081"/>
 			<Orientation y="0.80796"/>
 			<Actor seed="43269"/>
 		</Entity>
 		<Entity uid="9679">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1464.58936" z="211.02823"/>
 			<Orientation y="0.75731"/>
 			<Actor seed="26105"/>
 		</Entity>
 		<Entity uid="9680">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1465.91895" z="243.9167"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58956"/>
 		</Entity>
 		<Entity uid="9681">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1461.4292" z="240.39173"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45852"/>
 		</Entity>
 		<Entity uid="9682">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1481.19117" z="170.61487"/>
 			<Orientation y="2.35621"/>
@@ -40992,21 +40992,21 @@
 			<Actor seed="34756"/>
 		</Entity>
 		<Entity uid="9829">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1682.30201" z="474.5074"/>
 			<Orientation y="1.50878"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9830">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1669.20215" z="473.39481"/>
 			<Orientation y="1.642"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9831">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1657.68274" z="474.14847"/>
 			<Orientation y="1.642"/>
@@ -41062,63 +41062,63 @@
 			<Actor seed="34756"/>
 		</Entity>
 		<Entity uid="9839">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1639.93201" z="474.74854"/>
 			<Orientation y="1.55088"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9840">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1626.797" z="474.18818"/>
 			<Orientation y="1.6841"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9841">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1615.31946" z="475.42591"/>
 			<Orientation y="1.6841"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9842">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1591.25721" z="477.81305"/>
 			<Orientation y="1.6841"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9843">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1602.73475" z="476.57532"/>
 			<Orientation y="1.6841"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9844">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1706.34437" z="432.5453"/>
 			<Orientation y="3.25864"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9845">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1705.06385" z="421.07251"/>
 			<Orientation y="3.25864"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9846">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1744.20398" z="437.87732"/>
 			<Orientation y="3.21444"/>
 			<Actor seed="20235"/>
 		</Entity>
 		<Entity uid="9847">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1743.43177" z="426.35914"/>
 			<Orientation y="3.21444"/>
@@ -43018,42 +43018,42 @@
 			<Actor seed="31405"/>
 		</Entity>
 		<Entity uid="10131">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1537.81128" z="606.24988"/>
 			<Orientation y="-0.02483"/>
 			<Actor seed="16961"/>
 		</Entity>
 		<Entity uid="10132">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1525.32605" z="607.25147"/>
 			<Orientation y="-0.01407"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="10133">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1530.60364" z="621.59284"/>
 			<Orientation y="2.99813"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="10134">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1543.73865" z="620.60413"/>
 			<Orientation y="3.12983"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="10135">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1548.00684" z="606.86762"/>
 			<Orientation y="0.04354"/>
 			<Actor seed="24746"/>
 		</Entity>
 		<Entity uid="10136">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1560.5199" z="582.3797"/>
 			<Orientation y="1.414"/>
@@ -43738,98 +43738,98 @@
 			<Actor seed="56788"/>
 		</Entity>
 		<Entity uid="10250">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1456.30225" z="541.22413"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10251">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1449.65882" z="547.44788"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10252">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1445.66968" z="551.1493"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10253">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1437.67566" z="557.77741"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10254">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1431.13538" z="564.1407"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10255">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1427.46302" z="573.95313"/>
 			<Orientation y="-3.1006"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10256">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1427.95655" z="585.94318"/>
 			<Orientation y="-3.10061"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10257">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1427.66846" z="597.32502"/>
 			<Orientation y="-3.10061"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10258">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1427.73572" z="609.53443"/>
 			<Orientation y="-3.10061"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10259">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1473.92627" z="574.99762"/>
 			<Orientation y="-3.10062"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10260">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1473.65357" z="539.41633"/>
 			<Orientation y="-3.10061"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10261">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1474.1471" z="551.40638"/>
 			<Orientation y="-3.10062"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10262">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1473.85901" z="562.78821"/>
 			<Orientation y="-3.10062"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10263">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1464.54615" z="535.34235"/>
 			<Orientation y="1.70318"/>
@@ -43964,42 +43964,42 @@
 			<Actor seed="13073"/>
 		</Entity>
 		<Entity uid="10283">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1468.34058" z="582.43573"/>
 			<Orientation y="1.7032"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10284">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1459.13404" z="583.75068"/>
 			<Orientation y="1.7032"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10285">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1454.17444" z="589.59296"/>
 			<Orientation y="6.39496"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10286">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1449.74756" z="598.70173"/>
 			<Orientation y="2.13918"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10287">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1439.95447" z="604.61414"/>
 			<Orientation y="2.13918"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="10288">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1432.39515" z="609.59278"/>
 			<Orientation y="2.13918"/>
@@ -47755,14 +47755,14 @@
 			<Actor seed="39132"/>
 		</Entity>
 		<Entity uid="10854">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1729.21937" z="962.58832"/>
 			<Orientation y="-0.03637"/>
 			<Actor seed="65123"/>
 		</Entity>
 		<Entity uid="10855">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1732.93006" z="948.64222"/>
 			<Orientation y="3.09307"/>
@@ -47940,126 +47940,126 @@
 			<Actor seed="56992"/>
 		</Entity>
 		<Entity uid="10902">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1505.70386" z="943.09778"/>
 			<Orientation y="1.58976"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10903">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1515.03736" z="942.94898"/>
 			<Orientation y="1.58976"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10908">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1594.01661" z="866.86542"/>
 			<Orientation y="1.58977"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10915">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1572.0149" z="942.76484"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10916">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1584.6792" z="866.33082"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10917">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1499.4109" z="943.33814"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10918">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1646.79554" z="943.02845"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10919">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1658.64502" z="942.75599"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10920">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1543.65882" z="968.09357"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10921">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1534.33606" z="968.09913"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10922">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1525.0829" z="968.20978"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10923">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1515.76014" z="968.21534"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10924">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1506.42542" z="968.21485"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10925">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1500.1294" z="968.35456"/>
 			<Orientation y="1.56295"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10926">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1553.26966" z="968.52192"/>
 			<Orientation y="1.56295"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10927">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1565.46033" z="968.80347"/>
 			<Orientation y="1.56295"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10928">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1589.4745" z="969.6189"/>
 			<Orientation y="1.56295"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10929">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1601.61561" z="969.90467"/>
 			<Orientation y="1.56295"/>
@@ -48284,91 +48284,91 @@
 			<Actor seed="32469"/>
 		</Entity>
 		<Entity uid="10965">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1501.14246" z="991.3202"/>
 			<Orientation y="3.02935"/>
 			<Actor seed="19532"/>
 		</Entity>
 		<Entity uid="10966">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1513.13697" z="978.10523"/>
 			<Orientation y="-1.59433"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="10967">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1512.78345" z="983.68378"/>
 			<Orientation y="-1.59433"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="10968">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1507.40528" z="1002.49897"/>
 			<Orientation y="2.32767"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="10969">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1519.14759" z="990.49872"/>
 			<Orientation y="-0.02929"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="10970">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1530.32435" z="997.84772"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="10971">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1542.32471" z="998.222"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="10972">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1563.0005" z="1061.3097"/>
 			<Orientation y="1.63872"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10973">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1544.08924" z="1062.32117"/>
 			<Orientation y="1.64956"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10974">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1553.3849" z="1061.61"/>
 			<Orientation y="1.64956"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10975">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1590.52002" z="1052.46717"/>
 			<Orientation y="6.38875"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10976">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1588.79761" z="1033.60743"/>
 			<Orientation y="6.3996"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="10977">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1589.85804" z="1042.86976"/>
 			<Orientation y="6.3996"/>
@@ -48533,63 +48533,63 @@
 			<Actor seed="34378"/>
 		</Entity>
 		<Entity uid="11005">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1712.86255" z="985.20087"/>
 			<Orientation y="-3.17664"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="11006">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1712.76282" z="991.49762"/>
 			<Orientation y="-3.18747"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="11007">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1713.2179" z="975.873"/>
 			<Orientation y="-3.17664"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="11008">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1602.51355" z="1003.22034"/>
 			<Orientation y="1.58977"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="11009">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1596.22059" z="1003.4607"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="11010">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1611.84705" z="1003.07154"/>
 			<Orientation y="1.58977"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="11011">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1650.98365" z="1003.28614"/>
 			<Orientation y="1.58977"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="11012">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1644.69068" z="1003.5265"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="11013">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1660.31714" z="1003.13733"/>
 			<Orientation y="1.58977"/>
@@ -48656,77 +48656,77 @@
 			<Actor seed="24873"/>
 		</Entity>
 		<Entity uid="11024">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1511.30762" z="1046.6537"/>
 			<Orientation y="0.54738"/>
 			<Actor seed="6134"/>
 		</Entity>
 		<Entity uid="11025">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1568.8069" z="1044.82215"/>
 			<Orientation y="-3.08754"/>
 			<Actor seed="15940"/>
 		</Entity>
 		<Entity uid="11026">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1695.82593" z="972.1949"/>
 			<Orientation y="-1.57882"/>
 			<Actor seed="22557"/>
 		</Entity>
 		<Entity uid="11027">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1667.76441" z="973.12842"/>
 			<Orientation y="1.44393"/>
 			<Actor seed="51542"/>
 		</Entity>
 		<Entity uid="11028">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1673.46668" z="998.29969"/>
 			<Orientation y="-1.5309"/>
 			<Actor seed="35563"/>
 		</Entity>
 		<Entity uid="11029">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1655.08631" z="994.43244"/>
 			<Orientation y="-4.68866"/>
 			<Actor seed="35563"/>
 		</Entity>
 		<Entity uid="11030">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1582.95264" z="985.20496"/>
 			<Orientation y="0.01063"/>
 			<Actor seed="35563"/>
 		</Entity>
 		<Entity uid="11031">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1530.9651" z="1013.64032"/>
 			<Orientation y="2.40615"/>
 			<Actor seed="34497"/>
 		</Entity>
 		<Entity uid="11032">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1531.76941" z="1030.3141"/>
 			<Orientation y="0.86071"/>
 			<Actor seed="34497"/>
 		</Entity>
 		<Entity uid="11033">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1548.46717" z="1028.93885"/>
 			<Orientation y="5.56127"/>
 			<Actor seed="34497"/>
 		</Entity>
 		<Entity uid="11034">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1548.80994" z="1011.24085"/>
 			<Orientation y="0.86071"/>
@@ -50296,203 +50296,203 @@
 			<Actor seed="33086"/>
 		</Entity>
 		<Entity uid="11265">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1688.04798" z="1375.73108"/>
 			<Orientation y="0.0171"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11266">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1663.11133" z="1375.24659"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11267">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1641.72864" z="1380.60157"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11268">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1619.92847" z="1384.83765"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11269">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1593.96436" z="1386.5503"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11270">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1568.29725" z="1387.79017"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11271">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1592.7483" z="1438.93445"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11272">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1612.1349" z="1436.07618"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11273">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1609.83216" z="1607.81873"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11274">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1631.28858" z="1603.98536"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11275">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1586.41663" z="1681.3573"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11276">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1610.6277" z="1659.06531"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11277">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1631.17591" z="1656.72608"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11278">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1650.2765" z="1656.0713"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11279">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1666.3578" z="1654.693"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11280">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1662.93824" z="1685.9668"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11281">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1640.64588" z="1684.49988"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11282">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1612.073" z="1689.65662"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11283">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1616.20582" z="1711.49805"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11284">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1640.68946" z="1243.91114"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11285">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1618.79126" z="1243.97767"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11286">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1578.27369" z="1210.00293"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11287">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1602.2682" z="1214.61854"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11288">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1627.2881" z="1213.20777"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11289">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1639.07862" z="1213.81775"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11290">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1603.46778" z="1046.34803"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11291">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1631.43763" z="1046.82178"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11292">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1657.07642" z="1045.92054"/>
 			<Orientation y="0.01711"/>
 			<Actor seed="37184"/>
 		</Entity>
 		<Entity uid="11293">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="1670.57508" z="1045.81263"/>
 			<Orientation y="0.01711"/>
@@ -52508,42 +52508,42 @@
 			<Actor seed="39870"/>
 		</Entity>
 		<Entity uid="11585">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1491.33484" z="1665.3191"/>
 			<Orientation y="6.91434"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11586">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1496.77784" z="1672.55115"/>
 			<Orientation y="6.91434"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11587">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1503.29297" z="1681.95398"/>
 			<Orientation y="6.91434"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11588">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1512.66163" z="1685.80079"/>
 			<Orientation y="11.17013"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11589">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1518.8036" z="1690.38416"/>
 			<Orientation y="6.47837"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11590">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1520.69349" z="1699.49"/>
 			<Orientation y="6.47837"/>
@@ -52602,42 +52602,42 @@
 			<Actor seed="64661"/>
 		</Entity>
 		<Entity uid="11599">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1528.4673" z="1704.59803"/>
 			<Orientation y="1.67455"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11600">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1491.10071" z="1660.66517"/>
 			<Orientation y="1.67455"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11601">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1503.28187" z="1659.83216"/>
 			<Orientation y="1.67455"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11602">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1514.65931" z="1659.40564"/>
 			<Orientation y="1.67455"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11603">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1526.59473" z="1658.16077"/>
 			<Orientation y="1.67457"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="11604">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1536.6183" z="1661.21033"/>
 			<Orientation y="7.13138"/>
@@ -52968,35 +52968,35 @@
 			<Actor seed="63054"/>
 		</Entity>
 		<Entity uid="11659">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1501.30762" z="1780.53211"/>
 			<Orientation y="4.8187"/>
 			<Actor seed="24746"/>
 		</Entity>
 		<Entity uid="11660">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1487.33033" z="1777.13404"/>
 			<Orientation y="7.905"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="11661">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1485.51954" z="1764.08704"/>
 			<Orientation y="7.7733"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="11662">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1499.5016" z="1757.92005"/>
 			<Orientation y="4.7611"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="11663">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1501.28455" z="1770.31788"/>
 			<Orientation y="4.75034"/>
@@ -55679,42 +55679,42 @@
 			<Actor seed="22155"/>
 		</Entity>
 		<Entity uid="12082">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1563.64307" z="1285.67676"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12083">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1579.26954" z="1285.2876"/>
 			<Orientation y="1.58977"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12084">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1569.93604" z="1285.43641"/>
 			<Orientation y="1.58977"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12085">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1573.7417" z="1337.33643"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12086">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1589.37208" z="1337.16895"/>
 			<Orientation y="1.5756"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12087">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1580.03748" z="1337.18531"/>
 			<Orientation y="1.5756"/>
@@ -56265,490 +56265,490 @@
 			<Actor seed="20538"/>
 		</Entity>
 		<Entity uid="12171">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1752.7953" z="1433.43567"/>
 			<Orientation y="0.00553"/>
 			<Actor seed="24209"/>
 		</Entity>
 		<Entity uid="12172">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1752.60572" z="1445.78333"/>
 			<Orientation y="0.00553"/>
 			<Actor seed="24209"/>
 		</Entity>
 		<Entity uid="12174">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1752.46485" z="1476.38086"/>
 			<Orientation y="0.00553"/>
 			<Actor seed="24209"/>
 		</Entity>
 		<Entity uid="12175">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1729.91602" z="1457.3263"/>
 			<Orientation y="3.09615"/>
 			<Actor seed="33719"/>
 		</Entity>
 		<Entity uid="12176">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1731.98438" z="1461.41688"/>
 			<Orientation y="6.2383"/>
 			<Actor seed="33719"/>
 		</Entity>
 		<Entity uid="12177">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1603.0525" z="1454.74695"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12178">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1593.7179" z="1454.76331"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12179">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1587.42212" z="1454.91443"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12180">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1629.56482" z="1452.58802"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12181">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1620.23023" z="1452.60438"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12182">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1613.93445" z="1452.7555"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12183">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1626.20154" z="1471.65455"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12184">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1616.86695" z="1471.6709"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12185">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1610.57117" z="1471.82203"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12186">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1653.46143" z="1471.90833"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12187">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1644.12684" z="1471.92469"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12188">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1637.83106" z="1472.07581"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12189">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1676.25123" z="1472.43641"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12190">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1666.91663" z="1472.45276"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12191">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1660.62085" z="1472.60389"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12192">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1657.22278" z="1453.4701"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12193">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1647.88819" z="1453.48646"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12194">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1641.59241" z="1453.63758"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12195">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1694.93433" z="1449.771"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12196">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1685.59974" z="1449.78736"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12197">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1679.30396" z="1449.93848"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12198">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1580.41102" z="1472.21265"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12199">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1571.07642" z="1472.22901"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12200">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1564.78064" z="1472.38013"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12201">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1570.79139" z="1449.84534"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12202">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1561.4568" z="1449.8617"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12203">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1555.16102" z="1450.01282"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12204">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1543.94617" z="1449.86219"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12205">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1534.61158" z="1449.87855"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12206">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1528.3158" z="1450.02967"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12207">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1554.27063" z="1472.45301"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12208">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1544.93604" z="1472.46937"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12209">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1538.64026" z="1472.62049"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12210">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1811.01832" z="1382.1709"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12211">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1801.68372" z="1382.18726"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12212">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1795.38794" z="1382.33838"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12213">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1784.65418" z="1382.83143"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12214">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1775.31959" z="1382.84778"/>
 			<Orientation y="1.57561"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12215">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1769.02381" z="1382.99891"/>
 			<Orientation y="1.56476"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12216">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1760.9242" z="1387.62855"/>
 			<Orientation y="2.7478"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12217">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1757.31617" z="1396.23768"/>
 			<Orientation y="2.7478"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12218">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1755.01185" z="1402.09852"/>
 			<Orientation y="2.73694"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12219">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1836.77784" z="1397.3473"/>
 			<Orientation y="0.88918"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12220">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1829.54712" z="1391.44385"/>
 			<Orientation y="0.88918"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12221">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1824.58155" z="1387.57068"/>
 			<Orientation y="0.87833"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12222">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1845.43494" z="1422.36097"/>
 			<Orientation y="0.21563"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12223">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1843.4657" z="1413.23646"/>
 			<Orientation y="0.21563"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12224">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1842.00062" z="1407.1117"/>
 			<Orientation y="0.20478"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12225">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1849.55042" z="1445.49256"/>
 			<Orientation y="0.21564"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12226">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1847.58118" z="1436.36805"/>
 			<Orientation y="0.21564"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12227">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1846.1161" z="1430.2433"/>
 			<Orientation y="0.20478"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12228">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1855.02686" z="1470.10425"/>
 			<Orientation y="0.21564"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12229">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1825.32227" z="1473.271"/>
 			<Orientation y="0.17174"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12231">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1757.14063" z="1503.47144"/>
 			<Orientation y="0.21564"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12232">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1755.1714" z="1494.34693"/>
 			<Orientation y="0.21564"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12233">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1753.7063" z="1488.22217"/>
 			<Orientation y="0.20478"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12234">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1759.7002" z="1528.48523"/>
 			<Orientation y="0.08103"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12235">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1758.9734" z="1519.17896"/>
 			<Orientation y="0.08103"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12236">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1758.34351" z="1512.91297"/>
 			<Orientation y="0.07016"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12237">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1761.66956" z="1554.31617"/>
 			<Orientation y="0.08103"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12238">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1760.94275" z="1545.0099"/>
 			<Orientation y="0.08103"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12239">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1760.31287" z="1538.7439"/>
 			<Orientation y="0.07016"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12240">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1781.73243" z="1569.46021"/>
 			<Orientation y="1.07134"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12241">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1773.55188" z="1564.96412"/>
 			<Orientation y="1.07134"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12242">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1767.9668" z="1562.05445"/>
 			<Orientation y="1.06048"/>
@@ -57342,7 +57342,7 @@
 			<Actor seed="51973"/>
 		</Entity>
 		<Entity uid="12335">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1815.19666" z="1441.05652"/>
 			<Orientation y="1.58677"/>
@@ -57355,14 +57355,14 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="12337">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1815.0647" z="1431.9386"/>
 			<Orientation y="1.58677"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="12338">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1809.52491" z="1436.547"/>
 			<Orientation y="0.02378"/>
@@ -57513,14 +57513,14 @@
 			<Actor seed="41886"/>
 		</Entity>
 		<Entity uid="12363">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1820.78187" z="1436.44007"/>
 			<Orientation y="0.02378"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="12364">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1781.52356" z="1493.85657"/>
 			<Orientation y="1.58678"/>
@@ -57533,14 +57533,14 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="12366">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1781.39161" z="1484.73865"/>
 			<Orientation y="1.58678"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="12367">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1775.85181" z="1489.34705"/>
 			<Orientation y="0.02378"/>
@@ -57691,7 +57691,7 @@
 			<Actor seed="41886"/>
 		</Entity>
 		<Entity uid="12392">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1787.10877" z="1489.24012"/>
 			<Orientation y="0.02378"/>
@@ -59238,7 +59238,7 @@
 			<Actor seed="42992"/>
 		</Entity>
 		<Entity uid="12620">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1740.72156" z="931.87903"/>
 			<Orientation y="-1.58713"/>
@@ -59267,14 +59267,14 @@
 			<Actor seed="6871"/>
 		</Entity>
 		<Entity uid="12624">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1789.81971" z="917.94312"/>
 			<Orientation y="0.02538"/>
 			<Actor seed="25327"/>
 		</Entity>
 		<Entity uid="12625">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1800.82837" z="928.42933"/>
 			<Orientation y="-0.02634"/>
@@ -59282,7 +59282,7 @@
 			<Actor seed="41420"/>
 		</Entity>
 		<Entity uid="12626">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1754.82386" z="897.33301"/>
 			<Orientation y="0.89472"/>
@@ -59463,49 +59463,49 @@
 			<Actor seed="51809"/>
 		</Entity>
 		<Entity uid="12656">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1582.3246" z="917.8512"/>
 			<Orientation y="1.58365"/>
 			<Actor seed="45852"/>
 		</Entity>
 		<Entity uid="12657">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1583.07935" z="923.50928"/>
 			<Orientation y="1.58365"/>
 			<Actor seed="58956"/>
 		</Entity>
 		<Entity uid="12658">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1605.08277" z="899.02924"/>
 			<Orientation y="-0.01526"/>
 			<Actor seed="26105"/>
 		</Entity>
 		<Entity uid="12659">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1593.23975" z="898.73127"/>
 			<Orientation y="0.0354"/>
 			<Actor seed="43269"/>
 		</Entity>
 		<Entity uid="12660">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1624.04175" z="942.1454"/>
 			<Orientation y="0.0208"/>
 			<Actor seed="9783"/>
 		</Entity>
 		<Entity uid="12661">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1628.91004" z="931.54926"/>
 			<Orientation y="1.58365"/>
 			<Actor seed="39534"/>
 		</Entity>
 		<Entity uid="12662">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1629.89368" z="916.3907"/>
 			<Orientation y="1.58365"/>
@@ -59988,77 +59988,77 @@
 			<Actor seed="42453"/>
 		</Entity>
 		<Entity uid="12740">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1621.65748" z="863.43342"/>
 			<Orientation y="1.553"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12741">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1614.01307" z="862.87592"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12742">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1604.75281" z="862.78827"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12743">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1647.5348" z="864.52942"/>
 			<Orientation y="1.553"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12744">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1639.89039" z="863.97193"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12745">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1630.63013" z="863.88428"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12746">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1677.18726" z="898.54841"/>
 			<Orientation y="1.553"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="12747">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1669.54285" z="897.99091"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12748">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1660.2826" z="897.90326"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12750">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1650.85767" z="879.09833"/>
 			<Orientation y="6.2614"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="12751">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1651.08252" z="869.8404"/>
 			<Orientation y="6.2614"/>
@@ -66668,70 +66668,70 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="13811">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1422.27417" z="722.08088"/>
 			<Orientation y="-0.17615"/>
 			<Actor seed="12238"/>
 		</Entity>
 		<Entity uid="13812">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1409.97547" z="716.23804"/>
 			<Orientation y="-0.36466"/>
 			<Actor seed="18478"/>
 		</Entity>
 		<Entity uid="13813">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1438.52271" z="733.76661"/>
 			<Orientation y="3.13326"/>
 			<Actor seed="53762"/>
 		</Entity>
 		<Entity uid="13814">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1445.66651" z="745.72907"/>
 			<Orientation y="1.52562"/>
 			<Actor seed="59042"/>
 		</Entity>
 		<Entity uid="13815">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1454.4441" z="752.84241"/>
 			<Orientation y="-3.20202"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="13816">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1454.63526" z="746.54773"/>
 			<Orientation y="-3.19118"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="13817">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1458.93885" z="712.04285"/>
 			<Orientation y="-3.20203"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="13818">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1459.13001" z="705.74817"/>
 			<Orientation y="-3.19118"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="13819">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1458.99048" z="694.56305"/>
 			<Orientation y="-3.20203"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="13820">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1459.18165" z="688.26838"/>
 			<Orientation y="-3.19118"/>
@@ -66933,7 +66933,7 @@
 			<Actor seed="24308"/>
 		</Entity>
 		<Entity uid="13853">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1479.27295" z="997.22016"/>
 			<Orientation y="-4.68866"/>
@@ -66954,21 +66954,21 @@
 			<Actor seed="58021"/>
 		</Entity>
 		<Entity uid="13856">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1495.68519" z="918.6432"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="13857">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1484.50843" z="911.2942"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="13858">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1472.76612" z="923.29444"/>
 			<Orientation y="2.32767"/>
@@ -67101,7 +67101,7 @@
 			<Actor seed="52624"/>
 		</Entity>
 		<Entity uid="13882">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1470.77857" z="1067.6886"/>
 			<Orientation y="1.54734"/>
@@ -67115,7 +67115,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="13888">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1486.33448" z="1033.64783"/>
 			<Orientation y="2.30411"/>
@@ -67180,7 +67180,7 @@
 			<Actor seed="40256"/>
 		</Entity>
 		<Entity uid="13897">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1451.99048" z="901.58545"/>
 			<Orientation y="7.6044"/>
@@ -67209,7 +67209,7 @@
 			<Actor seed="40256"/>
 		</Entity>
 		<Entity uid="13901">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1496.72327" z="918.66108"/>
 			<Orientation y="4.68386"/>
@@ -67373,21 +67373,21 @@
 			<Actor seed="22512"/>
 		</Entity>
 		<Entity uid="13933">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1470.136" z="1029.55909"/>
 			<Orientation y="2.33838"/>
 			<Actor seed="40168"/>
 		</Entity>
 		<Entity uid="13934">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1475.8125" z="1002.00794"/>
 			<Orientation y="0.04764"/>
 			<Actor seed="45730"/>
 		</Entity>
 		<Entity uid="13936">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1439.09571" z="1007.7782"/>
 			<Orientation y="2.35621"/>
@@ -67395,7 +67395,7 @@
 			<Actor seed="40800"/>
 		</Entity>
 		<Entity uid="13937">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1427.41248" z="991.13929"/>
 			<Orientation y="1.1308"/>
@@ -67403,7 +67403,7 @@
 			<Actor seed="58736"/>
 		</Entity>
 		<Entity uid="13938">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1430.42103" z="986.14985"/>
 			<Orientation y="0.82258"/>
@@ -67411,7 +67411,7 @@
 			<Actor seed="2427"/>
 		</Entity>
 		<Entity uid="13941">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1464.28736" z="1001.64869"/>
 			<Orientation y="0.12784"/>
@@ -67625,7 +67625,7 @@
 			<Actor seed="28205"/>
 		</Entity>
 		<Entity uid="13978">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1383.3396" z="1071.67908"/>
 			<Orientation y="5.50225"/>
@@ -68740,14 +68740,14 @@
 			<Actor seed="37210"/>
 		</Entity>
 		<Entity uid="14168">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1373.48548" z="1103.24964"/>
 			<Orientation y="7.13074"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="14169">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1342.7234" z="1086.92188"/>
 			<Orientation y="7.11991"/>
@@ -69882,84 +69882,84 @@
 			<Actor seed="38784"/>
 		</Entity>
 		<Entity uid="14334">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1461.83558" z="1346.57667"/>
 			<Orientation y="-3.09195"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14335">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1462.15113" z="1355.73609"/>
 			<Orientation y="-3.09195"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14336">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1462.48853" z="1364.85914"/>
 			<Orientation y="-3.09195"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14337">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1462.818" z="1374.09375"/>
 			<Orientation y="-3.09195"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14338">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1463.2256" z="1383.57679"/>
 			<Orientation y="-3.0626"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14339">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1425.17383" z="1366.56641"/>
 			<Orientation y="-3.0791"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14340">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1424.71924" z="1357.4485"/>
 			<Orientation y="-3.0791"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14341">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1424.2859" z="1348.29383"/>
 			<Orientation y="-3.0791"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14342">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1456.40003" z="1341.93592"/>
 			<Orientation y="1.60785"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14343">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1447.23743" z="1342.13611"/>
 			<Orientation y="1.60785"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14344">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1438.11084" z="1342.35877"/>
 			<Orientation y="1.60785"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14345">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1428.87293" z="1342.5719"/>
 			<Orientation y="1.60785"/>
@@ -70350,14 +70350,14 @@
 			<Actor seed="52951"/>
 		</Entity>
 		<Entity uid="14398">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1331.79908" z="1425.44666"/>
 			<Orientation y="7.11991"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="14399">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1362.56116" z="1441.77442"/>
 			<Orientation y="7.13074"/>
@@ -70841,14 +70841,14 @@
 			<Actor seed="52951"/>
 		</Entity>
 		<Entity uid="14464">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1265.323" z="1461.80298"/>
 			<Orientation y="3.97284"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="14465">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1234.65076" z="1445.30726"/>
 			<Orientation y="3.98368"/>
@@ -70961,84 +70961,84 @@
 			<Actor seed="38784"/>
 		</Entity>
 		<Entity uid="14480">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1246.43042" z="1295.45752"/>
 			<Orientation y="3.8951"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14481">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1240.20301" z="1288.63074"/>
 			<Orientation y="3.8951"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14482">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1234.04163" z="1281.8943"/>
 			<Orientation y="3.8951"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14483">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1227.87342" z="1275.11585"/>
 			<Orientation y="3.8951"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14484">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1253.75794" z="1295.15906"/>
 			<Orientation y="-0.79186"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14485">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1260.3772" z="1288.82032"/>
 			<Orientation y="-0.79186"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14486">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1266.95496" z="1282.48975"/>
 			<Orientation y="-0.79186"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14487">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1254.7942" z="1242.62244"/>
 			<Orientation y="-0.77537"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14488">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1247.91028" z="1249.15735"/>
 			<Orientation y="-0.80471"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14489">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1241.16248" z="1255.47022"/>
 			<Orientation y="-0.80471"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14490">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1234.50391" z="1261.71595"/>
 			<Orientation y="-0.80471"/>
 			<Actor seed="32167"/>
 		</Entity>
 		<Entity uid="14491">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1227.8036" z="1267.969"/>
 			<Orientation y="-0.80471"/>
@@ -71108,7 +71108,7 @@
 			<Actor seed="35098"/>
 		</Entity>
 		<Entity uid="14501">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1339.29761" z="1344.136"/>
 			<Orientation y="7.10491"/>
@@ -71241,7 +71241,7 @@
 			<Actor seed="35098"/>
 		</Entity>
 		<Entity uid="14519">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1308.65247" z="1329.98731"/>
 			<Orientation y="8.70182"/>
@@ -72544,7 +72544,7 @@
 			<Actor seed="38784"/>
 		</Entity>
 		<Entity uid="14696">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1274.83716" z="1492.81214"/>
 			<Orientation y="2.34177"/>
@@ -72557,21 +72557,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14698">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1267.61622" z="1493.41492"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14699">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1268.49256" z="1486.26246"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14700">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1275.74097" z="1485.62256"/>
 			<Orientation y="0.77878"/>
@@ -72722,7 +72722,7 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14725">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1374.98084" z="1356.38575"/>
 			<Orientation y="2.34177"/>
@@ -72735,21 +72735,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14727">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1367.7599" z="1356.98853"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14728">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1368.63624" z="1349.83594"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14729">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1375.88465" z="1349.1963"/>
 			<Orientation y="0.77878"/>
@@ -72900,7 +72900,7 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14754">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1325.46033" z="1333.042"/>
 			<Orientation y="2.34177"/>
@@ -72913,21 +72913,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14756">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1318.23938" z="1333.64478"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14757">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1319.11573" z="1326.4922"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14758">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1326.36414" z="1325.85254"/>
 			<Orientation y="0.77878"/>
@@ -73078,7 +73078,7 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14783">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1431.97681" z="1333.40064"/>
 			<Orientation y="2.34177"/>
@@ -73091,21 +73091,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14785">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1424.75586" z="1334.00342"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14786">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1425.63221" z="1326.85084"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14787">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1432.88062" z="1326.21119"/>
 			<Orientation y="0.77878"/>
@@ -73256,7 +73256,7 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14812">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1435.22828" z="1189.86194"/>
 			<Orientation y="2.34177"/>
@@ -73269,21 +73269,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14814">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1428.00733" z="1190.46473"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14815">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1428.88367" z="1183.31226"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14816">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1436.13209" z="1182.67237"/>
 			<Orientation y="0.77878"/>
@@ -73434,7 +73434,7 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14841">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1414.72425" z="1156.77881"/>
 			<Orientation y="2.34177"/>
@@ -73447,21 +73447,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14843">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1407.5033" z="1157.3816"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14844">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1408.37964" z="1150.22901"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14845">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1415.62806" z="1149.58936"/>
 			<Orientation y="0.77878"/>
@@ -73612,7 +73612,7 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14870">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1322.38575" z="1130.60376"/>
 			<Orientation y="2.34177"/>
@@ -73625,21 +73625,21 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14872">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1315.1648" z="1131.20655"/>
 			<Orientation y="0.77878"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14873">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1316.04114" z="1124.05396"/>
 			<Orientation y="2.34177"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14874">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1323.28956" z="1123.41431"/>
 			<Orientation y="0.77878"/>
@@ -73790,14 +73790,14 @@
 			<Actor seed="42624"/>
 		</Entity>
 		<Entity uid="14899">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1237.06629" z="1525.10767"/>
 			<Orientation y="0.80781"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14900">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1230.44764" z="1525.3069"/>
 			<Orientation y="2.3749"/>
@@ -73822,7 +73822,7 @@
 			<Actor seed="24558"/>
 		</Entity>
 		<Entity uid="14904">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1237.22437" z="1531.53174"/>
 			<Orientation y="2.37081"/>
@@ -74063,7 +74063,7 @@
 			<Actor seed="607"/>
 		</Entity>
 		<Entity uid="14944">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1229.95582" z="1532.21204"/>
 			<Orientation y="0.80782"/>
@@ -74246,21 +74246,21 @@
 			<Actor seed="48208"/>
 		</Entity>
 		<Entity uid="14973">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1235.43506" z="1395.3899"/>
 			<Orientation y="0.17302"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="14974">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1229.11194" z="1391.7887"/>
 			<Orientation y="1.73601"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="14975">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1224.3191" z="1397.16956"/>
 			<Orientation y="0.17302"/>
@@ -74273,7 +74273,7 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="14977">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1230.5984" z="1400.78553"/>
 			<Orientation y="1.73601"/>
@@ -74812,35 +74812,35 @@
 			<Actor seed="45834"/>
 		</Entity>
 		<Entity uid="15059">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1411.271" z="1844.89551"/>
 			<Orientation y="10.994"/>
 			<Actor seed="16961"/>
 		</Entity>
 		<Entity uid="15060">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1409.97938" z="1832.4369"/>
 			<Orientation y="11.00475"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="15061">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1395.76453" z="1838.04651"/>
 			<Orientation y="14.01696"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="15062">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1397.05835" z="1851.15491"/>
 			<Orientation y="14.14866"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="15063">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1410.89039" z="1855.10267"/>
 			<Orientation y="11.06235"/>
@@ -75075,7 +75075,7 @@
 			<Actor seed="56788"/>
 		</Entity>
 		<Entity uid="15102">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1441.0298" z="1780.30127"/>
 			<Orientation y="7.9182"/>
@@ -75204,21 +75204,21 @@
 			<Actor seed="58428"/>
 		</Entity>
 		<Entity uid="15122">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1374.69227" z="1667.41895"/>
 			<Orientation y="0.86071"/>
 			<Actor seed="34497"/>
 		</Entity>
 		<Entity uid="15123">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1373.88794" z="1650.74512"/>
 			<Orientation y="2.40615"/>
 			<Actor seed="34497"/>
 		</Entity>
 		<Entity uid="15124">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1354.23047" z="1683.75855"/>
 			<Orientation y="0.54738"/>
@@ -75280,56 +75280,56 @@
 			<Actor seed="18393"/>
 		</Entity>
 		<Entity uid="15134">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1387.0121" z="1699.42603"/>
 			<Orientation y="1.64957"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15135">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1438.93665" z="1667.7721"/>
 			<Orientation y="4.67418"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15136">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1373.2472" z="1634.95264"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15137">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1362.07044" z="1627.60352"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15138">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1350.32813" z="1639.60376"/>
 			<Orientation y="2.32767"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15139">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1355.7063" z="1620.78858"/>
 			<Orientation y="-1.59433"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15140">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1356.05982" z="1615.21009"/>
 			<Orientation y="-1.59433"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15141">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1344.06531" z="1628.42505"/>
 			<Orientation y="3.02935"/>
@@ -75462,42 +75462,42 @@
 			<Actor seed="18127"/>
 		</Entity>
 		<Entity uid="15162">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1343.05225" z="1605.45948"/>
 			<Orientation y="1.56295"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15163">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1349.34827" z="1605.31971"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15164">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1358.68299" z="1605.3202"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15165">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1368.00574" z="1605.3147"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15166">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1377.25892" z="1605.20398"/>
 			<Orientation y="1.57378"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15167">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1386.58167" z="1605.1985"/>
 			<Orientation y="1.57378"/>
@@ -75540,21 +75540,21 @@
 			<Actor seed="59066"/>
 		</Entity>
 		<Entity uid="15176">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1307.21021" z="1638.75355"/>
 			<Orientation y="0.12784"/>
 			<Actor seed="19881"/>
 		</Entity>
 		<Entity uid="15177">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1318.73536" z="1639.1128"/>
 			<Orientation y="0.04764"/>
 			<Actor seed="45730"/>
 		</Entity>
 		<Entity uid="15178">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1313.05884" z="1666.66395"/>
 			<Orientation y="2.33838"/>
@@ -75669,7 +75669,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="15196">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1329.25733" z="1670.7527"/>
 			<Orientation y="2.30411"/>
@@ -75683,7 +75683,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="15198">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1313.70142" z="1704.79346"/>
 			<Orientation y="1.54734"/>
@@ -75697,7 +75697,7 @@
 			<Actor seed="21608"/>
 		</Entity>
 		<Entity uid="15200">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1322.19581" z="1634.32496"/>
 			<Orientation y="-4.68866"/>
@@ -76119,7 +76119,7 @@
 			<Actor seed="24308"/>
 		</Entity>
 		<Entity uid="15269">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1383.32862" z="1643.96705"/>
 			<Orientation y="0.01064"/>
@@ -76173,49 +76173,49 @@
 			<Actor seed="16789"/>
 		</Entity>
 		<Entity uid="15277">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1445.44727" z="1684.57483"/>
 			<Orientation y="6.26642"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15278">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1445.84131" z="1672.43665"/>
 			<Orientation y="6.26642"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15279">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1459.021" z="1601.51807"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15280">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1447.17151" z="1601.79053"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15281">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1445.43934" z="1507.62098"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15282">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1372.39087" z="1601.52686"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15283">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1454.77674" z="1508.15552"/>
 			<Orientation y="1.58977"/>
@@ -76257,21 +76257,21 @@
 			<Actor seed="8711"/>
 		</Entity>
 		<Entity uid="15289">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1431.00611" z="1522.64637"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15290">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1405.12879" z="1521.5503"/>
 			<Orientation y="1.56383"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15291">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1414.38904" z="1521.63794"/>
 			<Orientation y="1.56383"/>
@@ -76392,49 +76392,49 @@
 			<Actor seed="34120"/>
 		</Entity>
 		<Entity uid="15309">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1430.26966" z="1575.15284"/>
 			<Orientation y="1.58365"/>
 			<Actor seed="50999"/>
 		</Entity>
 		<Entity uid="15310">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1429.28602" z="1590.31128"/>
 			<Orientation y="1.58365"/>
 			<Actor seed="39534"/>
 		</Entity>
 		<Entity uid="15311">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1424.41773" z="1600.90748"/>
 			<Orientation y="0.0208"/>
 			<Actor seed="9783"/>
 		</Entity>
 		<Entity uid="15312">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1393.61573" z="1557.49341"/>
 			<Orientation y="0.03541"/>
 			<Actor seed="43269"/>
 		</Entity>
 		<Entity uid="15313">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1405.45875" z="1557.79126"/>
 			<Orientation y="-0.01526"/>
 			<Actor seed="26105"/>
 		</Entity>
 		<Entity uid="15314">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1383.45533" z="1582.27137"/>
 			<Orientation y="1.58365"/>
 			<Actor seed="58956"/>
 		</Entity>
 		<Entity uid="15315">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1382.70057" z="1576.61329"/>
 			<Orientation y="1.58365"/>
@@ -76489,7 +76489,7 @@
 			<Actor seed="55696"/>
 		</Entity>
 		<Entity uid="15324">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1422.03345" z="1522.19556"/>
 			<Orientation y="1.553"/>
@@ -76514,7 +76514,7 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="15328">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1451.23365" z="1537.86036"/>
 			<Orientation y="6.2614"/>
@@ -76533,7 +76533,7 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="15331">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1460.65857" z="1556.66529"/>
 			<Orientation y="1.56383"/>
@@ -76547,140 +76547,140 @@
 			<Actor seed="1857"/>
 		</Entity>
 		<Entity uid="15333">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1451.4585" z="1528.60254"/>
 			<Orientation y="6.2614"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="15334">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1484.29151" z="1514.7616"/>
 			<Orientation y="3.14097"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15335">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1484.1963" z="1526.79859"/>
 			<Orientation y="3.14097"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15336">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1483.92518" z="1539.11268"/>
 			<Orientation y="3.14097"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15337">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1479.48133" z="1593.56824"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15338">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1479.75245" z="1581.25416"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15339">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1479.84766" z="1569.21717"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15340">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1482.1095" z="1630.13563"/>
 			<Orientation y="3.39094"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15341">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1479.66517" z="1618.32703"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15342">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1479.76038" z="1606.29004"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15343">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1491.01758" z="1636.35962"/>
 			<Orientation y="1.47738"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15344">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1519.39649" z="1602.12171"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15345">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1519.48377" z="1565.04883"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15346">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1519.38855" z="1577.08582"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15347">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1519.11744" z="1589.39991"/>
 			<Orientation y="3.14098"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15348">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1501.6001" z="1633.68531"/>
 			<Orientation y="2.14509"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15349">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1519.46192" z="1612.31653"/>
 			<Orientation y="-3.18303"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15350">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1514.57471" z="1621.0807"/>
 			<Orientation y="2.40993"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15351">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1510.9994" z="1625.15113"/>
 			<Orientation y="2.40993"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="15352">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1517.32044" z="1553.6941"/>
 			<Orientation y="-2.72667"/>
@@ -76828,14 +76828,14 @@
 			<Actor seed="62041"/>
 		</Entity>
 		<Entity uid="15374">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1289.16016" z="1851.18531"/>
 			<Orientation y="1.48813"/>
 			<Actor seed="49248"/>
 		</Entity>
 		<Entity uid="15375">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1289.4596" z="1845.58436"/>
 			<Orientation y="0.91243"/>
@@ -76873,35 +76873,35 @@
 			<Actor seed="11626"/>
 		</Entity>
 		<Entity uid="15381">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1355.43921" z="1830.88868"/>
 			<Orientation y="-3.12566"/>
 			<Actor seed="61477"/>
 		</Entity>
 		<Entity uid="15382">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1353.28858" z="1835.95398"/>
 			<Orientation y="-1.52344"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="15383">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1343.50037" z="1808.17627"/>
 			<Orientation y="3.08185"/>
 			<Actor seed="48203"/>
 		</Entity>
 		<Entity uid="15384">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1320.53992" z="1801.46265"/>
 			<Orientation y="0.01438"/>
 			<Actor seed="3484"/>
 		</Entity>
 		<Entity uid="15385">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1321.75599" z="1789.12671"/>
 			<Orientation y="-1.62861"/>
@@ -76980,49 +76980,49 @@
 			<Actor seed="34277"/>
 		</Entity>
 		<Entity uid="15398">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1341.84864" z="1844.32569"/>
 			<Orientation y="-3.13593"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="15399">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1343.69544" z="1825.18555"/>
 			<Orientation y="-0.02071"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="15400">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1323.15296" z="1836.81568"/>
 			<Orientation y="1.67255"/>
 			<Actor seed="39152"/>
 		</Entity>
 		<Entity uid="15401">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1307.57398" z="1779.69971"/>
 			<Orientation y="0.55266"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="15402">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1304.57544" z="1794.7865"/>
 			<Orientation y="1.53197"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="15403">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1334.61414" z="1779.90577"/>
 			<Orientation y="-0.05571"/>
 			<Actor seed="8786"/>
 		</Entity>
 		<Entity uid="15404">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1341.59266" z="1779.3064"/>
 			<Orientation y="-0.54015"/>
@@ -77112,7 +77112,7 @@
 			<Actor seed="55759"/>
 		</Entity>
 		<Entity uid="15417">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1357.29151" z="1835.63941"/>
 			<Orientation y="1.65409"/>
@@ -77131,14 +77131,14 @@
 			<Actor seed="15525"/>
 		</Entity>
 		<Entity uid="15420">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1397.8827" z="1724.29249"/>
 			<Orientation y="14.20685"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="15421">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1395.82886" z="1711.2815"/>
 			<Orientation y="14.07515"/>
@@ -77205,14 +77205,14 @@
 			<Actor seed="15525"/>
 		</Entity>
 		<Entity uid="15431">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1420.57374" z="1619.95984"/>
 			<Orientation y="9.45748"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="15432">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1407.49573" z="1621.53125"/>
 			<Orientation y="9.32578"/>
@@ -77501,21 +77501,21 @@
 			<Actor seed="48208"/>
 		</Entity>
 		<Entity uid="15477">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1456.00782" z="1375.9303"/>
 			<Orientation y="-4.65297"/>
 			<Actor seed="60858"/>
 		</Entity>
 		<Entity uid="15478">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1451.71302" z="1381.8042"/>
 			<Orientation y="-3.08999"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="15479">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1456.516" z="1387.17627"/>
 			<Orientation y="-4.65297"/>
@@ -77528,7 +77528,7 @@
 			<Actor seed="59021"/>
 		</Entity>
 		<Entity uid="15481">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1460.82044" z="1381.3473"/>
 			<Orientation y="-3.08999"/>
@@ -77573,35 +77573,35 @@
 			<Actor seed="61839"/>
 		</Entity>
 		<Entity uid="15488">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1342.75428" z="1694.54883"/>
 			<Orientation y="0.74247"/>
 			<Actor seed="43267"/>
 		</Entity>
 		<Entity uid="15489">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1354.60328" z="1774.32874"/>
 			<Orientation y="-3.11213"/>
 			<Actor seed="10787"/>
 		</Entity>
 		<Entity uid="15490">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1371.9817" z="1761.0282"/>
 			<Orientation y="0.07453"/>
 			<Actor seed="1039"/>
 		</Entity>
 		<Entity uid="15491">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1391.13465" z="1760.66297"/>
 			<Orientation y="0.05492"/>
 			<Actor seed="1039"/>
 		</Entity>
 		<Entity uid="15492">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1414.9048" z="1760.48853"/>
 			<Orientation y="0.07125"/>
@@ -77949,21 +77949,21 @@
 			<Actor seed="61441"/>
 		</Entity>
 		<Entity uid="15548">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1400.34302" z="1690.00733"/>
 			<Orientation y="-2.18003"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="15549">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1400.10401" z="1675.83338"/>
 			<Orientation y="-0.56754"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="15550">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1397.20716" z="1671.15467"/>
 			<Orientation y="-2.16976"/>
@@ -77989,14 +77989,14 @@
 			<Actor seed="5220"/>
 		</Entity>
 		<Entity uid="15554">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1402.15625" z="1672.38209"/>
 			<Orientation y="2.61001"/>
 			<Actor seed="23520"/>
 		</Entity>
 		<Entity uid="15555">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1385.77405" z="1677.4574"/>
 			<Orientation y="0.93522"/>
@@ -78017,21 +78017,21 @@
 			<Actor seed="61441"/>
 		</Entity>
 		<Entity uid="15558">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1360.61207" z="1703.3899"/>
 			<Orientation y="-3.44996"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="15559">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1374.0785" z="1698.96131"/>
 			<Orientation y="-1.83747"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="15560">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1377.6886" z="1694.80799"/>
 			<Orientation y="-3.43969"/>
@@ -78057,14 +78057,14 @@
 			<Actor seed="5220"/>
 		</Entity>
 		<Entity uid="15564">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1377.9828" z="1699.89856"/>
 			<Orientation y="1.34006"/>
 			<Actor seed="23520"/>
 		</Entity>
 		<Entity uid="15565">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1368.28089" z="1685.75623"/>
 			<Orientation y="-0.33474"/>
@@ -78550,35 +78550,35 @@
 			<Actor seed="45834"/>
 		</Entity>
 		<Entity uid="15646">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1386.90296" z="318.25571"/>
 			<Orientation y="4.75034"/>
 			<Actor seed="16961"/>
 		</Entity>
 		<Entity uid="15647">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1385.12" z="305.85788"/>
 			<Orientation y="4.7611"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="15648">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1371.13794" z="312.02488"/>
 			<Orientation y="7.77331"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="15649">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1372.94874" z="325.07187"/>
 			<Orientation y="7.905"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="15650">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1386.92603" z="328.46995"/>
 			<Orientation y="4.8187"/>
@@ -78825,21 +78825,21 @@
 			<Actor seed="56788"/>
 		</Entity>
 		<Entity uid="15697">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1356.33985" z="352.1023"/>
 			<Orientation y="1.67455"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="15698">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1362.01697" z="363.98829"/>
 			<Orientation y="6.91434"/>
 			<Actor seed="8596"/>
 		</Entity>
 		<Entity uid="15699">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1356.57398" z="356.75623"/>
 			<Orientation y="6.91434"/>
@@ -78907,28 +78907,28 @@
 			<Actor seed="8309"/>
 		</Entity>
 		<Entity uid="15711">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1329.64649" z="414.28959"/>
 			<Orientation y="-3.4397"/>
 			<Actor seed="61477"/>
 		</Entity>
 		<Entity uid="15712">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1326.03638" z="418.44291"/>
 			<Orientation y="-1.83747"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="15713">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1312.56995" z="422.8715"/>
 			<Orientation y="-3.44997"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="15714">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1354.11414" z="391.86368"/>
 			<Orientation y="2.61002"/>
@@ -78954,14 +78954,14 @@
 			<Actor seed="62041"/>
 		</Entity>
 		<Entity uid="15718">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1349.16504" z="390.63627"/>
 			<Orientation y="-2.16976"/>
 			<Actor seed="61477"/>
 		</Entity>
 		<Entity uid="15719">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1352.0619" z="395.31498"/>
 			<Orientation y="-0.56754"/>
@@ -78975,14 +78975,14 @@
 			<Actor seed="24873"/>
 		</Entity>
 		<Entity uid="15724">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1306.56116" z="493.81034"/>
 			<Orientation y="-3.11214"/>
 			<Actor seed="10787"/>
 		</Entity>
 		<Entity uid="15725">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1294.71216" z="414.03043"/>
 			<Orientation y="0.74248"/>
@@ -79050,14 +79050,14 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="15735">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1347.78675" z="430.7631"/>
 			<Orientation y="14.07515"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="15736">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1349.84058" z="443.77408"/>
 			<Orientation y="14.20685"/>
@@ -79125,7 +79125,7 @@
 			<Actor seed="6626"/>
 		</Entity>
 		<Entity uid="15746">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1293.80652" z="563.80726"/>
 			<Orientation y="-3.13593"/>
@@ -79198,14 +79198,14 @@
 			<Actor seed="9634"/>
 		</Entity>
 		<Entity uid="15758">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1305.24646" z="555.43555"/>
 			<Orientation y="-1.52344"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="15759">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1307.3971" z="550.37024"/>
 			<Orientation y="-3.12566"/>
@@ -79237,14 +79237,14 @@
 			<Actor seed="52951"/>
 		</Entity>
 		<Entity uid="15764">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1241.41749" z="565.06592"/>
 			<Orientation y="0.91243"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="15765">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1241.11805" z="570.66688"/>
 			<Orientation y="1.48813"/>
@@ -79282,14 +79282,14 @@
 			<Actor seed="52979"/>
 		</Entity>
 		<Entity uid="15771">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1397.7992" z="391.91825"/>
 			<Orientation y="6.26642"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15772">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1397.40516" z="404.05643"/>
 			<Orientation y="6.26642"/>
@@ -79414,7 +79414,7 @@
 			<Actor seed="52624"/>
 		</Entity>
 		<Entity uid="15791">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1265.65931" z="424.27506"/>
 			<Orientation y="1.54734"/>
@@ -79428,7 +79428,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="15793">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1281.21521" z="390.23429"/>
 			<Orientation y="2.30411"/>
@@ -79531,7 +79531,7 @@
 			<Actor seed="22512"/>
 		</Entity>
 		<Entity uid="15809">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1265.01673" z="386.14554"/>
 			<Orientation y="2.33838"/>
@@ -79545,14 +79545,14 @@
 			<Actor seed="18127"/>
 		</Entity>
 		<Entity uid="15811">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1390.89454" z="387.2537"/>
 			<Orientation y="4.67418"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15812">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1338.96998" z="418.90763"/>
 			<Orientation y="1.64957"/>
@@ -79608,14 +79608,14 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="15821">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1306.18836" z="403.24015"/>
 			<Orientation y="0.54738"/>
 			<Actor seed="6134"/>
 		</Entity>
 		<Entity uid="15822">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1326.65015" z="386.90055"/>
 			<Orientation y="0.86071"/>
@@ -79689,7 +79689,7 @@
 			<Actor seed="31981"/>
 		</Entity>
 		<Entity uid="15833">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1392.98768" z="499.78287"/>
 			<Orientation y="7.9182"/>
@@ -79924,35 +79924,35 @@
 			<Actor seed="63054"/>
 		</Entity>
 		<Entity uid="15872">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1362.84827" z="574.58423"/>
 			<Orientation y="11.06235"/>
 			<Actor seed="24746"/>
 		</Entity>
 		<Entity uid="15873">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1349.01624" z="570.63648"/>
 			<Orientation y="14.14867"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="15874">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1347.72242" z="557.52808"/>
 			<Orientation y="14.01697"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="15875">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1361.93726" z="551.91846"/>
 			<Orientation y="11.00475"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="15876">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1363.22889" z="564.37708"/>
 			<Orientation y="10.99401"/>
@@ -80270,7 +80270,7 @@
 			<Actor seed="4757"/>
 		</Entity>
 		<Entity uid="15926">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1295.45826" z="527.65784"/>
 			<Orientation y="3.08185"/>
@@ -80283,14 +80283,14 @@
 			<Actor seed="5220"/>
 		</Entity>
 		<Entity uid="15928">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1320.23877" z="405.23783"/>
 			<Orientation y="-0.33475"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="15929">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1329.94068" z="419.38016"/>
 			<Orientation y="1.34006"/>
@@ -80330,14 +80330,14 @@
 			<Actor seed="24873"/>
 		</Entity>
 		<Entity uid="15935">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1337.73194" z="396.939"/>
 			<Orientation y="0.93523"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="15936">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1309.2494" z="555.12098"/>
 			<Orientation y="1.65409"/>
@@ -80357,7 +80357,7 @@
 			<Actor seed="25392"/>
 		</Entity>
 		<Entity uid="15939">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1272.49781" z="520.94422"/>
 			<Orientation y="0.01438"/>
@@ -80384,7 +80384,7 @@
 			<Actor seed="498"/>
 		</Entity>
 		<Entity uid="15943">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1273.71387" z="508.60837"/>
 			<Orientation y="-1.62862"/>
@@ -80398,49 +80398,49 @@
 			<Actor seed="18066"/>
 		</Entity>
 		<Entity uid="15945">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1293.55054" z="498.788"/>
 			<Orientation y="-0.54015"/>
 			<Actor seed="16121"/>
 		</Entity>
 		<Entity uid="15946">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1275.11084" z="556.29725"/>
 			<Orientation y="1.67255"/>
 			<Actor seed="39152"/>
 		</Entity>
 		<Entity uid="15947">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1295.65333" z="544.66712"/>
 			<Orientation y="-0.02071"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="15948">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1286.57203" z="499.38736"/>
 			<Orientation y="-0.05571"/>
 			<Actor seed="8786"/>
 		</Entity>
 		<Entity uid="15949">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1256.53333" z="514.26807"/>
 			<Orientation y="1.53197"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="15950">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1259.53187" z="499.18131"/>
 			<Orientation y="0.55266"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="15951">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1352.30091" z="409.48893"/>
 			<Orientation y="-2.18003"/>
@@ -80485,7 +80485,7 @@
 			<Actor seed="45490"/>
 		</Entity>
 		<Entity uid="15958">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1322.74012" z="341.92725"/>
 			<Orientation y="4.68386"/>
@@ -80506,7 +80506,7 @@
 			<Actor seed="13653"/>
 		</Entity>
 		<Entity uid="15961">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1278.00733" z="324.85163"/>
 			<Orientation y="7.60441"/>
@@ -80546,21 +80546,21 @@
 			<Actor seed="60767"/>
 		</Entity>
 		<Entity uid="15967">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1321.70203" z="341.90937"/>
 			<Orientation y="-0.0293"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15968">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1325.42774" z="366.60431"/>
 			<Orientation y="1.57894"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="15969">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1331.72071" z="366.36396"/>
 			<Orientation y="1.58977"/>
@@ -80616,14 +80616,14 @@
 			<Actor seed="58034"/>
 		</Entity>
 		<Entity uid="15978">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1298.78296" z="346.56061"/>
 			<Orientation y="2.32767"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="15979">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1310.52527" z="334.56037"/>
 			<Orientation y="-0.0293"/>
@@ -80717,7 +80717,7 @@
 			<Actor seed="16570"/>
 		</Entity>
 		<Entity uid="15993">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1342.86902" z="245.92286"/>
 			<Orientation y="0.54738"/>
@@ -80827,7 +80827,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16010">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1302.33997" z="266.95777"/>
 			<Orientation y="1.54734"/>
@@ -80869,7 +80869,7 @@
 			<Actor seed="5868"/>
 		</Entity>
 		<Entity uid="16016">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1331.39283" z="256.71314"/>
 			<Orientation y="0.74248"/>
@@ -80931,7 +80931,7 @@
 			<Actor seed="16570"/>
 		</Entity>
 		<Entity uid="16025">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1361.55018" z="243.50632"/>
 			<Orientation y="-2.1012"/>
@@ -81041,7 +81041,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16042">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1387.29712" z="205.79468"/>
 			<Orientation y="-1.10125"/>
@@ -81083,7 +81083,7 @@
 			<Actor seed="5868"/>
 		</Entity>
 		<Entity uid="16048">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1366.55274" z="228.56955"/>
 			<Orientation y="-1.9061"/>
@@ -81139,7 +81139,7 @@
 			<Actor seed="4757"/>
 		</Entity>
 		<Entity uid="16056">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1294.8783" z="215.9437"/>
 			<Orientation y="12.13747"/>
@@ -81275,35 +81275,35 @@
 			<Actor seed="63054"/>
 		</Entity>
 		<Entity uid="16084">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1489.93665" z="1864.8368"/>
 			<Orientation y="9.57105"/>
 			<Actor seed="24746"/>
 		</Entity>
 		<Entity uid="16085">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1492.77356" z="1850.735"/>
 			<Orientation y="12.65737"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="16086">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1505.7378" z="1848.4043"/>
 			<Orientation y="12.52567"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="16087">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1512.4585" z="1862.12879"/>
 			<Orientation y="9.51345"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="16088">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1500.14173" z="1864.40564"/>
 			<Orientation y="9.50271"/>
@@ -81564,7 +81564,7 @@
 			<Actor seed="6626"/>
 		</Entity>
 		<Entity uid="16128">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1438.52051" z="1893.54896"/>
 			<Orientation y="-7.81016"/>
@@ -81637,14 +81637,14 @@
 			<Actor seed="9634"/>
 		</Entity>
 		<Entity uid="16140">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1429.71839" z="1882.4369"/>
 			<Orientation y="-6.19767"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="16141">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1424.57471" z="1880.48108"/>
 			<Orientation y="-7.79989"/>
@@ -81676,14 +81676,14 @@
 			<Actor seed="52951"/>
 		</Entity>
 		<Entity uid="16146">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1441.77735" z="1945.85181"/>
 			<Orientation y="-3.7618"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16147">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1447.38575" z="1945.93726"/>
 			<Orientation y="-3.1861"/>
@@ -81721,7 +81721,7 @@
 			<Actor seed="52979"/>
 		</Entity>
 		<Entity uid="16153">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1402.33448" z="1893.27784"/>
 			<Orientation y="-1.59238"/>
@@ -81741,7 +81741,7 @@
 			<Actor seed="25392"/>
 		</Entity>
 		<Entity uid="16156">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1396.50171" z="1916.47779"/>
 			<Orientation y="-4.65986"/>
@@ -81768,7 +81768,7 @@
 			<Actor seed="498"/>
 		</Entity>
 		<Entity uid="16160">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1384.12842" z="1915.7334"/>
 			<Orientation y="-6.30285"/>
@@ -81782,49 +81782,49 @@
 			<Actor seed="18066"/>
 		</Entity>
 		<Entity uid="16162">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1373.55835" z="1896.2859"/>
 			<Orientation y="-5.21438"/>
 			<Actor seed="16121"/>
 		</Entity>
 		<Entity uid="16163">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1431.72938" z="1912.51771"/>
 			<Orientation y="-3.00168"/>
 			<Actor seed="39152"/>
 		</Entity>
 		<Entity uid="16164">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1419.32374" z="1892.43384"/>
 			<Orientation y="-4.69494"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="16165">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1374.42359" z="1903.23646"/>
 			<Orientation y="-4.72994"/>
 			<Actor seed="8786"/>
 		</Entity>
 		<Entity uid="16166">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1390.4397" z="1932.68543"/>
 			<Orientation y="-3.14226"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="16167">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1375.24952" z="1930.26478"/>
 			<Orientation y="-4.12157"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="16168">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1323.17212" z="1987.2328"/>
 			<Orientation y="0.74248"/>
@@ -81845,7 +81845,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16171">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1309.67518" z="1963.43665"/>
 			<Orientation y="2.30411"/>
@@ -81872,7 +81872,7 @@
 			<Actor seed="22512"/>
 		</Entity>
 		<Entity uid="16175">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1293.47669" z="1959.34791"/>
 			<Orientation y="2.33838"/>
@@ -81910,7 +81910,7 @@
 			<Actor seed="18127"/>
 		</Entity>
 		<Entity uid="16181">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1334.64832" z="1976.44251"/>
 			<Orientation y="0.54738"/>
@@ -81967,21 +81967,21 @@
 			<Actor seed="61441"/>
 		</Entity>
 		<Entity uid="16190">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1324.15015" z="1919.36585"/>
 			<Orientation y="-3.13593"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="16191">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1271.76111" z="1920.62452"/>
 			<Orientation y="0.91243"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16192">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1271.46167" z="1926.22547"/>
 			<Orientation y="1.48813"/>
@@ -82021,7 +82021,7 @@
 			<Actor seed="18066"/>
 		</Entity>
 		<Entity uid="16198">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1305.45447" z="1911.85584"/>
 			<Orientation y="1.67255"/>
@@ -82049,21 +82049,21 @@
 			<Actor seed="59037"/>
 		</Entity>
 		<Entity uid="16202">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1340.87488" z="1889.06739"/>
 			<Orientation y="-2.16149"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="16203">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1340.37317" z="1874.9004"/>
 			<Orientation y="-0.549"/>
 			<Actor seed="14435"/>
 		</Entity>
 		<Entity uid="16204">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1337.39002" z="1870.27613"/>
 			<Orientation y="-2.15122"/>
@@ -82089,14 +82089,14 @@
 			<Actor seed="5220"/>
 		</Entity>
 		<Entity uid="16208">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1342.36097" z="1871.41163"/>
 			<Orientation y="2.62853"/>
 			<Actor seed="23520"/>
 		</Entity>
 		<Entity uid="16209">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1326.07569" z="1876.78968"/>
 			<Orientation y="0.95374"/>
@@ -82216,7 +82216,7 @@
 			<Actor seed="25392"/>
 		</Entity>
 		<Entity uid="16227">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1280.33191" z="1814.34937"/>
 			<Orientation y="1.61487"/>
@@ -82236,21 +82236,21 @@
 			<Actor seed="34851"/>
 		</Entity>
 		<Entity uid="16230">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1267.96534" z="1813.50013"/>
 			<Orientation y="-0.02813"/>
 			<Actor seed="60015"/>
 		</Entity>
 		<Entity uid="16231">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1274.13257" z="1830.50501"/>
 			<Orientation y="3.13247"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="16232">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1258.96338" z="1827.9557"/>
 			<Orientation y="2.15316"/>
@@ -82292,7 +82292,7 @@
 			<Actor seed="52624"/>
 		</Entity>
 		<Entity uid="16238">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1275.6233" z="1742.50513"/>
 			<Orientation y="1.54734"/>
@@ -82358,7 +82358,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16248">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1261.4574" z="1699.7699"/>
 			<Orientation y="-1.65859"/>
@@ -82385,7 +82385,7 @@
 			<Actor seed="22512"/>
 		</Entity>
 		<Entity uid="16252">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1269.50281" z="1714.41163"/>
 			<Orientation y="-1.62432"/>
@@ -82501,21 +82501,21 @@
 			<Actor seed="45210"/>
 		</Entity>
 		<Entity uid="16271">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1081.67603" z="708.74347"/>
 			<Orientation y="1.99343"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="16272">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1096.24659" z="713.67322"/>
 			<Orientation y="2.97274"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="16273">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1092.8628" z="695.90387"/>
 			<Orientation y="-0.18789"/>
@@ -82535,7 +82535,7 @@
 			<Actor seed="57639"/>
 		</Entity>
 		<Entity uid="16276">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1104.9369" z="698.70942"/>
 			<Orientation y="1.45513"/>
@@ -82641,7 +82641,7 @@
 			<Actor seed="59037"/>
 		</Entity>
 		<Entity uid="16292">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1114.2295" z="798.97059"/>
 			<Orientation y="1.51281"/>
@@ -82681,21 +82681,21 @@
 			<Actor seed="62041"/>
 		</Entity>
 		<Entity uid="16298">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1078.3838" z="807.75013"/>
 			<Orientation y="1.32839"/>
 			<Actor seed="49248"/>
 		</Entity>
 		<Entity uid="16299">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1079.57032" z="802.26813"/>
 			<Orientation y="0.7527"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16300">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1131.49256" z="809.35883"/>
 			<Orientation y="-3.29567"/>
@@ -82752,7 +82752,7 @@
 			<Actor seed="45834"/>
 		</Entity>
 		<Entity uid="16309">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1132.77808" z="867.37867"/>
 			<Orientation y="0.38764"/>
@@ -82790,7 +82790,7 @@
 			<Actor seed="59066"/>
 		</Entity>
 		<Entity uid="16315">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1094.84986" z="843.9527"/>
 			<Orientation y="2.17864"/>
@@ -82817,7 +82817,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="16319">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1110.19178" z="850.56605"/>
 			<Orientation y="2.14437"/>
@@ -82839,21 +82839,21 @@
 			<Actor seed="34120"/>
 		</Entity>
 		<Entity uid="16322">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1119.7317" z="876.20606"/>
 			<Orientation y="0.58274"/>
 			<Actor seed="43267"/>
 		</Entity>
 		<Entity uid="16323">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1108.97986" z="730.9986"/>
 			<Orientation y="0.7527"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16324">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1107.79334" z="736.4806"/>
 			<Orientation y="1.32839"/>
@@ -82880,7 +82880,7 @@
 			<Actor seed="498"/>
 		</Entity>
 		<Entity uid="16328">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1131.98353" z="683.25196"/>
 			<Orientation y="1.37223"/>
@@ -82894,21 +82894,21 @@
 			<Actor seed="45210"/>
 		</Entity>
 		<Entity uid="16330">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1173.62293" z="407.30152"/>
 			<Orientation y="1.93357"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="16331">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1187.87256" z="413.0941"/>
 			<Orientation y="2.91288"/>
 			<Actor seed="34932"/>
 		</Entity>
 		<Entity uid="16332">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1185.55774" z="395.15412"/>
 			<Orientation y="-0.24775"/>
@@ -82928,7 +82928,7 @@
 			<Actor seed="57639"/>
 		</Entity>
 		<Entity uid="16335">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1197.44239" z="398.67692"/>
 			<Orientation y="1.39527"/>
@@ -83034,7 +83034,7 @@
 			<Actor seed="59037"/>
 		</Entity>
 		<Entity uid="16351">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1200.72059" z="499.31443"/>
 			<Orientation y="1.45295"/>
@@ -83074,21 +83074,21 @@
 			<Actor seed="62041"/>
 		</Entity>
 		<Entity uid="16357">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1164.41382" z="505.93393"/>
 			<Orientation y="1.26853"/>
 			<Actor seed="49248"/>
 		</Entity>
 		<Entity uid="16358">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1165.92615" z="500.53266"/>
 			<Orientation y="0.69283"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16359">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1217.33118" z="510.71674"/>
 			<Orientation y="-3.35553"/>
@@ -83145,7 +83145,7 @@
 			<Actor seed="45834"/>
 		</Entity>
 		<Entity uid="16368">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1215.14368" z="568.7096"/>
 			<Orientation y="0.32778"/>
@@ -83183,7 +83183,7 @@
 			<Actor seed="59066"/>
 		</Entity>
 		<Entity uid="16374">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1178.6847" z="543.05665"/>
 			<Orientation y="2.11878"/>
@@ -83210,7 +83210,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="16378">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1193.6034" z="550.57593"/>
 			<Orientation y="2.08451"/>
@@ -83231,21 +83231,21 @@
 			<Actor seed="34120"/>
 		</Entity>
 		<Entity uid="16381">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1201.59241" z="576.74079"/>
 			<Orientation y="0.52288"/>
 			<Actor seed="43267"/>
 		</Entity>
 		<Entity uid="16382">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1199.54651" z="431.15018"/>
 			<Orientation y="0.69283"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16383">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1198.03418" z="436.5514"/>
 			<Orientation y="1.26853"/>
@@ -83272,7 +83272,7 @@
 			<Actor seed="498"/>
 		</Entity>
 		<Entity uid="16387">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1225.36524" z="384.86512"/>
 			<Orientation y="1.31237"/>
@@ -83314,7 +83314,7 @@
 			<Actor seed="52624"/>
 		</Entity>
 		<Entity uid="16393">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1213.43506" z="298.70694"/>
 			<Orientation y="1.54734"/>
@@ -83349,14 +83349,14 @@
 			<Actor seed="40256"/>
 		</Entity>
 		<Entity uid="16398">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1189.10242" z="356.6008"/>
 			<Orientation y="7.60442"/>
 			<Actor seed="45216"/>
 		</Entity>
 		<Entity uid="16399">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1223.58484" z="359.38462"/>
 			<Orientation y="2.33838"/>
@@ -83377,7 +83377,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="16402">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1239.78333" z="363.47336"/>
 			<Orientation y="2.30411"/>
@@ -83391,7 +83391,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16404">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1230.30176" z="344.19407"/>
 			<Orientation y="4.73554"/>
@@ -83412,7 +83412,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="16407">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1221.1587" z="330.21146"/>
 			<Orientation y="4.70127"/>
@@ -83426,7 +83426,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16409">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1241.92151" z="309.19819"/>
 			<Orientation y="1.54812"/>
@@ -83447,7 +83447,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="16412">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1250.41443" z="323.58494"/>
 			<Orientation y="1.51384"/>
@@ -83461,7 +83461,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16414">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1229.50684" z="285.08823"/>
 			<Orientation y="12.13747"/>
@@ -83510,7 +83510,7 @@
 			<Actor seed="4757"/>
 		</Entity>
 		<Entity uid="16421">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1333.46583" z="134.78327"/>
 			<Orientation y="-2.43396"/>
@@ -83552,7 +83552,7 @@
 			<Actor seed="52624"/>
 		</Entity>
 		<Entity uid="16427">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1362.85804" z="125.55703"/>
 			<Orientation y="-1.62912"/>
@@ -83656,7 +83656,7 @@
 			<Actor seed="18393"/>
 		</Entity>
 		<Entity uid="16443">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1321.62073" z="145.16721"/>
 			<Orientation y="-2.62906"/>
@@ -83834,7 +83834,7 @@
 			<Actor seed="593"/>
 		</Entity>
 		<Entity uid="16470">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1458.40528" z="446.19874"/>
 			<Orientation y="4.67418"/>
@@ -83879,14 +83879,14 @@
 			<Actor seed="61839"/>
 		</Entity>
 		<Entity uid="16477">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1464.9159" z="463.00147"/>
 			<Orientation y="6.26642"/>
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="16478">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1465.30994" z="450.86329"/>
 			<Orientation y="6.26642"/>
@@ -83941,14 +83941,14 @@
 			<Actor seed="4757"/>
 		</Entity>
 		<Entity uid="16486">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1394.37122" z="517.33484"/>
 			<Orientation y="10.99401"/>
 			<Actor seed="16961"/>
 		</Entity>
 		<Entity uid="16487">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1393.0796" z="504.87626"/>
 			<Orientation y="11.00475"/>
@@ -83975,7 +83975,7 @@
 			<Actor seed="40009"/>
 		</Entity>
 		<Entity uid="16495">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1121.74195" z="668.24061"/>
 			<Orientation y="-0.13884"/>
@@ -83996,7 +83996,7 @@
 			<Actor seed="43584"/>
 		</Entity>
 		<Entity uid="16498">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1131.51673" z="642.6891"/>
 			<Orientation y="1.4228"/>
@@ -84023,7 +84023,7 @@
 			<Actor seed="22512"/>
 		</Entity>
 		<Entity uid="16502">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1124.3672" z="627.58973"/>
 			<Orientation y="1.45707"/>
@@ -84061,7 +84061,7 @@
 			<Actor seed="18127"/>
 		</Entity>
 		<Entity uid="16508">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1137.36805" z="670.23139"/>
 			<Orientation y="-0.33394"/>
@@ -84118,21 +84118,21 @@
 			<Actor seed="61441"/>
 		</Entity>
 		<Entity uid="16517">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1174.72876" z="625.8227"/>
 			<Orientation y="-4.01725"/>
 			<Actor seed="62225"/>
 		</Entity>
 		<Entity uid="16518">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1140.43116" z="586.20112"/>
 			<Orientation y="0.03112"/>
 			<Actor seed="57123"/>
 		</Entity>
 		<Entity uid="16519">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1135.9192" z="589.53309"/>
 			<Orientation y="0.60682"/>
@@ -84172,7 +84172,7 @@
 			<Actor seed="18066"/>
 		</Entity>
 		<Entity uid="16525">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1168.6305" z="606.62018"/>
 			<Orientation y="0.79125"/>
@@ -85599,7 +85599,7 @@
 			<Actor seed="44500"/>
 		</Entity>
 		<Entity uid="16756">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1910.87928" z="1466.83057"/>
 			<Orientation y="1.58144"/>
@@ -87631,14 +87631,14 @@
 			<Actor seed="18552"/>
 		</Entity>
 		<Entity uid="17047">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1225.50452" z="1949.33765"/>
 			<Orientation y="-4.69495"/>
 			<Actor seed="7432"/>
 		</Entity>
 		<Entity uid="17048">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1237.91016" z="1969.42151"/>
 			<Orientation y="-3.00168"/>
@@ -87665,7 +87665,7 @@
 			<Actor seed="5220"/>
 		</Entity>
 		<Entity uid="17052">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1208.51526" z="1950.18165"/>
 			<Orientation y="-1.59238"/>
@@ -87697,7 +87697,7 @@
 			<Actor seed="62041"/>
 		</Entity>
 		<Entity uid="17057">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1247.95813" z="2002.75562"/>
 			<Orientation y="-3.7618"/>
@@ -87722,14 +87722,14 @@
 			<Actor seed="11626"/>
 		</Entity>
 		<Entity uid="17061">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1230.7555" z="1937.3849"/>
 			<Orientation y="-7.7999"/>
 			<Actor seed="61477"/>
 		</Entity>
 		<Entity uid="17062">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1235.89917" z="1939.3407"/>
 			<Orientation y="-6.19768"/>
@@ -87748,7 +87748,7 @@
 			<Actor seed="34277"/>
 		</Entity>
 		<Entity uid="17065">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1244.7013" z="1950.45276"/>
 			<Orientation y="-7.81017"/>
@@ -87812,35 +87812,35 @@
 			<Actor seed="63054"/>
 		</Entity>
 		<Entity uid="17075">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1217.07117" z="1912.00647"/>
 			<Orientation y="11.06235"/>
 			<Actor seed="24746"/>
 		</Entity>
 		<Entity uid="17076">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1227.70752" z="1845.14039"/>
 			<Orientation y="14.14867"/>
 			<Actor seed="48126"/>
 		</Entity>
 		<Entity uid="17077">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1226.4137" z="1832.03199"/>
 			<Orientation y="14.01697"/>
 			<Actor seed="2306"/>
 		</Entity>
 		<Entity uid="17078">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1216.16016" z="1889.3407"/>
 			<Orientation y="11.00475"/>
 			<Actor seed="13004"/>
 		</Entity>
 		<Entity uid="17079">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1217.45179" z="1901.79932"/>
 			<Orientation y="10.99401"/>
@@ -88080,7 +88080,7 @@
 			<Actor seed="57348"/>
 		</Entity>
 		<Entity uid="17116">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1198.3501" z="1808.11963"/>
 			<Orientation y="-1.65859"/>
@@ -88122,7 +88122,7 @@
 			<Actor seed="52624"/>
 		</Entity>
 		<Entity uid="17122">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1250.59412" z="1813.1432"/>
 			<Orientation y="1.54734"/>
@@ -88175,7 +88175,7 @@
 			<Actor seed="4757"/>
 		</Entity>
 		<Entity uid="17130">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1235.91871" z="1789.56214"/>
 			<Orientation y="14.14867"/>
@@ -88249,7 +88249,7 @@
 			<Actor seed="63054"/>
 		</Entity>
 		<Entity uid="17141">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1262.7461" z="1637.01038"/>
 			<Orientation y="11.00475"/>
@@ -88329,7 +88329,7 @@
 			<Actor seed="24308"/>
 		</Entity>
 		<Entity uid="17153">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1231.02283" z="1765.5608"/>
 			<Orientation y="-4.68866"/>
@@ -88798,7 +88798,7 @@
 			<Actor seed="29314"/>
 		</Entity>
 		<Entity uid="17220">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1181.8407" z="1611.25623"/>
 			<Orientation y="2.37081"/>
@@ -88823,14 +88823,14 @@
 			<Actor seed="23388"/>
 		</Entity>
 		<Entity uid="17224">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1175.06397" z="1605.03138"/>
 			<Orientation y="2.3749"/>
 			<Actor seed="1242"/>
 		</Entity>
 		<Entity uid="17225">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1174.57215" z="1611.93653"/>
 			<Orientation y="0.80782"/>
@@ -89029,7 +89029,7 @@
 			<Actor seed="45714"/>
 		</Entity>
 		<Entity uid="17258">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1181.68262" z="1604.83216"/>
 			<Orientation y="0.80782"/>
@@ -89376,7 +89376,7 @@
 			<Actor seed="56788"/>
 		</Entity>
 		<Entity uid="17314">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1226.35499" z="1663.38086"/>
 			<Orientation y="2.9782"/>
@@ -89417,7 +89417,7 @@
 			<Actor seed="13073"/>
 		</Entity>
 		<Entity uid="17320">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1219.37598" z="1669.53064"/>
 			<Orientation y="7.78202"/>
@@ -89443,112 +89443,112 @@
 			<Actor seed="44447"/>
 		</Entity>
 		<Entity uid="17670">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1168.27662" z="938.23603"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17671">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1174.87366" z="944.79102"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17672">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1175.03125" z="931.28211"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17673">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1181.6283" z="937.8371"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17674">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1168.28919" z="924.63465"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17675">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1161.69214" z="918.0796"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17676">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1155.77967" z="912.0998"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17677">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1151.85145" z="907.92768"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17678">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1145.33008" z="901.30103"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17679">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1139.41736" z="895.32123"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17680">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1135.48938" z="891.1493"/>
 			<Orientation y="-5.50341"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17681">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1121.41468" z="911.95331"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17682">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1116.26905" z="917.47254"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17683">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1110.29651" z="913.59382"/>
 			<Orientation y="1.41922"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17684">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1117.89405" z="905.3816"/>
 			<Orientation y="6.3227"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17685">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1154.80042" z="972.78321"/>
 			<Orientation y="2.36202"/>
@@ -89693,84 +89693,84 @@
 			<Actor seed="11275"/>
 		</Entity>
 		<Entity uid="17770">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1155.44141" z="965.3556"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17771">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1158.37305" z="962.40961"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17772">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1159.77027" z="960.91645"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17773">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1162.70191" z="957.97046"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17774">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1151.97168" z="946.8371"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17775">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1149.04004" z="949.78309"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17776">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1147.64283" z="951.27619"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17777">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1144.71119" z="954.22223"/>
 			<Orientation y="11.78246"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17778">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1145.65491" z="961.45698"/>
 			<Orientation y="7.06467"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17779">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1148.96412" z="964.91511"/>
 			<Orientation y="7.06467"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17780">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1158.5542" z="947.5948"/>
 			<Orientation y="7.06467"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17781">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1162.08558" z="951.14631"/>
 			<Orientation y="7.06467"/>
@@ -90113,161 +90113,161 @@
 			<Actor seed="33896"/>
 		</Entity>
 		<Entity uid="17838">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1167.34168" z="959.32416"/>
 			<Orientation y="2.36202"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17841">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1217.65296" z="1027.05054"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17842">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1211.08863" z="1033.67066"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17843">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1204.64795" z="1040.31495"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17844">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1198.17371" z="1046.99122"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17845">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1191.48951" z="1039.24341"/>
 			<Orientation y="2.36698"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17846">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1197.93567" z="1032.54004"/>
 			<Orientation y="2.36698"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17847">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1204.34852" z="1025.86878"/>
 			<Orientation y="2.36698"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17849">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1166.44349" z="978.7411"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17850">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1173.05213" z="985.31702"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17851">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1179.68555" z="991.76917"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17852">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1186.29407" z="998.34485"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17853">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1192.85792" z="1004.87757"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17854">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1172.22791" z="972.4673"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17855">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1178.83655" z="979.04322"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17856">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1185.46998" z="985.49537"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17857">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1192.0785" z="992.07105"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17858">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1198.64234" z="998.60376"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17860">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1204.40857" z="1016.17713"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17861">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1197.80005" z="1009.60145"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17862">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1218.26575" z="1018.10627"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17863">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1211.70191" z="1011.57355"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17864">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1205.09339" z="1004.99787"/>
 			<Orientation y="0.79026"/>
@@ -90808,21 +90808,21 @@
 			<Actor seed="6884"/>
 		</Entity>
 		<Entity uid="17945">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1287.412" z="888.5337"/>
 			<Orientation y="3.1423"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17946">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1287.599" z="906.74128"/>
 			<Orientation y="3.1423"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17947">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1287.45484" z="898.11915"/>
 			<Orientation y="3.1423"/>
@@ -90847,21 +90847,21 @@
 			<Actor seed="63501"/>
 		</Entity>
 		<Entity uid="17951">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1310.43763" z="912.60004"/>
 			<Orientation y="1.51824"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17952">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1300.86353" z="912.1324"/>
 			<Orientation y="1.51824"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="17953">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1292.24598" z="911.8172"/>
 			<Orientation y="1.51824"/>
@@ -92448,7 +92448,7 @@
 			<Actor seed="40256"/>
 		</Entity>
 		<Entity uid="18282">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1540.07667" z="935.73853"/>
 			<Orientation y="6.28878"/>
@@ -92475,7 +92475,7 @@
 			<Actor seed="59066"/>
 		</Entity>
 		<Entity uid="18288">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1552.52112" z="938.79206"/>
 			<Orientation y="6.99045"/>
@@ -92488,21 +92488,21 @@
 			<Actor seed="32469"/>
 		</Entity>
 		<Entity uid="18292">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1545.06324" z="902.22864"/>
 			<Orientation y="1.57248"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18293">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1535.72852" z="902.21601"/>
 			<Orientation y="1.57248"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18294">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1529.43238" z="902.34754"/>
 			<Orientation y="1.56165"/>
@@ -92545,7 +92545,7 @@
 			<Actor seed="24308"/>
 		</Entity>
 		<Entity uid="18301">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1509.46937" z="942.06678"/>
 			<Orientation y="1.56295"/>
@@ -92564,7 +92564,7 @@
 			<Actor seed="24308"/>
 		</Entity>
 		<Entity uid="18304">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1528.53345" z="942.14545"/>
 			<Orientation y="1.56295"/>
@@ -92699,84 +92699,84 @@
 			<Actor seed="27020"/>
 		</Entity>
 		<Entity uid="18329">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1528.32898" z="1414.5741"/>
 			<Orientation y="-2.93352"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18331">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1498.07227" z="1440.7793"/>
 			<Orientation y="0.68877"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18332">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1506.00562" z="1446.92444"/>
 			<Orientation y="-4.9042"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18334">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1522.75477" z="1449.88782"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18335">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1525.54908" z="1437.89197"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18336">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1528.11426" z="1426.13111"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18337">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1516.0951" z="1448.38697"/>
 			<Orientation y="1.41982"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18342">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1488.46705" z="1422.07044"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18343">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1485.90174" z="1433.8313"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18345">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1498.64026" z="1393.44507"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18346">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1501.43458" z="1381.4491"/>
 			<Orientation y="2.93413"/>
 			<Actor seed="28465"/>
 		</Entity>
 		<Entity uid="18347">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1503.99976" z="1369.68824"/>
 			<Orientation y="2.93413"/>
@@ -92970,28 +92970,28 @@
 			<Actor seed="63302"/>
 		</Entity>
 		<Entity uid="18386">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1132.77942" z="1051.84241"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18387">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1137.26771" z="1056.42371"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18388">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1123.3639" z="1062.5"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18389">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1128.78199" z="1068.1294"/>
 			<Orientation y="7.05626"/>
@@ -93022,56 +93022,56 @@
 			<Actor seed="63302"/>
 		</Entity>
 		<Entity uid="18394">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1129.49585" z="1079.41663"/>
 			<Orientation y="7.05626"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18395">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1150.44031" z="1049.00318"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18396">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1157.00367" z="1042.32972"/>
 			<Orientation y="2.36278"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18397">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1178.14747" z="1032.92103"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18398">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1184.75611" z="1039.49695"/>
 			<Orientation y="0.79026"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18399">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1170.29102" z="1029.0597"/>
 			<Orientation y="2.35105"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18400">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1163.64979" z="1035.65577"/>
 			<Orientation y="2.35105"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18401">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1175.19336" z="1029.96131"/>
 			<Orientation y="0.79026"/>
@@ -93187,28 +93187,28 @@
 			<Actor seed="38089"/>
 		</Entity>
 		<Entity uid="18419">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1043.74842" z="968.48688"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18420">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1050.9607" z="961.1792"/>
 			<Orientation y="2.34673"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18421">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1056.25025" z="960.52955"/>
 			<Orientation y="7.04421"/>
 			<Actor seed="57212"/>
 		</Entity>
 		<Entity uid="18422">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1060.41858" z="965.10157"/>
 			<Orientation y="7.04421"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/necropolis.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/necropolis.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/necropolis.xml
@@ -124,7 +124,7 @@
 			<Orientation y="-2.33716"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="478.40418" z="520.79078"/>
 			<Orientation y="2.34508"/>
@@ -1048,13 +1048,13 @@
 			<Orientation y="1.4056"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="470.29954" z="428.86518"/>
 			<Orientation y="0.78428"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="544.04932" z="461.02265"/>
 			<Orientation y="-0.76082"/>
@@ -5476,19 +5476,19 @@
 			<Orientation y="-0.78142"/>
 		</Entity>
 		<Entity uid="1100">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>3</Player>
 			<Position x="451.36902" z="1553.31641"/>
 			<Orientation y="2.36097"/>
 		</Entity>
 		<Entity uid="1102">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>3</Player>
 			<Position x="484.41083" z="1513.61817"/>
 			<Orientation y="-0.78397"/>
 		</Entity>
 		<Entity uid="1103">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>3</Player>
 			<Position x="459.08002" z="1489.27308"/>
 			<Orientation y="-0.76767"/>
@@ -12706,19 +12706,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2399">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>4</Player>
 			<Position x="1508.81434" z="429.74201"/>
 			<Orientation y="0.79824"/>
 		</Entity>
 		<Entity uid="2400">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>4</Player>
 			<Position x="1540.98768" z="425.18693"/>
 			<Orientation y="-0.78187"/>
 		</Entity>
 		<Entity uid="2401">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>4</Player>
 			<Position x="1535.94446" z="459.03196"/>
 			<Orientation y="-2.35386"/>
@@ -12730,19 +12730,19 @@
 			<Orientation y="-0.84705"/>
 		</Entity>
 		<Entity uid="2406">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>2</Player>
 			<Position x="1498.01441" z="1524.70105"/>
 			<Orientation y="0.78443"/>
 		</Entity>
 		<Entity uid="2407">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>2</Player>
 			<Position x="1517.06739" z="1505.91944"/>
 			<Orientation y="0.78875"/>
 		</Entity>
 		<Entity uid="2408">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>2</Player>
 			<Position x="1601.30823" z="1571.34302"/>
 			<Orientation y="-2.42554"/>
@@ -18544,229 +18544,229 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3515">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="891.99042" z="1413.9032"/>
 			<Orientation y="-2.13431"/>
 		</Entity>
 		<Entity uid="3516">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="865.60029" z="1433.78602"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3517">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="866.23407" z="1453.51233"/>
 			<Orientation y="-2.39946"/>
 		</Entity>
 		<Entity uid="3518">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="878.50873" z="1457.07044"/>
 			<Orientation y="0.83712"/>
 		</Entity>
 		<Entity uid="3519">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="891.34559" z="1455.69666"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3520">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="901.72614" z="1418.1355"/>
 			<Orientation y="-1.92284"/>
 		</Entity>
 		<Entity uid="3521">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="883.57056" z="1419.58204"/>
 			<Orientation y="-0.74813"/>
 		</Entity>
 		<Entity uid="3522">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="888.50696" z="1418.27405"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3523">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="895.06592" z="1422.59913"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3524">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="899.08582" z="1410.31934"/>
 			<Orientation y="-2.08594"/>
 		</Entity>
 		<Entity uid="3525">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="886.65992" z="1403.73511"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3526">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="860.45441" z="1444.86976"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3527">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="870.41431" z="1453.64747"/>
 			<Orientation y="-0.84855"/>
 		</Entity>
 		<Entity uid="3528">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="575.54151" z="850.07319"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3529">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="585.70685" z="854.00947"/>
 			<Orientation y="0.22309"/>
 		</Entity>
 		<Entity uid="3530">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="611.97376" z="821.9198"/>
 			<Orientation y="-1.6266"/>
 		</Entity>
 		<Entity uid="3531">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="581.02253" z="818.92243"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3532">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="572.96296" z="838.65656"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3533">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="577.08796" z="842.19727"/>
 			<Orientation y="1.38094"/>
 		</Entity>
 		<Entity uid="3534">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="583.77491" z="845.36121"/>
 			<Orientation y="0.59195"/>
 		</Entity>
 		<Entity uid="3535">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="609.49457" z="835.12464"/>
 			<Orientation y="-2.04274"/>
 		</Entity>
 		<Entity uid="3536">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="602.26301" z="825.93836"/>
 			<Orientation y="1.29918"/>
 		</Entity>
 		<Entity uid="3537">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="610.02527" z="828.51392"/>
 			<Orientation y="-2.26378"/>
 		</Entity>
 		<Entity uid="3538">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="598.35376" z="817.83643"/>
 			<Orientation y="1.26758"/>
 		</Entity>
 		<Entity uid="3539">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="592.30799" z="855.13923"/>
 			<Orientation y="-2.33675"/>
 		</Entity>
 		<Entity uid="3540">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="585.36493" z="820.8755"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3541">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="591.93012" z="825.01478"/>
 			<Orientation y="-2.23362"/>
 		</Entity>
 		<Entity uid="3542">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="608.22858" z="819.69623"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3543">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="616.27839" z="817.65662"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3544">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1284.92725" z="872.50922"/>
 			<Orientation y="-2.05765"/>
 		</Entity>
 		<Entity uid="3545">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1255.9242" z="864.9756"/>
 			<Orientation y="0.28136"/>
 		</Entity>
 		<Entity uid="3546">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1252.54468" z="883.57593"/>
 			<Orientation y="-1.93824"/>
 		</Entity>
 		<Entity uid="3547">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1284.16102" z="869.42347"/>
 			<Orientation y="1.03689"/>
 		</Entity>
 		<Entity uid="3548">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1286.6526" z="883.14637"/>
 			<Orientation y="-2.33463"/>
 		</Entity>
 		<Entity uid="3549">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1286.36768" z="847.41889"/>
 			<Orientation y="0.0768"/>
 		</Entity>
 		<Entity uid="3550">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1268.40052" z="854.12092"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3551">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1291.87818" z="875.61054"/>
 			<Orientation y="2.20467"/>
 		</Entity>
 		<Entity uid="3552">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1274.62623" z="861.01093"/>
 			<Orientation y="-2.33013"/>
@@ -47058,97 +47058,97 @@
 			<Orientation y="1.98552"/>
 		</Entity>
 		<Entity uid="9581">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="1048.76026" z="171.69007"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9582">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="950.72413" z="486.30787"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9583">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="580.15552" z="939.58399"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9584">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="207.04499" z="1194.33692"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9585">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="1403.1753" z="1302.99683"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9586">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="1520.07618" z="1119.50562"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9587">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="1374.77527" z="1610.47168"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9588">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="1452.94886" z="1764.6908"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9589">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="294.31327" z="1362.13062"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9590">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="704.20337" z="1139.4618"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9591">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="1093.56202" z="1475.72242"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9592">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="1170.3285" z="1823.44776"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9593">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="1416.81348" z="874.17017"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9594">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="1178.73096" z="774.3299"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9595">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="1128.93958" z="400.05726"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9596">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="1406.2024" z="199.86246"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml
@@ -420,7 +420,7 @@
 			<Orientation y="3.16405"/>
 		</Entity>
 		<Entity uid="82">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>2</Player>
 			<Position x="402.766" z="251.594"/>
 			<Orientation y="2.67188"/>
@@ -522,7 +522,7 @@
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="100">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>2</Player>
 			<Position x="463.375" z="256.234"/>
 			<Orientation y="2.67188"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/peloponnese.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/peloponnese.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/peloponnese.xml
@@ -31979,13 +31979,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5958">
-			<Template>other/hellenic_epic_temple</Template>
+			<Template>structures/hellenic_epic_temple</Template>
 			<Player>0</Player>
 			<Position x="800.04712" z="1408.56373"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5959">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="572.15894" z="910.4673"/>
 			<Orientation y="2.35621"/>
@@ -32387,55 +32387,55 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6027">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="573.19611" z="872.90021"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6028">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="565.185" z="878.93561"/>
 			<Orientation y="-1.05871"/>
 		</Entity>
 		<Entity uid="6029">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="562.8141" z="867.93818"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6030">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="897.73664" z="522.48047"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6031">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="903.73401" z="520.72742"/>
 			<Orientation y="0.0749"/>
 		</Entity>
 		<Entity uid="6032">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="900.60553" z="524.42469"/>
 			<Orientation y="0.93859"/>
 		</Entity>
 		<Entity uid="6033">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="900.57099" z="531.06611"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6034">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="905.23951" z="1111.90467"/>
 			<Orientation y="-1.97484"/>
 		</Entity>
 		<Entity uid="6035">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="911.84931" z="1104.62"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
@@ -2936,25 +2936,25 @@
 			<Orientation y="-0.9999"/>
 		</Entity>
 		<Entity uid="550">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="387.29252" z="653.32911"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="551">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="629.11597" z="418.71073"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="552">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="882.45167" z="641.89344"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="553">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="644.30268" z="875.67334"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
@@ -283,7 +283,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="69">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="534.10535" z="1400.44654"/>
 			<Orientation y="2.35621"/>
@@ -295,7 +295,7 @@
 			<Orientation y="-2.28205"/>
 		</Entity>
 		<Entity uid="71">
-			<Template>other/hellenic_propylaea</Template>
+			<Template>structures/hellenic_propylaea</Template>
 			<Player>1</Player>
 			<Position x="518.7107" z="1261.37916"/>
 			<Orientation y="-3.0213"/>
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
@@ -4648,13 +4648,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="828">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="916.6037" z="531.7107"/>
 			<Orientation y="3.10434"/>
 		</Entity>
 		<Entity uid="829">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="917.3625" z="544.38178"/>
 			<Orientation y="-0.0089"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
@@ -5483,7 +5483,7 @@
 			<Orientation y="-2.16683"/>
 		</Entity>
 		<Entity uid="1051">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>2</Player>
 			<Position x="687.00483" z="408.56122"/>
 			<Orientation y="2.35621"/>
@@ -5501,13 +5501,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1055">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="61.29278" z="502.95356"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1056">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="846.17603" z="736.85828"/>
 			<Orientation y="2.35621"/>
@@ -5519,103 +5519,103 @@
 			<Orientation y="-0.60532"/>
 		</Entity>
 		<Entity uid="1058">
-			<Template>other/table_rectangle</Template>
+			<Template>structures/table_rectangle</Template>
 			<Player>0</Player>
 			<Position x="312.4495" z="332.34284"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1059">
-			<Template>other/table_square</Template>
+			<Template>structures/table_square</Template>
 			<Player>0</Player>
 			<Position x="328.89573" z="342.03052"/>
 			<Orientation y="-1.86138"/>
 		</Entity>
 		<Entity uid="1060">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="294.44294" z="339.50232"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1061">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>1</Player>
 			<Position x="350.29566" z="93.26269"/>
 			<Orientation y="0.8038"/>
 		</Entity>
 		<Entity uid="1062">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="852.7917" z="786.48212"/>
 			<Orientation y="-2.15406"/>
 		</Entity>
 		<Entity uid="1063">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="862.1493" z="769.80127"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1064">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="851.39979" z="772.48841"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1065">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="850.82282" z="791.28638"/>
 			<Orientation y="0.49416"/>
 		</Entity>
 		<Entity uid="1066">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="874.67109" z="778.49006"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1067">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="855.26404" z="784.25922"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1068">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="822.98346" z="801.37403"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1069">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="824.91889" z="792.57642"/>
 			<Orientation y="2.8043"/>
 		</Entity>
 		<Entity uid="1070">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="826.70594" z="787.4809"/>
 			<Orientation y="-1.32731"/>
 		</Entity>
 		<Entity uid="1071">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="828.80854" z="779.43592"/>
 			<Orientation y="0.4947"/>
 		</Entity>
 		<Entity uid="1072">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="834.37616" z="769.35834"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1073">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="837.73615" z="785.49006"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1074">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>0</Player>
 			<Position x="329.77775" z="339.98102"/>
 			<Orientation y="2.35621"/>
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
@@ -4656,13 +4656,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="828">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="916.6037" z="531.7107"/>
 			<Orientation y="3.10434"/>
 		</Entity>
 		<Entity uid="829">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="917.3625" z="544.38178"/>
 			<Orientation y="-0.0089"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -13623,14 +13623,14 @@
 			<Actor seed="45050"/>
 		</Entity>
 		<Entity uid="2603">
-			<Template>other/desert_trading_post</Template>
+			<Template>structures/desert_trading_post</Template>
 			<Player>0</Player>
 			<Position x="264.68213" z="902.8808"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22492"/>
 		</Entity>
 		<Entity uid="2604">
-			<Template>other/desert_trading_post</Template>
+			<Template>structures/desert_trading_post</Template>
 			<Player>0</Player>
 			<Position x="746.1532" z="916.1435"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -4913,7 +4913,7 @@
 			<Actor seed="20852"/>
 		</Entity>
 		<Entity uid="952">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="556.50196" z="1409.85401"/>
 			<Orientation y="2.35621"/>
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
@@ -6315,13 +6315,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1123">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="147.88285" z="681.50416"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1124">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="822.1905" z="409.22168"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
@@ -11024,14 +11024,14 @@
 			<Actor seed="34826"/>
 		</Entity>
 		<Entity uid="1871">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="391.18049" z="821.11744"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64266"/>
 		</Entity>
 		<Entity uid="1872">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="372.98661" z="804.09064"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
@@ -3807,49 +3807,49 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3617">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="296.10505" z="431.6443"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3618">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="709.8191" z="398.07828"/>
 			<Orientation y="0.08059"/>
 		</Entity>
 		<Entity uid="3619">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="863.97327" z="637.22767"/>
 			<Orientation y="-2.03243"/>
 		</Entity>
 		<Entity uid="3620">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="555.74457" z="960.27857"/>
 			<Orientation y="-1.57081"/>
 		</Entity>
 		<Entity uid="3621">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="1061.98572" z="684.01221"/>
 			<Orientation y="1.03975"/>
 		</Entity>
 		<Entity uid="3622">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="223.57612" z="819.1219"/>
 			<Orientation y="-1.90833"/>
 		</Entity>
 		<Entity uid="3623">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="712.2732" z="103.82981"/>
 			<Orientation y="1.16005"/>
 		</Entity>
 		<Entity uid="3624">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="101.05231" z="399.17402"/>
 			<Orientation y="0.86027"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
@@ -121,7 +121,7 @@
 			<Orientation y="-2.32274"/>
 		</Entity>
 		<Entity uid="69">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>1</Player>
 			<Position x="534.10535" z="1400.44654"/>
 			<Orientation y="2.35621"/>
@@ -133,7 +133,7 @@
 			<Orientation y="-2.28205"/>
 		</Entity>
 		<Entity uid="71">
-			<Template>other/hellenic_propylaea</Template>
+			<Template>structures/hellenic_propylaea</Template>
 			<Player>1</Player>
 			<Position x="518.81275" z="1264.22413"/>
 			<Orientation y="-3.0213"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
@@ -2394,13 +2394,13 @@
 			<Orientation y="-2.05591"/>
 		</Entity>
 		<Entity uid="561">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/hellenic_stoa</Template>
 			<Player>2</Player>
 			<Position x="545.85541" z="158.94117"/>
 			<Orientation y="0.80655"/>
 		</Entity>
 		<Entity uid="563">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>1</Player>
 			<Position x="35.34296" z="399.83146"/>
 			<Orientation y="1.99079"/>
@@ -4869,217 +4869,217 @@
 			<Orientation y="1.57081"/>
 		</Entity>
 		<Entity uid="1114">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="419.23615" z="215.81366"/>
 			<Orientation y="2.29683"/>
 		</Entity>
 		<Entity uid="1116">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="447.0604" z="233.50257"/>
 			<Orientation y="0.79543"/>
 		</Entity>
 		<Entity uid="1117">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="456.64905" z="243.08022"/>
 			<Orientation y="0.80205"/>
 		</Entity>
 		<Entity uid="1118">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="428.37372" z="216.44024"/>
 			<Orientation y="0.77216"/>
 		</Entity>
 		<Entity uid="1119">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="456.47794" z="252.04394"/>
 			<Orientation y="2.40787"/>
 		</Entity>
 		<Entity uid="1120">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="448.2657" z="260.91303"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1121">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="431.089" z="277.17884"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1122">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="422.14002" z="285.77256"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1123">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="412.33091" z="293.96464"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1126">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="375.44022" z="268.30604"/>
 			<Orientation y="0.82213"/>
 		</Entity>
 		<Entity uid="1127">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="402.32245" z="292.86243"/>
 			<Orientation y="0.78928"/>
 		</Entity>
 		<Entity uid="1129">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="383.98243" z="250.90143"/>
 			<Orientation y="2.37717"/>
 		</Entity>
 		<Entity uid="1131">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="401.99872" z="232.74871"/>
 			<Orientation y="-0.71608"/>
 		</Entity>
 		<Entity uid="1132">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="410.44758" z="223.99624"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1133">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="443.56263" z="306.05747"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1134">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="452.49677" z="297.25931"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1136">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="470.4964" z="280.3878"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1137">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="479.58365" z="272.37836"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1138">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="488.64695" z="263.48881"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1139">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="496.64814" z="263.90125"/>
 			<Orientation y="0.6307"/>
 		</Entity>
 		<Entity uid="1140">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="503.75959" z="273.63807"/>
 			<Orientation y="0.7053"/>
 		</Entity>
 		<Entity uid="1142">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="518.90583" z="291.77692"/>
 			<Orientation y="0.64252"/>
 		</Entity>
 		<Entity uid="1143">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="507.87818" z="323.42017"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1145">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="490.21479" z="340.68195"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1146">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="481.3277" z="349.35569"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1147">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="472.47022" z="358.30686"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1148">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="464.6591" z="359.21888"/>
 			<Orientation y="0.67707"/>
 		</Entity>
 		<Entity uid="1149">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="456.76151" z="350.3219"/>
 			<Orientation y="0.71868"/>
 		</Entity>
 		<Entity uid="1151">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="441.31165" z="332.3885"/>
 			<Orientation y="0.69913"/>
 		</Entity>
 		<Entity uid="1152">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="433.92643" z="323.52244"/>
 			<Orientation y="0.63456"/>
 		</Entity>
 		<Entity uid="1154">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="375.8501" z="259.93741"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1156">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="385.19996" z="276.67972"/>
 			<Orientation y="-2.32158"/>
 		</Entity>
 		<Entity uid="1162">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="434.81516" z="314.01771"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1164">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="516.77063" z="315.08381"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1165">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="525.51075" z="306.79578"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1167">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="524.69507" z="299.37262"/>
 			<Orientation y="-2.43668"/>
@@ -5475,7 +5475,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1236">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="102.94872" z="180.16141"/>
 			<Orientation y="2.43306"/>
@@ -11133,193 +11133,193 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2394">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="215.67544" z="495.24335"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2395">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="224.51738" z="486.3054"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2397">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="242.19428" z="468.70075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2398">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="250.70402" z="459.57721"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2399">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="259.21055" z="450.53766"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2400">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="250.30112" z="531.77533"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2401">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="260.17884" z="521.45154"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2403">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="277.90363" z="503.55768"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2404">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="286.8267" z="494.3187"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2405">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="295.63389" z="484.91587"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2406">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="188.37493" z="481.39637"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2407">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="197.36854" z="472.70643"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2409">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="215.0029" z="454.8856"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2410">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="223.7462" z="446.32087"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2411">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="232.3293" z="438.037"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2412">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="154.46827" z="444.36182"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2413">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="162.95237" z="435.57435"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2415">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="180.04111" z="418.06449"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2416">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="188.81881" z="409.478"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2417">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="197.2716" z="401.36896"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2418">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="206.1737" z="401.84034"/>
 			<Orientation y="0.78876"/>
 		</Entity>
 		<Entity uid="2420">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="222.64199" z="420.1811"/>
 			<Orientation y="0.74698"/>
 		</Entity>
 		<Entity uid="2421">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="231.44085" z="429.11255"/>
 			<Orientation y="0.84719"/>
 		</Entity>
 		<Entity uid="2422">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="154.0316" z="453.50943"/>
 			<Orientation y="0.75055"/>
 		</Entity>
 		<Entity uid="2423">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="162.79941" z="463.48935"/>
 			<Orientation y="0.79609"/>
 		</Entity>
 		<Entity uid="2425">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="179.93972" z="480.93516"/>
 			<Orientation y="0.77775"/>
 		</Entity>
 		<Entity uid="2426">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="213.85691" z="505.74851"/>
 			<Orientation y="0.70952"/>
 		</Entity>
 		<Entity uid="2427">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="222.12455" z="514.58869"/>
 			<Orientation y="0.79583"/>
 		</Entity>
 		<Entity uid="2429">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="240.78685" z="532.9986"/>
 			<Orientation y="0.8177"/>
 		</Entity>
 		<Entity uid="2430">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="296.84412" z="474.99097"/>
 			<Orientation y="0.80294"/>
 		</Entity>
 		<Entity uid="2432">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="278.57743" z="458.77854"/>
 			<Orientation y="0.79738"/>
 		</Entity>
 		<Entity uid="2433">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="269.47046" z="449.96058"/>
 			<Orientation y="0.8225"/>
@@ -15825,7 +15825,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3218">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>1</Player>
 			<Position x="193.7531" z="604.22895"/>
 			<Orientation y="-1.98253"/>
@@ -15873,175 +15873,175 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3229">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="374.54117" z="443.57117"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3230">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="390.0854" z="437.46366"/>
 			<Orientation y="-1.6306"/>
 		</Entity>
 		<Entity uid="3231">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="404.12296" z="453.59986"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3232">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="409.86274" z="456.97068"/>
 			<Orientation y="-2.3177"/>
 		</Entity>
 		<Entity uid="3233">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="387.59253" z="467.53064"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3234">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="369.40433" z="490.4997"/>
 			<Orientation y="-1.00371"/>
 		</Entity>
 		<Entity uid="3235">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="377.672" z="482.14386"/>
 			<Orientation y="-0.67673"/>
 		</Entity>
 		<Entity uid="3236">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="356.5647" z="485.6297"/>
 			<Orientation y="-2.808"/>
 		</Entity>
 		<Entity uid="3237">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="382.53577" z="440.79517"/>
 			<Orientation y="0.4404"/>
 		</Entity>
 		<Entity uid="3238">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="357.24054" z="461.39612"/>
 			<Orientation y="-1.78113"/>
 		</Entity>
 		<Entity uid="3239">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="371.06357" z="449.38154"/>
 			<Orientation y="-2.97637"/>
 		</Entity>
 		<Entity uid="3240">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="364.13459" z="452.38413"/>
 			<Orientation y="2.79021"/>
 		</Entity>
 		<Entity uid="3241">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="407.46744" z="445.14036"/>
 			<Orientation y="0.64948"/>
 		</Entity>
 		<Entity uid="3242">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="452.77302" z="443.78507"/>
 			<Orientation y="1.01581"/>
 		</Entity>
 		<Entity uid="3243">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="399.40497" z="468.15754"/>
 			<Orientation y="-1.50911"/>
 		</Entity>
 		<Entity uid="3244">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="406.96369" z="421.96668"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3245">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="398.38135" z="425.97529"/>
 			<Orientation y="-2.0158"/>
 		</Entity>
 		<Entity uid="3246">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="390.98475" z="429.26877"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3247">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="395.88373" z="432.28913"/>
 			<Orientation y="-1.98226"/>
 		</Entity>
 		<Entity uid="3248">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="406.0858" z="433.76816"/>
 			<Orientation y="-0.90766"/>
 		</Entity>
 		<Entity uid="3249">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="362.52186" z="445.09998"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3250">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="367.35154" z="451.20551"/>
 			<Orientation y="-2.78309"/>
 		</Entity>
 		<Entity uid="3251">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="355.37961" z="465.13471"/>
 			<Orientation y="-1.23597"/>
 		</Entity>
 		<Entity uid="3252">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="376.7631" z="494.8769"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3253">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="384.56263" z="499.27088"/>
 			<Orientation y="-2.43754"/>
 		</Entity>
 		<Entity uid="3254">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="384.32694" z="493.73542"/>
 			<Orientation y="-0.59505"/>
 		</Entity>
 		<Entity uid="3255">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="416.8488" z="458.88535"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3256">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="372.8274" z="485.3216"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3257">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="387.3661" z="432.66095"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/walls.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/walls.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/walls.xml
@@ -6332,13 +6332,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1123">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="147.88285" z="681.50416"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1124">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="822.1905" z="409.22168"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
@@ -9412,13 +9412,13 @@
 			<Orientation y="2.58265"/>
 		</Entity>
 		<Entity uid="3374">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="414.13971" z="649.52723"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3375">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="421.39957" z="658.63965"/>
 			<Orientation y="-0.83228"/>
@@ -9436,13 +9436,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3378">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="422.19413" z="649.88593"/>
 			<Orientation y="-2.45063"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="413.3975" z="658.0251"/>
 			<Orientation y="-2.49918"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
@@ -1426,49 +1426,49 @@
 			<Actor seed="46520"/>
 		</Entity>
 		<Entity uid="3164">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="125.96886" z="286.90803"/>
 			<Orientation y="-3.01944"/>
 			<Actor seed="62284"/>
 		</Entity>
 		<Entity uid="3165">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="128.6365" z="269.04712"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28352"/>
 		</Entity>
 		<Entity uid="3166">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="135.30843" z="265.8494"/>
 			<Orientation y="-1.69022"/>
 			<Actor seed="53848"/>
 		</Entity>
 		<Entity uid="3167">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="110.20495" z="285.25623"/>
 			<Orientation y="2.11446"/>
 			<Actor seed="31750"/>
 		</Entity>
 		<Entity uid="3168">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="103.6619" z="282.30259"/>
 			<Orientation y="0.25184"/>
 			<Actor seed="29140"/>
 		</Entity>
 		<Entity uid="3169">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="108.14803" z="273.24402"/>
 			<Orientation y="-1.05018"/>
 			<Actor seed="35920"/>
 		</Entity>
 		<Entity uid="3170">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="114.73684" z="273.61307"/>
 			<Orientation y="-2.58295"/>
@@ -2791,28 +2791,28 @@
 			<Actor seed="26374"/>
 		</Entity>
 		<Entity uid="3376">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="770.74543" z="218.32276"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18442"/>
 		</Entity>
 		<Entity uid="3377">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="758.03675" z="210.11135"/>
 			<Orientation y="-2.44828"/>
 			<Actor seed="64168"/>
 		</Entity>
 		<Entity uid="3378">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="764.72901" z="220.33066"/>
 			<Orientation y="0.80562"/>
 			<Actor seed="3886"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="770.0539" z="240.80819"/>
 			<Orientation y="-2.73751"/>
@@ -2820,7 +2820,7 @@
 			<Actor seed="10884"/>
 		</Entity>
 		<Entity uid="3380">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="764.60798" z="242.2693"/>
 			<Orientation y="2.35621"/>
@@ -2834,63 +2834,63 @@
 			<Actor seed="51644"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="686.7569" z="326.11496"/>
 			<Orientation y="1.70774"/>
 			<Actor seed="2242"/>
 		</Entity>
 		<Entity uid="3384">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="681.69843" z="320.99766"/>
 			<Orientation y="-0.1311"/>
 			<Actor seed="19460"/>
 		</Entity>
 		<Entity uid="3385">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="688.47407" z="316.06058"/>
 			<Orientation y="1.43625"/>
 			<Actor seed="23400"/>
 		</Entity>
 		<Entity uid="3386">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="704.22168" z="275.1999"/>
 			<Orientation y="-2.51044"/>
 			<Actor seed="42272"/>
 		</Entity>
 		<Entity uid="3387">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="695.9809" z="269.57346"/>
 			<Orientation y="-1.77562"/>
 			<Actor seed="54828"/>
 		</Entity>
 		<Entity uid="3388">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="712.3971" z="267.3535"/>
 			<Orientation y="0.6166"/>
 			<Actor seed="14028"/>
 		</Entity>
 		<Entity uid="3389">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="702.97547" z="257.956"/>
 			<Orientation y="0.91157"/>
 			<Actor seed="24192"/>
 		</Entity>
 		<Entity uid="3390">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="692.85462" z="258.43491"/>
 			<Orientation y="2.1853"/>
 			<Actor seed="7170"/>
 		</Entity>
 		<Entity uid="3391">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="688.63117" z="265.48282"/>
 			<Orientation y="0.47999"/>
@@ -8245,56 +8245,56 @@
 			<Actor seed="53714"/>
 		</Entity>
 		<Entity uid="5402">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="486.38428" z="368.43088"/>
 			<Orientation y="-0.19158"/>
 			<Actor seed="32290"/>
 		</Entity>
 		<Entity uid="5403">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="482.11103" z="361.29566"/>
 			<Orientation y="1.34701"/>
 			<Actor seed="63916"/>
 		</Entity>
 		<Entity uid="5404">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="471.8664" z="363.84559"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62840"/>
 		</Entity>
 		<Entity uid="5406">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="470.39243" z="372.87891"/>
 			<Orientation y="0.52131"/>
 			<Actor seed="17804"/>
 		</Entity>
 		<Entity uid="5407">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="619.53388" z="503.86844"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3152"/>
 		</Entity>
 		<Entity uid="5408">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="621.43018" z="511.99408"/>
 			<Orientation y="1.01372"/>
 			<Actor seed="7518"/>
 		</Entity>
 		<Entity uid="5409">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="631.35206" z="511.25364"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41484"/>
 		</Entity>
 		<Entity uid="5410">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="633.24146" z="505.03965"/>
 			<Orientation y="0.67522"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml
@@ -4781,19 +4781,19 @@
 			<Orientation y="-0.87851"/>
 		</Entity>
 		<Entity uid="938">
-			<Template>other/celt_longhouse</Template>
+			<Template>structures/celt_longhouse</Template>
 			<Player>0</Player>
 			<Position x="532.4751" z="477.37851"/>
 			<Orientation y="-2.1608"/>
 		</Entity>
 		<Entity uid="939">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="474.55262" z="723.22547"/>
 			<Orientation y="-2.1425"/>
 		</Entity>
 		<Entity uid="940">
-			<Template>other/celt_hut</Template>
+			<Template>structures/celt_hut</Template>
 			<Player>0</Player>
 			<Position x="642.63227" z="450.34711"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
@@ -3705,14 +3705,14 @@
 			<Actor seed="30358"/>
 		</Entity>
 		<Entity uid="810">
-			<Template>other/desert_trading_post</Template>
+			<Template>structures/desert_trading_post</Template>
 			<Player>0</Player>
 			<Position x="263.84845" z="904.91712"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24354"/>
 		</Entity>
 		<Entity uid="811">
-			<Template>other/desert_trading_post</Template>
+			<Template>structures/desert_trading_post</Template>
 			<Player>0</Player>
 			<Position x="751.4037" z="923.40333"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
@@ -5458,14 +5458,14 @@
 			<Actor seed="15236"/>
 		</Entity>
 		<Entity uid="1672">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1240.20264" z="677.28711"/>
 			<Orientation y="0.92228"/>
 			<Actor seed="1746"/>
 		</Entity>
 		<Entity uid="1673">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="1233.19459" z="670.37372"/>
 			<Orientation y="-2.22959"/>
@@ -8514,14 +8514,14 @@
 			<Orientation y="-2.5886"/>
 		</Entity>
 		<Entity uid="3262">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1419.63086" z="1418.98108"/>
 			<Orientation y="-2.35338"/>
 			<Actor seed="56096"/>
 		</Entity>
 		<Entity uid="3263">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1457.13209" z="1454.55921"/>
 			<Orientation y="0.77076"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml
@@ -66,25 +66,25 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="8">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="659.17505" z="670.91828"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="9">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="790.96009" z="564.08027"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="10">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="449.41376" z="401.48163"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="11">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="334.1319" z="501.86884"/>
 			<Orientation y="2.35621"/>
@@ -17122,13 +17122,13 @@
 			<Orientation y="-2.84681"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="657.90027" z="213.47312"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3384">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="460.09284" z="822.5735"/>
 			<Orientation y="2.35621"/>
@@ -17449,13 +17449,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3452">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="580.9596" z="517.5047"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3453">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="568.75495" z="529.73041"/>
 			<Orientation y="-0.77804"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
@@ -13751,7 +13751,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3373">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="506.67444" z="488.45575"/>
 			<Orientation y="-0.97802"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -19664,63 +19664,63 @@
 			<Actor seed="39984"/>
 		</Entity>
 		<Entity uid="4673">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="899.51642" z="1720.5641"/>
 			<Orientation y="2.31695"/>
 			<Actor seed="11522"/>
 		</Entity>
 		<Entity uid="4674">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="888.45423" z="1733.39954"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35120"/>
 		</Entity>
 		<Entity uid="4675">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="957.64087" z="1659.96229"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59490"/>
 		</Entity>
 		<Entity uid="4676">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="967.55097" z="1645.47547"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27130"/>
 		</Entity>
 		<Entity uid="4677">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="848.0954" z="1711.07923"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49232"/>
 		</Entity>
 		<Entity uid="4678">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="816.33252" z="1679.80701"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18076"/>
 		</Entity>
 		<Entity uid="4679">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="841.81214" z="1610.23621"/>
 			<Orientation y="0.81672"/>
 			<Actor seed="62208"/>
 		</Entity>
 		<Entity uid="4681">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="936.982" z="1612.08484"/>
 			<Orientation y="-0.79255"/>
 			<Actor seed="31636"/>
 		</Entity>
 		<Entity uid="4682">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="913.03638" z="1586.97168"/>
 			<Orientation y="-0.78704"/>
@@ -19948,28 +19948,28 @@
 			<Actor seed="29284"/>
 		</Entity>
 		<Entity uid="4792">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>0</Player>
 			<Position x="1102.36683" z="1104.72156"/>
 			<Orientation y="5.24334"/>
 			<Actor seed="35442"/>
 		</Entity>
 		<Entity uid="4793">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1099.85877" z="1089.03895"/>
 			<Orientation y="1.17803"/>
 			<Actor seed="58546"/>
 		</Entity>
 		<Entity uid="4794">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>0</Player>
 			<Position x="1127.88624" z="1112.76648"/>
 			<Orientation y="-2.84931"/>
 			<Actor seed="20480"/>
 		</Entity>
 		<Entity uid="4795">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>0</Player>
 			<Position x="1113.92225" z="1081.82715"/>
 			<Orientation y="-0.35888"/>
@@ -21199,14 +21199,14 @@
 			<Actor seed="1698"/>
 		</Entity>
 		<Entity uid="5097">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1136.34253" z="1102.84522"/>
 			<Orientation y="-2.14509"/>
 			<Actor seed="58546"/>
 		</Entity>
 		<Entity uid="5098">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>0</Player>
 			<Position x="1137.24744" z="1095.45142"/>
 			<Orientation y="-7.07184"/>
@@ -28249,14 +28249,14 @@
 			<Actor seed="59072"/>
 		</Entity>
 		<Entity uid="6399">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>5</Player>
 			<Position x="1366.21741" z="1055.41028"/>
 			<Orientation y="-2.69927"/>
 			<Actor seed="24872"/>
 		</Entity>
 		<Entity uid="6400">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>5</Player>
 			<Position x="1342.073" z="1068.32947"/>
 			<Orientation y="-2.6716"/>
@@ -28408,28 +28408,28 @@
 			<Actor seed="47194"/>
 		</Entity>
 		<Entity uid="6448">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="282.43747" z="1424.72754"/>
 			<Orientation y="2.19233"/>
 			<Actor seed="3656"/>
 		</Entity>
 		<Entity uid="6449">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="288.3401" z="1419.0658"/>
 			<Orientation y="2.48795"/>
 			<Actor seed="9424"/>
 		</Entity>
 		<Entity uid="6450">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="292.61365" z="1411.50953"/>
 			<Orientation y="2.74119"/>
 			<Actor seed="63526"/>
 		</Entity>
 		<Entity uid="6451">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="295.59809" z="1403.34278"/>
 			<Orientation y="2.8456"/>
@@ -28592,28 +28592,28 @@
 			<Actor seed="3285"/>
 		</Entity>
 		<Entity uid="6479">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="282.8253" z="1425.07972"/>
 			<Orientation y="2.19234"/>
 			<Actor seed="3656"/>
 		</Entity>
 		<Entity uid="6480">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="289.02427" z="1419.24061"/>
 			<Orientation y="2.48795"/>
 			<Actor seed="9424"/>
 		</Entity>
 		<Entity uid="6481">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="293.25556" z="1411.73511"/>
 			<Orientation y="2.7412"/>
 			<Actor seed="63526"/>
 		</Entity>
 		<Entity uid="6482">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>6</Player>
 			<Position x="296.16511" z="1403.54114"/>
 			<Orientation y="2.8456"/>
@@ -33357,147 +33357,147 @@
 			<Actor seed="3682"/>
 		</Entity>
 		<Entity uid="7710">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="807.32026" z="1735.42457"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="7440"/>
 		</Entity>
 		<Entity uid="7713">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="794.24836" z="1721.53663"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21738"/>
 		</Entity>
 		<Entity uid="7714">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="810.3141" z="1738.41346"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17718"/>
 		</Entity>
 		<Entity uid="7715">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="791.14075" z="1718.50501"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7716">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="810.31727" z="1741.08411"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7720">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="807.88154" z="1743.44898"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7721">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="804.73359" z="1746.47852"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7725">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="790.54535" z="1759.35499"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7726">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="787.31983" z="1762.25818"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7727">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="784.4198" z="1764.95777"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7728">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="781.74286" z="1764.86475"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7731">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="779.19227" z="1762.42762"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7732">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="776.69245" z="1759.92042"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7734">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="767.13923" z="1749.98218"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7735">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="764.68122" z="1747.63001"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7736">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="788.41688" z="1718.48511"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7737">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="785.80677" z="1720.88062"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7742">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="768.43732" z="1737.16675"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7743">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="765.19312" z="1740.06763"/>
 			<Orientation y="0.74346"/>
 			<Actor seed="14530"/>
 		</Entity>
 		<Entity uid="7744">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="762.32032" z="1745.26734"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21790"/>
 		</Entity>
 		<Entity uid="7745">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="762.33558" z="1742.69788"/>
 			<Orientation y="0.74346"/>
@@ -34128,7 +34128,7 @@
 			<Actor seed="48164"/>
 		</Entity>
 		<Entity uid="7943">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="782.90741" z="1723.54212"/>
 			<Orientation y="0.74346"/>
@@ -34417,14 +34417,14 @@
 			<Actor seed="54916"/>
 		</Entity>
 		<Entity uid="8007">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="797.26429" z="1724.46863"/>
 			<Orientation y="2.35622"/>
 			<Actor seed="21738"/>
 		</Entity>
 		<Entity uid="8008">
-			<Template>other/sele_colonnade</Template>
+			<Template>structures/sele_colonnade</Template>
 			<Player>1</Player>
 			<Position x="804.46808" z="1732.62977"/>
 			<Orientation y="2.35622"/>
@@ -35221,7 +35221,7 @@
 			<Actor seed="42688"/>
 		</Entity>
 		<Entity uid="8211">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="701.11335" z="1666.20521"/>
 			<Orientation y="2.35621"/>
@@ -35973,14 +35973,14 @@
 			<Actor seed="13106"/>
 		</Entity>
 		<Entity uid="8351">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="789.58985" z="1733.4823"/>
 			<Orientation y="1.3219"/>
 			<Actor seed="8210"/>
 		</Entity>
 		<Entity uid="8352">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="794.96558" z="1738.80054"/>
 			<Orientation y="-2.82113"/>
@@ -47657,25 +47657,25 @@
 			<Actor seed="15150"/>
 		</Entity>
 		<Entity uid="10929">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="1043.86597" z="719.71222"/>
 			<Orientation y="1.53582"/>
 		</Entity>
 		<Entity uid="10930">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="1044.06885" z="704.3545"/>
 			<Orientation y="1.537"/>
 		</Entity>
 		<Entity uid="10931">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="1064.58973" z="720.27228"/>
 			<Orientation y="-3.13796"/>
 		</Entity>
 		<Entity uid="10932">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="1077.70997" z="720.88965"/>
 			<Orientation y="-3.13796"/>
@@ -51428,28 +51428,28 @@
 			<Actor seed="20280"/>
 		</Entity>
 		<Entity uid="11508">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1489.48365" z="1525.07984"/>
 			<Orientation y="4.09935"/>
 			<Actor seed="16866"/>
 		</Entity>
 		<Entity uid="11509">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1459.17786" z="1481.24988"/>
 			<Orientation y="7.25483"/>
 			<Actor seed="53678"/>
 		</Entity>
 		<Entity uid="11510">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1516.0221" z="1487.47999"/>
 			<Orientation y="4.09937"/>
 			<Actor seed="16866"/>
 		</Entity>
 		<Entity uid="11511">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="1481.46814" z="1448.62708"/>
 			<Orientation y="7.25484"/>
@@ -64144,49 +64144,49 @@
 			<Actor seed="44098"/>
 		</Entity>
 		<Entity uid="14240">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>5</Player>
 			<Position x="1271.12586" z="1033.9021"/>
 			<Orientation y="2.03097"/>
 			<Actor seed="2024"/>
 		</Entity>
 		<Entity uid="14257">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>5</Player>
 			<Position x="1274.50416" z="1062.15528"/>
 			<Orientation y="-1.84386"/>
 			<Actor seed="9832"/>
 		</Entity>
 		<Entity uid="14260">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>5</Player>
 			<Position x="1323.10462" z="1064.40845"/>
 			<Orientation y="2.00509"/>
 			<Actor seed="54514"/>
 		</Entity>
 		<Entity uid="14261">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>5</Player>
 			<Position x="1276.88392" z="1042.34546"/>
 			<Orientation y="-1.09375"/>
 			<Actor seed="4090"/>
 		</Entity>
 		<Entity uid="14262">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>5</Player>
 			<Position x="1261.28187" z="1068.34717"/>
 			<Orientation y="2.01494"/>
 			<Actor seed="41690"/>
 		</Entity>
 		<Entity uid="14264">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>5</Player>
 			<Position x="1249.88392" z="986.03657"/>
 			<Orientation y="0.48546"/>
 			<Actor seed="54474"/>
 		</Entity>
 		<Entity uid="14265">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>5</Player>
 			<Position x="1259.84388" z="1048.77002"/>
 			<Orientation y="-2.69541"/>
@@ -66946,21 +66946,21 @@
 			<Actor seed="13996"/>
 		</Entity>
 		<Entity uid="14837">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>6</Player>
 			<Position x="437.33106" z="1339.79505"/>
 			<Orientation y="3.02006"/>
 			<Actor seed="61522"/>
 		</Entity>
 		<Entity uid="14838">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>6</Player>
 			<Position x="431.15906" z="1338.88123"/>
 			<Orientation y="3.02007"/>
 			<Actor seed="61522"/>
 		</Entity>
 		<Entity uid="14841">
-			<Template>other/table_rectangle</Template>
+			<Template>structures/table_rectangle</Template>
 			<Player>6</Player>
 			<Position x="434.39948" z="1339.24"/>
 			<Orientation y="3.01778"/>
@@ -67886,7 +67886,7 @@
 			<Actor seed="35016"/>
 		</Entity>
 		<Entity uid="15006">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>0</Player>
 			<Position x="373.09452" z="1645.31507"/>
 			<Orientation y="1.12365"/>
@@ -68737,42 +68737,42 @@
 			<Actor seed="47948"/>
 		</Entity>
 		<Entity uid="15148">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1243.18921" z="1035.34314"/>
 			<Orientation y="-7.39226"/>
 			<Actor seed="5972"/>
 		</Entity>
 		<Entity uid="15149">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1231.09339" z="1012.11652"/>
 			<Orientation y="-7.4068"/>
 			<Actor seed="5972"/>
 		</Entity>
 		<Entity uid="15150">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1236.13038" z="1041.17505"/>
 			<Orientation y="-6.91395"/>
 			<Actor seed="5972"/>
 		</Entity>
 		<Entity uid="15151">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1222.05518" z="1014.04004"/>
 			<Orientation y="-10.99721"/>
 			<Actor seed="5972"/>
 		</Entity>
 		<Entity uid="15152">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1233.76478" z="1049.69166"/>
 			<Orientation y="-6.17943"/>
 			<Actor seed="5972"/>
 		</Entity>
 		<Entity uid="15153">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1214.43006" z="1010.31226"/>
 			<Orientation y="-5.59618"/>
@@ -72254,28 +72254,28 @@
 			<Actor seed="682"/>
 		</Entity>
 		<Entity uid="15904">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="306.30344" z="862.18573"/>
 			<Orientation y="2.20432"/>
 			<Actor seed="38048"/>
 		</Entity>
 		<Entity uid="15905">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="310.14542" z="858.0019"/>
 			<Orientation y="2.60816"/>
 			<Actor seed="38048"/>
 		</Entity>
 		<Entity uid="15906">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="307.8448" z="836.85993"/>
 			<Orientation y="4.22167"/>
 			<Actor seed="38048"/>
 		</Entity>
 		<Entity uid="15907">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="302.3986" z="835.88813"/>
 			<Orientation y="7.99732"/>
@@ -74980,35 +74980,35 @@
 			<Actor seed="51714"/>
 		</Entity>
 		<Entity uid="16375">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1274.19251" z="273.31705"/>
 			<Orientation y="-3.05004"/>
 			<Actor seed="56750"/>
 		</Entity>
 		<Entity uid="16376">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="1271.011" z="284.35691"/>
 			<Orientation y="-3.77674"/>
 			<Actor seed="56750"/>
 		</Entity>
 		<Entity uid="16377">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="1269.35621" z="291.34272"/>
 			<Orientation y="-2.39776"/>
 			<Actor seed="23434"/>
 		</Entity>
 		<Entity uid="16378">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="1282.20752" z="268.34244"/>
 			<Orientation y="1.86861"/>
 			<Actor seed="9276"/>
 		</Entity>
 		<Entity uid="16379">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="1276.64454" z="268.40891"/>
 			<Orientation y="-1.88143"/>
@@ -75565,7 +75565,7 @@
 			<Actor seed="26836"/>
 		</Entity>
 		<Entity uid="16507">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>0</Player>
 			<Position x="919.15668" z="91.21317"/>
 			<Orientation y="2.73916"/>
@@ -91135,77 +91135,77 @@
 			<Actor seed="44726"/>
 		</Entity>
 		<Entity uid="19260">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="259.56122" z="726.16327"/>
 			<Orientation y="3.04366"/>
 			<Actor seed="1050"/>
 		</Entity>
 		<Entity uid="19261">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="258.16633" z="735.10181"/>
 			<Orientation y="3.04366"/>
 			<Actor seed="1050"/>
 		</Entity>
 		<Entity uid="19262">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="229.14142" z="693.11927"/>
 			<Orientation y="3.05301"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19263">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="228.1555" z="708.5683"/>
 			<Orientation y="3.05301"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19264">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="211.749" z="699.30555"/>
 			<Orientation y="3.05301"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19265">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="211.09577" z="706.91968"/>
 			<Orientation y="3.05301"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19266">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="212.11182" z="691.44117"/>
 			<Orientation y="3.05301"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19267">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="224.50641" z="688.0954"/>
 			<Orientation y="4.65462"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19268">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="215.12601" z="687.67548"/>
 			<Orientation y="4.65462"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19269">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="223.16443" z="712.7989"/>
 			<Orientation y="4.65462"/>
 			<Actor seed="3200"/>
 		</Entity>
 		<Entity uid="19270">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="213.9369" z="711.90558"/>
 			<Orientation y="4.65462"/>
@@ -91351,7 +91351,7 @@
 			<Actor seed="51482"/>
 		</Entity>
 		<Entity uid="19305">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="299.66651" z="698.89106"/>
 			<Orientation y="3.0031"/>
@@ -91365,84 +91365,84 @@
 			<Actor seed="3071"/>
 		</Entity>
 		<Entity uid="19307">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="172.35648" z="659.94227"/>
 			<Orientation y="2.98314"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19308">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="147.55073" z="656.2364"/>
 			<Orientation y="3.0031"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19309">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="148.06669" z="652.71094"/>
 			<Orientation y="3.0031"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19310">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="145.52161" z="671.30854"/>
 			<Orientation y="3.0031"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19311">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="144.94217" z="674.67707"/>
 			<Orientation y="3.0031"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19312">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="153.83872" z="648.93616"/>
 			<Orientation y="7.68508"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19313">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="170.22333" z="675.26777"/>
 			<Orientation y="2.98996"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19314">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="169.84284" z="678.2851"/>
 			<Orientation y="2.98996"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19315">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="173.18607" z="654.44349"/>
 			<Orientation y="2.98314"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19316">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="164.42362" z="682.29261"/>
 			<Orientation y="4.5721"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19317">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="148.88694" z="680.18354"/>
 			<Orientation y="4.55021"/>
 			<Actor seed="37750"/>
 		</Entity>
 		<Entity uid="19318">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="156.56196" z="681.33918"/>
 			<Orientation y="4.57161"/>
@@ -91487,7 +91487,7 @@
 			<Actor seed="1246"/>
 		</Entity>
 		<Entity uid="19326">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="235.92127" z="581.19007"/>
 			<Orientation y="3.0031"/>
@@ -91836,224 +91836,224 @@
 			<Actor seed="2028"/>
 		</Entity>
 		<Entity uid="19386">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="913.10987" z="1138.72889"/>
 			<Orientation y="-1.62334"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19387">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="896.91517" z="1137.60792"/>
 			<Orientation y="-1.62334"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19388">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="896.12037" z="1163.44129"/>
 			<Orientation y="-1.62334"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19389">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="913.36585" z="1164.53931"/>
 			<Orientation y="-1.62334"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19390">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="917.85566" z="1160.4408"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19391">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="917.95276" z="1143.60877"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19392">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1035.93006" z="1201.63648"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19393">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1036.15455" z="1192.2959"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19394">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1072.21253" z="1193.14563"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19395">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1072.0835" z="1202.44605"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19396">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1071.99488" z="1211.65967"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19397">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1072.08777" z="1215.41749"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19398">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1071.99" z="1224.70435"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19399">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1071.88965" z="1234.10352"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19400">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1035.46875" z="1223.6504"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19401">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1035.19129" z="1233.09351"/>
 			<Orientation y="-3.17089"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19402">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1039.86219" z="1238.02015"/>
 			<Orientation y="-7.8981"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19403">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1067.37745" z="1238.4452"/>
 			<Orientation y="-7.89811"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19404">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1067.45716" z="1188.28199"/>
 			<Orientation y="-7.89811"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19405">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1040.97437" z="1187.88953"/>
 			<Orientation y="-7.89811"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19406">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1151.32972" z="1271.78931"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19407">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1151.23072" z="1268.49122"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19408">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1188.20838" z="1271.6897"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19409">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1188.2815" z="1268.47376"/>
 			<Orientation y="3.13756"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19410">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1155.80323" z="1263.87171"/>
 			<Orientation y="1.57383"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19411">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1165.0724" z="1263.86207"/>
 			<Orientation y="1.57384"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19412">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1174.46851" z="1263.86316"/>
 			<Orientation y="1.57384"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19413">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1183.73011" z="1263.86084"/>
 			<Orientation y="1.57384"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19414">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1155.92261" z="1276.41773"/>
 			<Orientation y="1.57384"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19415">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1162.50403" z="1276.35279"/>
 			<Orientation y="1.57384"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19416">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1177.41187" z="1276.33924"/>
 			<Orientation y="1.57384"/>
 			<Actor seed="8574"/>
 		</Entity>
 		<Entity uid="19417">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="1183.67981" z="1276.33973"/>
 			<Orientation y="1.57384"/>
@@ -93854,35 +93854,35 @@
 			<Actor seed="15302"/>
 		</Entity>
 		<Entity uid="19691">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1371.61048" z="1116.0713"/>
 			<Orientation y="5.21915"/>
 			<Actor seed="42230"/>
 		</Entity>
 		<Entity uid="19692">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1343.11329" z="1104.7588"/>
 			<Orientation y="3.6399"/>
 			<Actor seed="42230"/>
 		</Entity>
 		<Entity uid="19693">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1348.58118" z="1112.04676"/>
 			<Orientation y="3.91594"/>
 			<Actor seed="42230"/>
 		</Entity>
 		<Entity uid="19694">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1362.59693" z="1118.45997"/>
 			<Orientation y="4.70778"/>
 			<Actor seed="42230"/>
 		</Entity>
 		<Entity uid="19695">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>5</Player>
 			<Position x="1354.89112" z="1116.94043"/>
 			<Orientation y="4.1746"/>
@@ -93932,14 +93932,14 @@
 			<Actor seed="21024"/>
 		</Entity>
 		<Entity uid="19705">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1353.22632" z="1079.55677"/>
 			<Orientation y="5.17624"/>
 			<Actor seed="42230"/>
 		</Entity>
 		<Entity uid="19706">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>5</Player>
 			<Position x="1369.14869" z="1071.70069"/>
 			<Orientation y="5.17626"/>
@@ -94222,28 +94222,28 @@
 			<Actor seed="56570"/>
 		</Entity>
 		<Entity uid="19770">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>1</Player>
 			<Position x="853.33619" z="1756.58216"/>
 			<Orientation y="0.81444"/>
 			<Actor seed="4422"/>
 		</Entity>
 		<Entity uid="19771">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>1</Player>
 			<Position x="865.91578" z="1742.79712"/>
 			<Orientation y="0.81914"/>
 			<Actor seed="4422"/>
 		</Entity>
 		<Entity uid="19772">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>1</Player>
 			<Position x="875.47754" z="1752.0597"/>
 			<Orientation y="0.79291"/>
 			<Actor seed="4422"/>
 		</Entity>
 		<Entity uid="19773">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>1</Player>
 			<Position x="862.80933" z="1765.9198"/>
 			<Orientation y="0.85007"/>
@@ -97965,21 +97965,21 @@
 			<Actor seed="47856"/>
 		</Entity>
 		<Entity uid="20471">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="477.76395" z="1755.94385"/>
 			<Orientation y="3.99733"/>
 			<Actor seed="1180"/>
 		</Entity>
 		<Entity uid="20472">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="483.39625" z="1765.10743"/>
 			<Orientation y="0.4557"/>
 			<Actor seed="60402"/>
 		</Entity>
 		<Entity uid="20473">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="474.27491" z="1758.96045"/>
 			<Orientation y="2.61664"/>
@@ -98280,14 +98280,14 @@
 			<Actor seed="63878"/>
 		</Entity>
 		<Entity uid="20528">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="720.17127" z="561.66834"/>
 			<Orientation y="2.88225"/>
 			<Actor seed="57882"/>
 		</Entity>
 		<Entity uid="20529">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="718.98896" z="546.67164"/>
 			<Orientation y="4.63608"/>
@@ -98871,14 +98871,14 @@
 			<Actor seed="24618"/>
 		</Entity>
 		<Entity uid="20674">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>1</Player>
 			<Position x="732.15467" z="1698.95716"/>
 			<Orientation y="0.80233"/>
 			<Actor seed="27250"/>
 		</Entity>
 		<Entity uid="20675">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>1</Player>
 			<Position x="745.41279" z="1686.32691"/>
 			<Orientation y="3.928"/>
@@ -99498,21 +99498,21 @@
 			<Actor seed="26804"/>
 		</Entity>
 		<Entity uid="20824">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>5</Player>
 			<Position x="1391.97291" z="1013.60181"/>
 			<Orientation y="3.66756"/>
 			<Actor seed="41690"/>
 		</Entity>
 		<Entity uid="20825">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>5</Player>
 			<Position x="1394.93873" z="1048.28687"/>
 			<Orientation y="-0.41451"/>
 			<Actor seed="9832"/>
 		</Entity>
 		<Entity uid="20826">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>5</Player>
 			<Position x="1319.55896" z="1077.04236"/>
 			<Orientation y="0.44593"/>
@@ -100921,7 +100921,7 @@
 			<Actor seed="30804"/>
 		</Entity>
 		<Entity uid="21069">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>0</Player>
 			<Position x="1337.58204" z="1215.71802"/>
 			<Orientation y="2.35621"/>
@@ -103260,42 +103260,42 @@
 			<Actor seed="20710"/>
 		</Entity>
 		<Entity uid="21603">
-			<Template>other/stall_med</Template>
+			<Template>structures/stall_med</Template>
 			<Player>2</Player>
 			<Position x="1528.0298" z="361.50831"/>
 			<Orientation y="-5.34188"/>
 			<Actor seed="9832"/>
 		</Entity>
 		<Entity uid="21604">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>2</Player>
 			<Position x="1495.18787" z="466.98542"/>
 			<Orientation y="2.58265"/>
 			<Actor seed="41690"/>
 		</Entity>
 		<Entity uid="21606">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>2</Player>
 			<Position x="1488.76624" z="434.40616"/>
 			<Orientation y="-3.71312"/>
 			<Actor seed="18834"/>
 		</Entity>
 		<Entity uid="21607">
-			<Template>other/stall_big</Template>
+			<Template>structures/stall_big</Template>
 			<Player>2</Player>
 			<Position x="1491.27833" z="457.97855"/>
 			<Orientation y="1.00393"/>
 			<Actor seed="2024"/>
 		</Entity>
 		<Entity uid="21608">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>2</Player>
 			<Position x="1514.36121" z="450.19834"/>
 			<Orientation y="-0.53882"/>
 			<Actor seed="4090"/>
 		</Entity>
 		<Entity uid="21609">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>2</Player>
 			<Position x="1521.68677" z="359.89927"/>
 			<Orientation y="5.663"/>
@@ -104167,21 +104167,21 @@
 			<Actor seed="58988"/>
 		</Entity>
 		<Entity uid="21842">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>2</Player>
 			<Position x="1589.45813" z="500.30729"/>
 			<Orientation y="-3.71027"/>
 			<Actor seed="18000"/>
 		</Entity>
 		<Entity uid="21844">
-			<Template>other/stall_small_a</Template>
+			<Template>structures/stall_small_a</Template>
 			<Player>2</Player>
 			<Position x="1581.25281" z="532.24537"/>
 			<Orientation y="-0.53882"/>
 			<Actor seed="4090"/>
 		</Entity>
 		<Entity uid="21845">
-			<Template>other/stall_small_b</Template>
+			<Template>structures/stall_small_b</Template>
 			<Player>2</Player>
 			<Position x="1592.78345" z="478.21048"/>
 			<Orientation y="5.72356"/>
@@ -104416,133 +104416,133 @@
 			<Actor seed="8812"/>
 		</Entity>
 		<Entity uid="21886">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1644.3141" z="551.97193"/>
 			<Orientation y="2.54957"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21887">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1646.95484" z="548.2292"/>
 			<Orientation y="2.53461"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21888">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1641.61084" z="555.93213"/>
 			<Orientation y="2.53461"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21889">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1652.23731" z="540.78675"/>
 			<Orientation y="2.53998"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21890">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1654.83948" z="537.15241"/>
 			<Orientation y="2.55495"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21891">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1657.5398" z="533.05524"/>
 			<Orientation y="2.53998"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21892">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1659.99915" z="529.4806"/>
 			<Orientation y="2.53998"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21893">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1647.30835" z="515.50696"/>
 			<Orientation y="4.13198"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21894">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1650.93433" z="517.89002"/>
 			<Orientation y="4.13198"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21895">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1655.0879" z="520.5027"/>
 			<Orientation y="4.14695"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21896">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1658.77662" z="523.02723"/>
 			<Orientation y="4.13198"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21897">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1638.38465" z="492.14072"/>
 			<Orientation y="2.54944"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21898">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1636.11304" z="495.702"/>
 			<Orientation y="2.54944"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21899">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1633.53406" z="499.46216"/>
 			<Orientation y="2.56441"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21900">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1631.2057" z="502.94562"/>
 			<Orientation y="2.54944"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21901">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1625.5553" z="478.27625"/>
 			<Orientation y="-2.14263"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21902">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1629.20154" z="480.62803"/>
 			<Orientation y="-2.14263"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21903">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1633.37732" z="483.20511"/>
 			<Orientation y="-2.12766"/>
 			<Actor seed="320"/>
 		</Entity>
 		<Entity uid="21904">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1637.08753" z="485.69788"/>
 			<Orientation y="-2.14263"/>
@@ -109150,14 +109150,14 @@
 			<Actor seed="51306"/>
 		</Entity>
 		<Entity uid="22670">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="256.90564" z="644.25007"/>
 			<Orientation y="1.43776"/>
 			<Actor seed="19832"/>
 		</Entity>
 		<Entity uid="22671">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>3</Player>
 			<Position x="253.82166" z="667.91126"/>
 			<Orientation y="1.43776"/>
@@ -109490,14 +109490,14 @@
 			<Actor seed="46134"/>
 		</Entity>
 		<Entity uid="22737">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="722.86329" z="1649.3838"/>
 			<Orientation y="3.91749"/>
 			<Actor seed="27130"/>
 		</Entity>
 		<Entity uid="22738">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>1</Player>
 			<Position x="728.29316" z="1643.03052"/>
 			<Orientation y="3.9175"/>
@@ -109787,98 +109787,98 @@
 			<Actor seed="23646"/>
 		</Entity>
 		<Entity uid="22789">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1518.82728" z="455.61261"/>
 			<Orientation y="2.54671"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22790">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1520.11158" z="462.05152"/>
 			<Orientation y="4.1243"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22791">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1527.00904" z="465.5495"/>
 			<Orientation y="4.1243"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22792">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1538.7992" z="473.85544"/>
 			<Orientation y="4.1243"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22793">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1543.50245" z="477.38697"/>
 			<Orientation y="4.1243"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22794">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1553.83265" z="469.55683"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22795">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1549.90772" z="475.95368"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22796">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1557.95838" z="461.69352"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22797">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1548.52588" z="458.47663"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22798">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1544.39271" z="463.62449"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22799">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1521.18274" z="452.59662"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22800">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1526.81006" z="443.90387"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22801">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1536.62671" z="449.22355"/>
 			<Orientation y="2.558"/>
 			<Actor seed="31856"/>
 		</Entity>
 		<Entity uid="22802">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>2</Player>
 			<Position x="1532.35535" z="454.52732"/>
 			<Orientation y="2.558"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
@@ -15327,14 +15327,14 @@
 			<Actor seed="44964"/>
 		</Entity>
 		<Entity uid="2720">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="329.80854" z="373.32758"/>
 			<Orientation y="-2.35425"/>
 			<Actor seed="40818"/>
 		</Entity>
 		<Entity uid="2725">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="336.26624" z="384.06067"/>
 			<Orientation y="0.80024"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml
@@ -4496,13 +4496,13 @@
 			<Orientation y="1.4745"/>
 		</Entity>
 		<Entity uid="828">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="916.6037" z="531.7107"/>
 			<Orientation y="3.10434"/>
 		</Entity>
 		<Entity uid="829">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="917.3625" z="544.38178"/>
 			<Orientation y="-0.0089"/>
@@ -21373,112 +21373,112 @@
 			<Actor seed="11530"/>
 		</Entity>
 		<Entity uid="3847">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="528.9137" z="377.94672"/>
 			<Orientation y="1.19265"/>
 			<Actor seed="4548"/>
 		</Entity>
 		<Entity uid="3848">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="612.98945" z="464.62855"/>
 			<Orientation y="3.1078"/>
 			<Actor seed="24982"/>
 		</Entity>
 		<Entity uid="3849">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="542.3954" z="534.37269"/>
 			<Orientation y="0.78655"/>
 			<Actor seed="62340"/>
 		</Entity>
 		<Entity uid="3850">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="551.99164" z="545.76044"/>
 			<Orientation y="0.70086"/>
 			<Actor seed="37494"/>
 		</Entity>
 		<Entity uid="3851">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="562.95881" z="549.2259"/>
 			<Orientation y="1.6118"/>
 			<Actor seed="44230"/>
 		</Entity>
 		<Entity uid="3852">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="541.32203" z="381.45728"/>
 			<Orientation y="-1.85782"/>
 			<Actor seed="6210"/>
 		</Entity>
 		<Entity uid="3853">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="553.53608" z="385.26645"/>
 			<Orientation y="1.57081"/>
 			<Actor seed="18156"/>
 		</Entity>
 		<Entity uid="3854">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="495.78913" z="410.74253"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1660"/>
 		</Entity>
 		<Entity uid="3855">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="483.58555" z="489.26761"/>
 			<Orientation y="-3.1217"/>
 			<Actor seed="34938"/>
 		</Entity>
 		<Entity uid="3856">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="484.09519" z="476.59943"/>
 			<Orientation y="3.03328"/>
 			<Actor seed="22110"/>
 		</Entity>
 		<Entity uid="3857">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="485.23484" z="461.95487"/>
 			<Orientation y="3.12531"/>
 			<Actor seed="44924"/>
 		</Entity>
 		<Entity uid="3858">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="606.99" z="421.49576"/>
 			<Orientation y="-2.69201"/>
 			<Actor seed="41114"/>
 		</Entity>
 		<Entity uid="3859">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="601.0152" z="407.63636"/>
 			<Orientation y="0.43296"/>
 			<Actor seed="35114"/>
 		</Entity>
 		<Entity uid="3860">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="575.41681" z="544.3188"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1954"/>
 		</Entity>
 		<Entity uid="3861">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="611.06733" z="517.6269"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8240"/>
 		</Entity>
 		<Entity uid="3862">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="620.0699" z="512.33381"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
@@ -17461,43 +17461,43 @@
 			<Orientation y="-2.29053"/>
 		</Entity>
 		<Entity uid="3369">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="585.35688" z="440.42075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3370">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="585.4325" z="433.59986"/>
 			<Orientation y="-2.41437"/>
 		</Entity>
 		<Entity uid="3371">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="578.91614" z="433.43848"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3372">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="578.79566" z="440.29636"/>
 			<Orientation y="-2.40989"/>
 		</Entity>
 		<Entity uid="3373">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="506.67444" z="488.45575"/>
 			<Orientation y="-0.97802"/>
 		</Entity>
 		<Entity uid="3374">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="414.13971" z="649.52723"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3375">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="421.39957" z="658.63965"/>
 			<Orientation y="-0.83228"/>
@@ -17515,109 +17515,109 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3378">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="422.19413" z="649.88593"/>
 			<Orientation y="-2.45063"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="413.3975" z="658.0251"/>
 			<Orientation y="-2.49918"/>
 		</Entity>
 		<Entity uid="3380">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="305.54651" z="701.81336"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3381">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="320.4018" z="697.91791"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3382">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="49.67362" z="495.91468"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="57.86857" z="503.85318"/>
 			<Orientation y="2.50278"/>
 		</Entity>
 		<Entity uid="3385">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="42.6346" z="512.16932"/>
 			<Orientation y="-1.53228"/>
 		</Entity>
 		<Entity uid="3387">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="49.81487" z="507.58411"/>
 			<Orientation y="0.64084"/>
 		</Entity>
 		<Entity uid="3391">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="113.84411" z="796.33979"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3392">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="132.55616" z="776.30195"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3393">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="147.10271" z="765.01294"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3394">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="93.80021" z="780.45655"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3395">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="110.07935" z="771.10084"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3396">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="127.12333" z="756.77448"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3397">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="653.73957" z="199.51983"/>
 			<Orientation y="-2.45725"/>
 		</Entity>
 		<Entity uid="3398">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="637.78327" z="177.81696"/>
 			<Orientation y="0.71088"/>
 		</Entity>
 		<Entity uid="3399">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="660.224" z="177.40358"/>
 			<Orientation y="0.67591"/>
 		</Entity>
 		<Entity uid="3400">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="672.74762" z="196.68941"/>
 			<Orientation y="0.70109"/>
@@ -18128,7 +18128,7 @@
 			<Orientation y="-3.07673"/>
 		</Entity>
 		<Entity uid="3489">
-			<Template>other/hellenic_epic_temple</Template>
+			<Template>structures/hellenic_epic_temple</Template>
 			<Player>0</Player>
 			<Position x="903.37134" z="829.54499"/>
 			<Orientation y="-2.33654"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
@@ -17205,19 +17205,19 @@
 			<Orientation y="-2.29053"/>
 		</Entity>
 		<Entity uid="3373">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="506.67444" z="488.45575"/>
 			<Orientation y="-0.97802"/>
 		</Entity>
 		<Entity uid="3374">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="414.13971" z="649.52723"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3375">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="421.39957" z="658.63965"/>
 			<Orientation y="-0.83228"/>
@@ -17235,67 +17235,67 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3378">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="422.19413" z="649.88593"/>
 			<Orientation y="-2.45063"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="413.3975" z="658.0251"/>
 			<Orientation y="-2.49918"/>
 		</Entity>
 		<Entity uid="3382">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="49.67362" z="495.91468"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="57.86857" z="503.85318"/>
 			<Orientation y="2.50278"/>
 		</Entity>
 		<Entity uid="3384">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="109.5661" z="360.96183"/>
 			<Orientation y="-0.51655"/>
 		</Entity>
 		<Entity uid="3385">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="42.6346" z="512.16932"/>
 			<Orientation y="-1.53228"/>
 		</Entity>
 		<Entity uid="3386">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="103.24817" z="371.55991"/>
 			<Orientation y="0.5207"/>
 		</Entity>
 		<Entity uid="3387">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="49.81487" z="507.58411"/>
 			<Orientation y="0.64084"/>
 		</Entity>
 		<Entity uid="3388">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="141.3512" z="296.25824"/>
 			<Orientation y="-2.06267"/>
 		</Entity>
 		<Entity uid="3389">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="139.61326" z="300.03614"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3390">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="151.81688" z="295.16028"/>
 			<Orientation y="-2.39089"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml
@@ -17461,43 +17461,43 @@
 			<Orientation y="-2.29053"/>
 		</Entity>
 		<Entity uid="3369">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="585.35688" z="440.42075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3370">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="585.4325" z="433.59986"/>
 			<Orientation y="-2.41437"/>
 		</Entity>
 		<Entity uid="3371">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="578.91614" z="433.43848"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3372">
-			<Template>other/fence_stone</Template>
+			<Template>structures/fence_stone</Template>
 			<Player>0</Player>
 			<Position x="578.79566" z="440.29636"/>
 			<Orientation y="-2.40989"/>
 		</Entity>
 		<Entity uid="3373">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="506.67444" z="488.45575"/>
 			<Orientation y="-0.97802"/>
 		</Entity>
 		<Entity uid="3374">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="414.13971" z="649.52723"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3375">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="421.39957" z="658.63965"/>
 			<Orientation y="-0.83228"/>
@@ -17515,73 +17515,73 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3378">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="422.19413" z="649.88593"/>
 			<Orientation y="-2.45063"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="413.3975" z="658.0251"/>
 			<Orientation y="-2.49918"/>
 		</Entity>
 		<Entity uid="3380">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="305.54651" z="701.81336"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3381">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="320.4018" z="697.91791"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3382">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="49.67362" z="495.91468"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="57.86857" z="503.85318"/>
 			<Orientation y="2.50278"/>
 		</Entity>
 		<Entity uid="3385">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="42.6346" z="512.16932"/>
 			<Orientation y="-1.53228"/>
 		</Entity>
 		<Entity uid="3387">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="49.81487" z="507.58411"/>
 			<Orientation y="0.64084"/>
 		</Entity>
 		<Entity uid="3397">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="653.73957" z="199.51983"/>
 			<Orientation y="-2.45725"/>
 		</Entity>
 		<Entity uid="3398">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="637.78327" z="177.81696"/>
 			<Orientation y="0.71088"/>
 		</Entity>
 		<Entity uid="3399">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="660.224" z="177.40358"/>
 			<Orientation y="0.67591"/>
 		</Entity>
 		<Entity uid="3400">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>0</Player>
 			<Position x="672.74762" z="196.68941"/>
 			<Orientation y="0.70109"/>
@@ -18092,7 +18092,7 @@
 			<Orientation y="-3.07673"/>
 		</Entity>
 		<Entity uid="3489">
-			<Template>other/hellenic_epic_temple</Template>
+			<Template>structures/hellenic_epic_temple</Template>
 			<Player>0</Player>
 			<Position x="903.37134" z="829.54499"/>
 			<Orientation y="-2.33654"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
@@ -5818,13 +5818,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1123">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="147.88285" z="681.50416"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1124">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="822.1905" z="409.22168"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
@@ -6251,13 +6251,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1123">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="150.59145" z="701.17505"/>
 			<Orientation y="2.02854"/>
 		</Entity>
 		<Entity uid="1124">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="135.30622" z="709.41272"/>
 			<Orientation y="2.0511"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
@@ -10251,103 +10251,103 @@
 			<Orientation y="-1.64686"/>
 		</Entity>
 		<Entity uid="1753">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="453.39554" z="342.39625"/>
 			<Orientation y="-2.28212"/>
 		</Entity>
 		<Entity uid="1754">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="441.94556" z="337.70044"/>
 			<Orientation y="1.60607"/>
 		</Entity>
 		<Entity uid="1755">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="434.47333" z="331.51084"/>
 			<Orientation y="-2.86991"/>
 		</Entity>
 		<Entity uid="1756">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="431.17994" z="321.41153"/>
 			<Orientation y="-2.43848"/>
 		</Entity>
 		<Entity uid="1757">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="727.48194" z="725.95044"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1758">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="739.04371" z="718.8664"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1759">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="747.43244" z="710.6092"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1760">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="751.79633" z="700.52741"/>
 			<Orientation y="-3.08407"/>
 		</Entity>
 		<Entity uid="1761">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="756.3105" z="690.0157"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1762">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="939.09986" z="668.20136"/>
 			<Orientation y="-2.33381"/>
 		</Entity>
 		<Entity uid="1763">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="928.88819" z="658.22217"/>
 			<Orientation y="-2.2777"/>
 		</Entity>
 		<Entity uid="1764">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="918.64893" z="648.68042"/>
 			<Orientation y="-2.27273"/>
 		</Entity>
 		<Entity uid="1765">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="908.9048" z="640.31159"/>
 			<Orientation y="-2.33747"/>
 		</Entity>
 		<Entity uid="1766">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="300.25004" z="675.8642"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1767">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="309.47712" z="666.72876"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1768">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="316.65159" z="653.1695"/>
 			<Orientation y="3.12175"/>
 		</Entity>
 		<Entity uid="1769">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="266.31824" z="692.89246"/>
 			<Orientation y="1.61515"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
@@ -6465,31 +6465,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1405">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="496.08765" z="724.31275"/>
 			<Orientation y="1.44573"/>
 		</Entity>
 		<Entity uid="1406">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="502.48285" z="724.48395"/>
 			<Orientation y="1.56539"/>
 		</Entity>
 		<Entity uid="1407">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="490.16407" z="726.74195"/>
 			<Orientation y="2.26272"/>
 		</Entity>
 		<Entity uid="1408">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="530.77582" z="748.2674"/>
 			<Orientation y="-3.03037"/>
 		</Entity>
 		<Entity uid="1409">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="529.56043" z="741.67463"/>
 			<Orientation y="-2.77076"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
@@ -3776,49 +3776,49 @@
 			<Orientation y="2.60311"/>
 		</Entity>
 		<Entity uid="3617">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="296.10505" z="431.6443"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3618">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="709.8191" z="398.07828"/>
 			<Orientation y="0.08059"/>
 		</Entity>
 		<Entity uid="3619">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="863.97327" z="637.22767"/>
 			<Orientation y="-2.03243"/>
 		</Entity>
 		<Entity uid="3620">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="555.74457" z="960.27857"/>
 			<Orientation y="-1.57081"/>
 		</Entity>
 		<Entity uid="3621">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="1061.98572" z="684.01221"/>
 			<Orientation y="1.03975"/>
 		</Entity>
 		<Entity uid="3622">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="223.57612" z="819.1219"/>
 			<Orientation y="-1.90833"/>
 		</Entity>
 		<Entity uid="3623">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="712.2732" z="103.82981"/>
 			<Orientation y="1.16005"/>
 		</Entity>
 		<Entity uid="3624">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>0</Player>
 			<Position x="101.05231" z="399.17402"/>
 			<Orientation y="0.86027"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
@@ -2894,25 +2894,25 @@
 			<Orientation y="-0.9999"/>
 		</Entity>
 		<Entity uid="550">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>1</Player>
 			<Position x="387.29252" z="653.32911"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="551">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>2</Player>
 			<Position x="882.45167" z="641.89344"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="552">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>3</Player>
 			<Position x="629.11597" z="418.71073"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="553">
-			<Template>other/obelisk</Template>
+			<Template>structures/obelisk</Template>
 			<Player>4</Player>
 			<Position x="644.30268" z="875.67334"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
@@ -25970,14 +25970,14 @@
 			<Actor seed="47424"/>
 		</Entity>
 		<Entity uid="4390">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="513.30457" z="520.78657"/>
 			<Orientation y="1.57392"/>
 			<Actor seed="23968"/>
 		</Entity>
 		<Entity uid="4391">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="503.62723" z="520.94581"/>
 			<Orientation y="-1.5755"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml
@@ -3441,7 +3441,7 @@
 			<Actor seed="23720"/>
 		</Entity>
 		<Entity uid="934">
-			<Template>other/generic_field</Template>
+			<Template>structures/generic_field</Template>
 			<Player>1</Player>
 			<Position x="472.48322" z="175.07694"/>
 			<Orientation y="2.83466"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
@@ -19580,229 +19580,229 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3515">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="891.99042" z="1413.9032"/>
 			<Orientation y="-2.13431"/>
 		</Entity>
 		<Entity uid="3516">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="865.60029" z="1433.78602"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3517">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="866.23407" z="1453.51233"/>
 			<Orientation y="-2.39946"/>
 		</Entity>
 		<Entity uid="3518">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="878.50873" z="1457.07044"/>
 			<Orientation y="0.83712"/>
 		</Entity>
 		<Entity uid="3519">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="891.34559" z="1455.69666"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3520">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="901.72614" z="1418.1355"/>
 			<Orientation y="-1.92284"/>
 		</Entity>
 		<Entity uid="3521">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="883.57056" z="1419.58204"/>
 			<Orientation y="-0.74813"/>
 		</Entity>
 		<Entity uid="3522">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="888.50696" z="1418.27405"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3523">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="895.06592" z="1422.59913"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3524">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="899.08582" z="1410.31934"/>
 			<Orientation y="-2.08594"/>
 		</Entity>
 		<Entity uid="3525">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="886.65992" z="1403.73511"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3526">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="860.45441" z="1444.86976"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3527">
-			<Template>other/column_doric</Template>
+			<Template>structures/column_doric</Template>
 			<Player>0</Player>
 			<Position x="870.41431" z="1453.64747"/>
 			<Orientation y="-0.84855"/>
 		</Entity>
 		<Entity uid="3528">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="575.54151" z="850.07319"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3529">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="585.70685" z="854.00947"/>
 			<Orientation y="0.22309"/>
 		</Entity>
 		<Entity uid="3530">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="611.97376" z="821.9198"/>
 			<Orientation y="-1.6266"/>
 		</Entity>
 		<Entity uid="3531">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="581.02253" z="818.92243"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3532">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="572.96296" z="838.65656"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3533">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="577.08796" z="842.19727"/>
 			<Orientation y="1.38094"/>
 		</Entity>
 		<Entity uid="3534">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="583.77491" z="845.36121"/>
 			<Orientation y="0.59195"/>
 		</Entity>
 		<Entity uid="3535">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="609.49457" z="835.12464"/>
 			<Orientation y="-2.04274"/>
 		</Entity>
 		<Entity uid="3536">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="602.26301" z="825.93836"/>
 			<Orientation y="1.29918"/>
 		</Entity>
 		<Entity uid="3537">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="610.02527" z="828.51392"/>
 			<Orientation y="-2.26378"/>
 		</Entity>
 		<Entity uid="3538">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="598.35376" z="817.83643"/>
 			<Orientation y="1.26758"/>
 		</Entity>
 		<Entity uid="3539">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="592.30799" z="855.13923"/>
 			<Orientation y="-2.33675"/>
 		</Entity>
 		<Entity uid="3540">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="585.36493" z="820.8755"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3541">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="591.93012" z="825.01478"/>
 			<Orientation y="-2.23362"/>
 		</Entity>
 		<Entity uid="3542">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="608.22858" z="819.69623"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3543">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="616.27839" z="817.65662"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3544">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1262.35596" z="858.92853"/>
 			<Orientation y="-2.05765"/>
 		</Entity>
 		<Entity uid="3545">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1255.9242" z="864.9756"/>
 			<Orientation y="0.28136"/>
 		</Entity>
 		<Entity uid="3546">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1253.53089" z="876.40943"/>
 			<Orientation y="-1.93824"/>
 		</Entity>
 		<Entity uid="3547">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1291.17579" z="871.4795"/>
 			<Orientation y="1.03689"/>
 		</Entity>
 		<Entity uid="3548">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1286.6526" z="883.14637"/>
 			<Orientation y="-2.33463"/>
 		</Entity>
 		<Entity uid="3549">
-			<Template>other/column_doric_fallen_b</Template>
+			<Template>structures/column_doric_fallen_b</Template>
 			<Player>0</Player>
 			<Position x="1286.36768" z="847.41889"/>
 			<Orientation y="0.0768"/>
 		</Entity>
 		<Entity uid="3550">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1268.40052" z="854.12092"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3551">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1294.12574" z="852.45057"/>
 			<Orientation y="-1.93851"/>
 		</Entity>
 		<Entity uid="3552">
-			<Template>other/column_doric_fallen</Template>
+			<Template>structures/column_doric_fallen</Template>
 			<Player>0</Player>
 			<Position x="1255.75391" z="882.90625"/>
 			<Orientation y="0.21567"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
@@ -57,14 +57,14 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="17">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="415.97614" z="473.14173"/>
 			<Orientation y="1.21338"/>
 			<Actor seed="9104"/>
 		</Entity>
 		<Entity uid="18">
-			<Template>other/bridge_wooden</Template>
+			<Template>structures/bridge_wooden</Template>
 			<Player>0</Player>
 			<Position x="409.78592" z="463.34095"/>
 			<Orientation y="-1.95751"/>
@@ -8285,49 +8285,49 @@
 			<Actor seed="44484"/>
 		</Entity>
 		<Entity uid="1316">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="440.65976" z="407.74143"/>
 			<Orientation y="2.33256"/>
 			<Actor seed="958"/>
 		</Entity>
 		<Entity uid="1317">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="447.43458" z="400.22822"/>
 			<Orientation y="-0.6295"/>
 			<Actor seed="24922"/>
 		</Entity>
 		<Entity uid="1318">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="456.43195" z="388.53714"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19754"/>
 		</Entity>
 		<Entity uid="1323">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="493.10898" z="354.40442"/>
 			<Orientation y="2.17077"/>
 			<Actor seed="39044"/>
 		</Entity>
 		<Entity uid="1324">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="522.20606" z="362.16324"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35660"/>
 		</Entity>
 		<Entity uid="1325">
-			<Template>other/fence_long</Template>
+			<Template>structures/fence_long</Template>
 			<Player>0</Player>
 			<Position x="569.77521" z="306.49317"/>
 			<Orientation y="2.1344"/>
 			<Actor seed="55388"/>
 		</Entity>
 		<Entity uid="1326">
-			<Template>other/bench</Template>
+			<Template>structures/bench</Template>
 			<Player>0</Player>
 			<Position x="394.40577" z="481.4438"/>
 			<Orientation y="3.08999"/>
@@ -11731,21 +11731,21 @@
 			<Actor seed="34700"/>
 		</Entity>
 		<Entity uid="1839">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="361.20942" z="567.74927"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32506"/>
 		</Entity>
 		<Entity uid="1840">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="374.12647" z="551.82575"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46374"/>
 		</Entity>
 		<Entity uid="1841">
-			<Template>other/fence_short</Template>
+			<Template>structures/fence_short</Template>
 			<Player>0</Player>
 			<Position x="372.29242" z="589.67853"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml
+++ ps/trunk/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml
@@ -2810,13 +2810,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="609">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="350.30353" z="582.69074"/>
 			<Orientation y="-0.15276"/>
 		</Entity>
 		<Entity uid="610">
-			<Template>other/bridge_hele</Template>
+			<Template>structures/bridge_hele</Template>
 			<Player>0</Player>
 			<Position x="350.43921" z="574.88343"/>
 			<Orientation y="3.02306"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/bench.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/bench.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/bench.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="1.5" depth="4.25"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>75</Max>
-  </Health>
-  <Identity>
-    <GenericName>Bench</GenericName>
-    <SpecificName>Wooden Bench</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Minimap>
-    <Color r="119" g="82" b="46"/>
-  </Minimap>
-  <Obstruction>
-    <Static width="1.5" depth="4.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>10</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/eyecandy/bench_1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Capturable disable=""/>
-  <Footprint>
-    <Square width="62" depth="15.5"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <Max>200000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Bridge</GenericName>
-    <SpecificName>Bridge</SpecificName>
-    <Icon>gaia/special_blank.png</Icon>
-  </Identity>
-  <Minimap disable=""/>
-  <Obstruction>
-    <Obstructions>
-      <Edge width="59" depth="4" x="0" z="5"/>
-    </Obstructions>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Selectable>
-    <EditorOnly/>
-  </Selectable>
-  <VisualActor>
-    <Actor>props/special/eyecandy/bridge_edge_hele.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Capturable disable=""/>
-  <Footprint>
-    <Square width="62" depth="15.5"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <Max>200000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Wooden Bridge</GenericName>
-    <SpecificName>Wooden Bridge</SpecificName>
-    <Icon>gaia/special_blank.png</Icon>
-  </Identity>
-  <Minimap disable=""/>
-  <Obstruction>
-    <Obstructions>
-      <Edge width="59" depth="4" x="0" z="5"/>
-    </Obstructions>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Selectable>
-    <EditorOnly/>
-  </Selectable>
-  <VisualActor>
-    <Actor>props/special/eyecandy/bridge_edge_wooden.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/celt_hut.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/celt_hut.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/celt_hut.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-    <Resources>
-      <food>0</food>
-      <wood>50</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Circle radius="4.5"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Health>
-    <Max>500</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <SpecificName>Hut</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <StatusBars>
-    <HeightOffset>7.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>structures/celts/hut.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/celt_longhouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/celt_longhouse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/celt_longhouse.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>100</wood>
-      <stone>100</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="12" depth="16.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1000</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Longhouse</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="10.0" depth="14.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <VisualActor>
-    <Actor>structures/celts/longhouse.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="2.5" depth="2.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Identity>
-    <GenericName>Column</GenericName>
-    <SpecificName>Doric Column</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="2.0" depth="2.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/eyecandy/column_doric.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="2.5" depth="12.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Identity>
-    <GenericName>Column</GenericName>
-    <SpecificName>Fallen Doric Column</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="2.0" depth="12.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="2.5" depth="2.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Column</GenericName>
-    <SpecificName>Fallen Doric Column</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>10</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="2.0" depth="2.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/eyecandy/column_doric_fallen_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/desert_trading_post.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/desert_trading_post.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/desert_trading_post.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_economic_market">
-  <Capturable>
-    <CapturePoints>500</CapturePoints>
-  </Capturable>
-  <Footprint>
-    <Square width="26.0" depth="26.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Desert Trading Post</GenericName>
-    <SpecificName>Ardatašta</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -unlock_shared_los
-      -unlock_shared_dropsites
-      -trade_convoys_speed
-      -trade_convoys_armor
-      -trade_gain_01
-      -trade_gain_02
-      -trade_commercial_treaty
-    </Technologies>
-  </ProductionQueue>
-  <TerritoryDecay disable=""/>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>structures/persians/market.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_long.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Capturable disable=""/>
-  <Footprint>
-    <Square width="0.8" depth="13.0"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Fence</GenericName>
-    <SpecificName>Long Wooden Fence</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-  </Loot>
-  <Minimap>
-    <Color r="119" g="82" b="46"/>
-  </Minimap>
-  <Obstruction>
-    <Static width="1.5" depth="13.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>10</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>temp/fence_wood_long_a.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>12</Length>
-    <Orientation>0.5</Orientation>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_short.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Capturable disable=""/>
-  <Footprint>
-    <Square width="0.8" depth="6.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>50</Max>
-  </Health>
-  <Identity>
-    <GenericName>Fence</GenericName>
-    <SpecificName>Short Wooden Fence</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Minimap>
-    <Color r="119" g="82" b="46"/>
-  </Minimap>
-  <Obstruction>
-    <Static width="1.5" depth="6.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>10</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay disable=""/>
-  <Visibility>
-    <RetainInFog>true</RetainInFog>
-  </Visibility>
-  <VisualActor>
-    <Actor>temp/fence_wood_short_a.xml</Actor>
-  </VisualActor>
-  <WallPiece>
-    <Length>6</Length>
-    <Orientation>0.5</Orientation>
-  </WallPiece>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Capturable disable=""/>
-  <Footprint>
-    <Square width="1.5" depth="11.0"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Identity>
-    <GenericName>Stone Fence</GenericName>
-    <SpecificName>Stone Fence</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="1.5" depth="10.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>10</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/eyecandy/fence_stone_medit.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/generic_field.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/generic_field.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/generic_field.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_resource_field">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Wheat Field</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/plot_field_new.xml</Actor>
-    <FoundationActor>structures/plot_field_new.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_temple">
-  <Cost>
-    <BuildTime>500</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>1000</stone>
-      <metal>500</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="28.0" depth="58.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>30</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>5000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Epic Temple</GenericName>
-    <SpecificName>Naos Parthenos</SpecificName>
-    <Tooltip>Garrison units to heal them at a quick rate.</Tooltip>
-  </Identity>
-  <Loot>
-    <stone>200</stone>
-    <metal>500</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="27.0" depth="57.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <TerritoryInfluence>
-    <Radius>60</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-    <Actor>structures/hellenes/temple_epic.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="28.0" depth="32.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Portico</GenericName>
-    <SpecificName>Propylaea</SpecificName>
-    <Icon>structures/tholos.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>75</stone>
-    <metal>75</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="26.0" depth="30.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>40</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>structures/hellenes/propylaea.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>Stoa</Category>
-  </BuildRestrictions>
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>110</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>100</stone>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="28" depth="12.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Stoa</SpecificName>
-    <Icon>gaia/special_stoa.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="26.0" depth="10.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <RallyPoint disable=""/>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>36</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>special/greek_stoa.xml</Actor>
-    <FoundationActor>structures/fndn_6x4.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="4.5" depth="4.5"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Obelisk</GenericName>
-    <SpecificName>Egyptian Obelisk</SpecificName>
-    <Icon>gaia/special_obelisk.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>200</stone>
-    <metal>200</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="4.0" depth="4.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>10</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/eyecandy/obelisk.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="1.6" depth="1.6"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Identity>
-    <GenericName>Colonnade</GenericName>
-    <SpecificName>Corinthian Colonnade</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="1.5" depth="1.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>props/special/eyecandy/sele_colonnade.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_big.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_big.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_big.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Footprint>
-    <Square width="12" depth="11"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Big stall</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="10" depth="9"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/ptolemies/stall_big.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_med.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_med.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_med.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Footprint>
-    <Square width="15" depth="8"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Medium stall</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="13" depth="6"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/ptolemies/stall_med.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_small_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_small_a.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_small_a.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Footprint>
-    <Square width="6" depth="6"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Small stall</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="4" depth="4"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/ptolemies/stall_small_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_small_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_small_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/stall_small_b.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Footprint>
-    <Square width="6" depth="6"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Small stall</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="4" depth="4"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/ptolemies/stall_small_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="4.0" depth="5.25"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Table</GenericName>
-    <SpecificName>Rectangle Table</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-  </Loot>
-  <Minimap>
-    <Color r="119" g="82" b="46"/>
-  </Minimap>
-  <Obstruction>
-    <Static width="3.5" depth="4.75"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>10</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/eyecandy/table_rectangle.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/table_square.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/table_square.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/table_square.xml
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Footprint>
-    <Square width="4.5" depth="4.5"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Table</GenericName>
-    <SpecificName>Square Table</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-  </Loot>
-  <Minimap>
-    <Color r="119" g="82" b="46"/>
-  </Minimap>
-  <Obstruction>
-    <Static width="4.0" depth="4.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>10</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>props/special/eyecandy/table_square.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/bench.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/bench.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/bench.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="1.5" depth="4.25"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>75</Max>
+  </Health>
+  <Identity>
+    <GenericName>Bench</GenericName>
+    <SpecificName>Wooden Bench</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Minimap>
+    <Color r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="1.5" depth="4.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/eyecandy/bench_1.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/bridge_hele.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/bridge_hele.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/bridge_hele.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Capturable disable=""/>
+  <Footprint>
+    <Square width="62" depth="15.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Bridge</GenericName>
+    <SpecificName>Bridge</SpecificName>
+    <Icon>gaia/special_blank.png</Icon>
+  </Identity>
+  <Minimap disable=""/>
+  <Obstruction>
+    <Obstructions>
+      <Edge width="59" depth="4" x="0" z="5"/>
+    </Obstructions>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Selectable>
+    <EditorOnly/>
+  </Selectable>
+  <VisualActor>
+    <Actor>props/special/eyecandy/bridge_edge_hele.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/bridge_wooden.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/bridge_wooden.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/bridge_wooden.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Capturable disable=""/>
+  <Footprint>
+    <Square width="62" depth="15.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Wooden Bridge</GenericName>
+    <SpecificName>Wooden Bridge</SpecificName>
+    <Icon>gaia/special_blank.png</Icon>
+  </Identity>
+  <Minimap disable=""/>
+  <Obstruction>
+    <Obstructions>
+      <Edge width="59" depth="4" x="0" z="5"/>
+    </Obstructions>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Selectable>
+    <EditorOnly/>
+  </Selectable>
+  <VisualActor>
+    <Actor>props/special/eyecandy/bridge_edge_wooden.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/celt_hut.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/celt_hut.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/celt_hut.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Cost>
+    <PopulationBonus>2</PopulationBonus>
+    <Resources>
+      <food>0</food>
+      <wood>50</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Circle radius="4.5"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Health>
+    <Max>500</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <SpecificName>Hut</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <StatusBars>
+    <HeightOffset>7.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>structures/celts/hut.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/celt_longhouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/celt_longhouse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/celt_longhouse.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>300</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>100</wood>
+      <stone>100</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="12" depth="16.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Longhouse</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="14.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <VisualActor>
+    <Actor>structures/celts/longhouse.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="2.5" depth="2.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Column</GenericName>
+    <SpecificName>Doric Column</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>20</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="2.0" depth="2.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric_fallen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric_fallen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric_fallen.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="2.5" depth="12.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Column</GenericName>
+    <SpecificName>Fallen Doric Column</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>20</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="2.0" depth="12.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric_fallen_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric_fallen_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/column_doric_fallen_b.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="2.5" depth="2.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Identity>
+    <GenericName>Column</GenericName>
+    <SpecificName>Fallen Doric Column</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>10</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="2.0" depth="2.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric_fallen_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_economic_market">
+  <Capturable>
+    <CapturePoints>500</CapturePoints>
+  </Capturable>
+  <Footprint>
+    <Square width="26.0" depth="26.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Desert Trading Post</GenericName>
+    <SpecificName>Ardatašta</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24.0" depth="24.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <Technologies datatype="tokens">
+      -unlock_shared_los
+      -unlock_shared_dropsites
+      -trade_convoys_speed
+      -trade_convoys_armor
+      -trade_gain_01
+      -trade_gain_02
+      -trade_commercial_treaty
+    </Technologies>
+  </ProductionQueue>
+  <TerritoryDecay disable=""/>
+  <TerritoryInfluence disable=""/>
+  <VisualActor>
+    <Actor>structures/persians/market.xml</Actor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_long.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Capturable disable=""/>
+  <Footprint>
+    <Square width="0.8" depth="13.0"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Identity>
+    <GenericName>Fence</GenericName>
+    <SpecificName>Long Wooden Fence</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <wood>20</wood>
+  </Loot>
+  <Minimap>
+    <Color r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="1.5" depth="13.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>temp/fence_wood_long_a.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>12</Length>
+    <Orientation>0.5</Orientation>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_short.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Capturable disable=""/>
+  <Footprint>
+    <Square width="0.8" depth="6.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
+  <Identity>
+    <GenericName>Fence</GenericName>
+    <SpecificName>Short Wooden Fence</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Minimap>
+    <Color r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="1.5" depth="6.5"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay disable=""/>
+  <Visibility>
+    <RetainInFog>true</RetainInFog>
+  </Visibility>
+  <VisualActor>
+    <Actor>temp/fence_wood_short_a.xml</Actor>
+  </VisualActor>
+  <WallPiece>
+    <Length>6</Length>
+    <Orientation>0.5</Orientation>
+  </WallPiece>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/fence_stone.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Capturable disable=""/>
+  <Footprint>
+    <Square width="1.5" depth="11.0"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Stone Fence</GenericName>
+    <SpecificName>Stone Fence</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>20</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="1.5" depth="10.5"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>10</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/eyecandy/fence_stone_medit.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/generic_field.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/generic_field.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/generic_field.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_resource_field">
+  <Footprint>
+    <Square width="30.0" depth="30.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Wheat Field</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/plot_field_new.xml</Actor>
+    <FoundationActor>structures/plot_field_new.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_epic_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_epic_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_epic_temple.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_temple">
+  <Cost>
+    <BuildTime>500</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>1000</stone>
+      <metal>500</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="28.0" depth="58.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>30</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>5000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Epic Temple</GenericName>
+    <SpecificName>Naos Parthenos</SpecificName>
+    <Tooltip>Garrison units to heal them at a quick rate.</Tooltip>
+  </Identity>
+  <Loot>
+    <stone>200</stone>
+    <metal>500</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="27.0" depth="57.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <TerritoryInfluence>
+    <Radius>60</Radius>
+    <Weight>65535</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+    <Actor>structures/hellenes/temple_epic.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_propylaea.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_propylaea.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_propylaea.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic">
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>200</stone>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="28.0" depth="32.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Portico</GenericName>
+    <SpecificName>Propylaea</SpecificName>
+    <Icon>structures/tholos.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>75</stone>
+    <metal>75</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="26.0" depth="30.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>40</Radius>
+    <Weight>65535</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>20</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/hellenes/propylaea.xml</Actor>
+    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic">
+  <BuildRestrictions>
+    <Category>Stoa</Category>
+  </BuildRestrictions>
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>110</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>100</stone>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="28" depth="12.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1100</Max>
+  </Health>
+  <Identity>
+    <GenericName>Stoa</GenericName>
+    <SpecificName>Hellenic Stoa</SpecificName>
+    <Icon>gaia/special_stoa.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>50</stone>
+    <metal>50</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="26.0" depth="10.5"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <RallyPoint disable=""/>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>36</Radius>
+    <Weight>65535</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>40</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>special/greek_stoa.xml</Actor>
+    <FoundationActor>structures/fndn_6x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/obelisk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/obelisk.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/obelisk.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="4.5" depth="4.5"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Obelisk</GenericName>
+    <SpecificName>Egyptian Obelisk</SpecificName>
+    <Icon>gaia/special_obelisk.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>200</stone>
+    <metal>200</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="4.0" depth="4.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>10</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/eyecandy/obelisk.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_colonnade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_colonnade.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_colonnade.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="1.6" depth="1.6"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Colonnade</GenericName>
+    <SpecificName>Corinthian Colonnade</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>20</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="1.5" depth="1.5"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>props/special/eyecandy/sele_colonnade.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_big.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_big.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_big.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Footprint>
+    <Square width="12" depth="11"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Big stall</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="10" depth="9"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/ptolemies/stall_big.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_med.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_med.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_med.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Footprint>
+    <Square width="15" depth="8"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Medium stall</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="13" depth="6"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/ptolemies/stall_med.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_small_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_small_a.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_small_a.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Footprint>
+    <Square width="6" depth="6"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Small stall</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="4" depth="4"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/ptolemies/stall_small_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_small_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_small_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/stall_small_b.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Footprint>
+    <Square width="6" depth="6"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Small stall</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="4" depth="4"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/ptolemies/stall_small_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/table_rectangle.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/table_rectangle.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/table_rectangle.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="4.0" depth="5.25"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Identity>
+    <GenericName>Table</GenericName>
+    <SpecificName>Rectangle Table</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <wood>20</wood>
+  </Loot>
+  <Minimap>
+    <Color r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="3.5" depth="4.75"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/eyecandy/table_rectangle.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/table_square.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/table_square.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/table_square.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Footprint>
+    <Square width="4.5" depth="4.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Identity>
+    <GenericName>Table</GenericName>
+    <SpecificName>Square Table</SpecificName>
+    <Icon>gaia/special_fence.png</Icon>
+  </Identity>
+  <Loot>
+    <wood>20</wood>
+  </Loot>
+  <Minimap>
+    <Color r="119" g="82" b="46"/>
+  </Minimap>
+  <Obstruction>
+    <Static width="4.0" depth="4.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>props/special/eyecandy/table_square.xml</Actor>
+  </VisualActor>
+</Entity>