Index: binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
+++ binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
@@ -8955,79 +8955,79 @@
 			<Orientation y="-0.30507"/>
 		</Entity>
 		<Entity uid="1974">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="933.10273" z="1236.72986"/>
 			<Orientation y="-2.88514"/>
 		</Entity>
 		<Entity uid="1975">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="932.57361" z="1228.01307"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1976">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="932.90815" z="1216.13636"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1977">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="935.34015" z="1244.63233"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1978">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="941.09919" z="1234.65027"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1979">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="941.25824" z="1226.396"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1980">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="940.8769" z="1219.78028"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1981">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="963.03284" z="945.77503"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1982">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="962.78125" z="938.45405"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1983">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="953.31354" z="936.4272"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1984">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="945.27167" z="943.00428"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1985">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="946.37781" z="950.33918"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1986">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="956.13117" z="951.81959"/>
 			<Orientation y="2.35621"/>
@@ -13745,55 +13745,55 @@
 			<Orientation y="1.82416"/>
 		</Entity>
 		<Entity uid="2883">
-			<Template>gaia/special_treasure_metal</Template>
+			<Template>gaia/treasure/metal</Template>
 			<Player>0</Player>
 			<Position x="825.5589" z="1268.04029"/>
 			<Orientation y="-2.636"/>
 		</Entity>
 		<Entity uid="2884">
-			<Template>gaia/special_treasure_metal</Template>
+			<Template>gaia/treasure/metal</Template>
 			<Player>0</Player>
 			<Position x="824.98072" z="1265.92225"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2885">
-			<Template>gaia/special_treasure_metal</Template>
+			<Template>gaia/treasure/metal</Template>
 			<Player>0</Player>
 			<Position x="823.32917" z="1267.72693"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2886">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="825.23365" z="1271.52686"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2887">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="814.56025" z="1248.90162"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2888">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="818.71534" z="1246.40845"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2889">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="816.8249" z="1245.24646"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2890">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="819.75458" z="1244.03321"/>
 			<Orientation y="0.97309"/>
 		</Entity>
 		<Entity uid="2891">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="812.3614" z="1243.61878"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Death Canyon - Invasion Force.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Death Canyon - Invasion Force.xml
+++ binaries/data/mods/public/maps/scenarios/Death Canyon - Invasion Force.xml
@@ -1477,97 +1477,97 @@
 			<Orientation y="2.73656"/>
 		</Entity>
 		<Entity uid="413">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="363.65427" z="192.64823"/>
 			<Orientation y="1.504"/>
 		</Entity>
 		<Entity uid="414">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="371.36197" z="188.06452"/>
 			<Orientation y="3.03803"/>
 		</Entity>
 		<Entity uid="415">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="366.99085" z="187.67687"/>
 			<Orientation y="0.5253"/>
 		</Entity>
 		<Entity uid="416">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="368.5152" z="189.66633"/>
 			<Orientation y="3.10686"/>
 		</Entity>
 		<Entity uid="417">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="368.70081" z="185.36905"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="418">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="361.02338" z="190.55353"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="419">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="366.94678" z="184.20574"/>
 			<Orientation y="2.95282"/>
 		</Entity>
 		<Entity uid="420">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="359.03318" z="182.67383"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="421">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="719.67603" z="781.61274"/>
 			<Orientation y="0.8997"/>
 		</Entity>
 		<Entity uid="422">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="714.65516" z="781.44092"/>
 			<Orientation y="-2.92338"/>
 		</Entity>
 		<Entity uid="423">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="713.66126" z="777.13123"/>
 			<Orientation y="0.47428"/>
 		</Entity>
 		<Entity uid="424">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="711.93274" z="781.73591"/>
 			<Orientation y="-1.20098"/>
 		</Entity>
 		<Entity uid="425">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="718.20148" z="775.159"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="426">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="716.10364" z="773.64478"/>
 			<Orientation y="2.74392"/>
 		</Entity>
 		<Entity uid="427">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="723.95295" z="778.32642"/>
 			<Orientation y="-1.91301"/>
 		</Entity>
 		<Entity uid="428">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="710.87098" z="778.34778"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Migration.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Migration.xml
+++ binaries/data/mods/public/maps/scenarios/Migration.xml
@@ -4601,19 +4601,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1000">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="766.01514" z="744.31965"/>
 			<Orientation y="0.26304"/>
 		</Entity>
 		<Entity uid="1001">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="775.43384" z="756.29023"/>
 			<Orientation y="-1.32433"/>
 		</Entity>
 		<Entity uid="1002">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="746.9665" z="742.4491"/>
 			<Orientation y="1.68725"/>
@@ -4637,43 +4637,43 @@
 			<Orientation y="-2.72584"/>
 		</Entity>
 		<Entity uid="1006">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="701.05555" z="560.17933"/>
 			<Orientation y="-2.00618"/>
 		</Entity>
 		<Entity uid="1007">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="715.1861" z="580.15375"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1008">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="690.76935" z="580.56904"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1009">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="699.34192" z="580.62238"/>
 			<Orientation y="-0.10175"/>
 		</Entity>
 		<Entity uid="1010">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="713.36329" z="560.65925"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1011">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="687.29883" z="566.84382"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1012">
-			<Template>other/unfinished_greek_temple</Template>
+			<Template>gaia/ruins/unfinished_greek_temple</Template>
 			<Player>0</Player>
 			<Position x="785.79395" z="738.08033"/>
 			<Orientation y="1.51607"/>
@@ -6720,31 +6720,31 @@
 			<Orientation y="0.97709"/>
 		</Entity>
 		<Entity uid="1414">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="642.49402" z="449.52082"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1415">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="636.89448" z="437.85291"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1416">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="655.24604" z="445.15412"/>
 			<Orientation y="0.89512"/>
 		</Entity>
 		<Entity uid="1417">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="637.95386" z="478.23731"/>
 			<Orientation y="-0.70965"/>
 		</Entity>
 		<Entity uid="1418">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="619.07166" z="439.05396"/>
 			<Orientation y="2.35621"/>
@@ -7180,13 +7180,13 @@
 			<Orientation y="-1.5926"/>
 		</Entity>
 		<Entity uid="1503">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="496.83597" z="957.09571"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1504">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="489.17316" z="957.7768"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Miletus.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Miletus.xml
+++ binaries/data/mods/public/maps/scenarios/Miletus.xml
@@ -1838,7 +1838,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="365">
-			<Template>other/unfinished_greek_temple</Template>
+			<Template>gaia/ruins/unfinished_greek_temple</Template>
 			<Player>1</Player>
 			<Position x="363.79706" z="409.69764"/>
 			<Orientation y="-2.43496"/>
@@ -2893,7 +2893,7 @@
 			<Orientation y="-2.36956"/>
 		</Entity>
 		<Entity uid="632">
-			<Template>other/unfinished_greek_temple</Template>
+			<Template>gaia/ruins/unfinished_greek_temple</Template>
 			<Player>0</Player>
 			<Position x="375.88596" z="227.79838"/>
 			<Orientation y="-1.65445"/>
@@ -5209,73 +5209,73 @@
 			<Orientation y="1.03109"/>
 		</Entity>
 		<Entity uid="1118">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="553.19617" z="441.64722"/>
 			<Orientation y="-2.57"/>
 		</Entity>
 		<Entity uid="1119">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="485.00062" z="450.4831"/>
 			<Orientation y="-1.4522"/>
 		</Entity>
 		<Entity uid="1120">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="554.76978" z="429.36936"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1121">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="547.86219" z="433.1627"/>
 			<Orientation y="-0.02411"/>
 		</Entity>
 		<Entity uid="1122">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="485.91932" z="429.74335"/>
 			<Orientation y="-2.55494"/>
 		</Entity>
 		<Entity uid="1123">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="291.73887" z="45.37015"/>
 			<Orientation y="2.96287"/>
 		</Entity>
 		<Entity uid="1124">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="547.8227" z="536.45752"/>
 			<Orientation y="-0.75858"/>
 		</Entity>
 		<Entity uid="1125">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="594.61927" z="681.80909"/>
 			<Orientation y="-2.69248"/>
 		</Entity>
 		<Entity uid="1126">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="523.91791" z="726.34736"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1127">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="577.64026" z="686.95356"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1128">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="586.22992" z="687.41852"/>
 			<Orientation y="0.08745"/>
 		</Entity>
 		<Entity uid="1129">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="578.16272" z="682.64045"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Peloponnese.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Peloponnese.xml
+++ binaries/data/mods/public/maps/scenarios/Peloponnese.xml
@@ -31989,7 +31989,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5961">
-			<Template>other/unfinished_greek_temple</Template>
+			<Template>gaia/ruins/unfinished_greek_temple</Template>
 			<Player>0</Player>
 			<Position x="580.36847" z="853.76215"/>
 			<Orientation y="2.35621"/>
@@ -32025,361 +32025,361 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5967">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="34.63772" z="967.73206"/>
 			<Orientation y="-3.05538"/>
 		</Entity>
 		<Entity uid="5968">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1127.46912" z="76.87388"/>
 			<Orientation y="0.70905"/>
 		</Entity>
 		<Entity uid="5969">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1659.05005" z="448.8165"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5970">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1733.51648" z="738.30921"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5971">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1710.44251" z="1169.53516"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5972">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1962.14979" z="904.5033"/>
 			<Orientation y="-1.14605"/>
 		</Entity>
 		<Entity uid="5973">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1437.2234" z="1308.65455"/>
 			<Orientation y="-1.99614"/>
 		</Entity>
 		<Entity uid="5974">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1209.95887" z="1724.865"/>
 			<Orientation y="0.90273"/>
 		</Entity>
 		<Entity uid="5975">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1264.28382" z="1025.2605"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5976">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1068.30018" z="595.33936"/>
 			<Orientation y="-2.54688"/>
 		</Entity>
 		<Entity uid="5977">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="369.43299" z="379.1829"/>
 			<Orientation y="0.24898"/>
 		</Entity>
 		<Entity uid="5978">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="686.78357" z="255.52295"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5979">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1121.11963" z="95.53708"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5980">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1119.13672" z="88.25556"/>
 			<Orientation y="0.5408"/>
 		</Entity>
 		<Entity uid="5981">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1125.688" z="89.05741"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5982">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1111.93042" z="55.48813"/>
 			<Orientation y="-1.91781"/>
 		</Entity>
 		<Entity uid="5983">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1716.20435" z="410.95765"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5984">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1801.90137" z="654.641"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5985">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1494.77173" z="755.66236"/>
 			<Orientation y="-2.6617"/>
 		</Entity>
 		<Entity uid="5986">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1898.10291" z="1202.20032"/>
 			<Orientation y="0.51737"/>
 		</Entity>
 		<Entity uid="5987">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1664.51893" z="1614.49061"/>
 			<Orientation y="-2.23362"/>
 		</Entity>
 		<Entity uid="5988">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1586.13221" z="1758.9408"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5989">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1562.82618" z="1799.28528"/>
 			<Orientation y="0.45788"/>
 		</Entity>
 		<Entity uid="5990">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1561.78028" z="1269.20228"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5991">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1094.1985" z="1592.9817"/>
 			<Orientation y="-0.72094"/>
 		</Entity>
 		<Entity uid="5992">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="932.57874" z="1290.04761"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5993">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="57.99144" z="1301.7527"/>
 			<Orientation y="0.1124"/>
 		</Entity>
 		<Entity uid="5994">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="64.76142" z="1138.68616"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5995">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="397.40006" z="1282.49134"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5996">
-			<Template>gaia/special_treasure_pegasus</Template>
+			<Template>gaia/treasure/pegasus</Template>
 			<Player>0</Player>
 			<Position x="430.36414" z="1696.1847"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5997">
-			<Template>gaia/special_treasure_pegasus</Template>
+			<Template>gaia/treasure/pegasus</Template>
 			<Player>0</Player>
 			<Position x="888.917" z="805.1985"/>
 			<Orientation y="0.61417"/>
 		</Entity>
 		<Entity uid="5998">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="599.66822" z="846.68824"/>
 			<Orientation y="-0.01627"/>
 		</Entity>
 		<Entity uid="5999">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="871.10285" z="381.35938"/>
 			<Orientation y="0.26212"/>
 		</Entity>
 		<Entity uid="6000">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="868.68116" z="557.93836"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6001">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="1455.36158" z="1141.65345"/>
 			<Orientation y="0.66288"/>
 		</Entity>
 		<Entity uid="6002">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="978.37281" z="1001.08887"/>
 			<Orientation y="-2.70965"/>
 		</Entity>
 		<Entity uid="6003">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="1014.32044" z="1443.4203"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6004">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="796.47895" z="1844.71656"/>
 			<Orientation y="-2.09484"/>
 		</Entity>
 		<Entity uid="6005">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="863.02906" z="1871.87269"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6006">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="409.43982" z="964.5492"/>
 			<Orientation y="-2.6658"/>
 		</Entity>
 		<Entity uid="6007">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="1654.29651" z="867.37159"/>
 			<Orientation y="-2.605"/>
 		</Entity>
 		<Entity uid="6008">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="1651.85706" z="867.24317"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6009">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1653.96705" z="870.44556"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6010">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1649.82642" z="870.21845"/>
 			<Orientation y="-1.58004"/>
 		</Entity>
 		<Entity uid="6011">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="1652.24097" z="871.59314"/>
 			<Orientation y="0.81505"/>
 		</Entity>
 		<Entity uid="6012">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="1787.00135" z="883.20252"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6013">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1865.46216" z="799.83826"/>
 			<Orientation y="0.63302"/>
 		</Entity>
 		<Entity uid="6014">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1996.17078" z="858.35645"/>
 			<Orientation y="-2.71334"/>
 		</Entity>
 		<Entity uid="6015">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1426.35901" z="1382.13941"/>
 			<Orientation y="-2.52315"/>
 		</Entity>
 		<Entity uid="6016">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1422.05811" z="1375.4015"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6017">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1422.46595" z="1379.51331"/>
 			<Orientation y="0.86335"/>
 		</Entity>
 		<Entity uid="6018">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="1424.55115" z="1376.84607"/>
 			<Orientation y="0.31193"/>
 		</Entity>
 		<Entity uid="6019">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="1426.27369" z="1378.04773"/>
 			<Orientation y="-2.3904"/>
 		</Entity>
 		<Entity uid="6020">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="1422.9922" z="1385.39014"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6021">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="1299.98816" z="928.9181"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6022">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="227.52271" z="1408.12781"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6023">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="1114.53357" z="1422.32813"/>
 			<Orientation y="-1.32145"/>
 		</Entity>
 		<Entity uid="6024">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="1119.13843" z="1430.75904"/>
 			<Orientation y="-1.45612"/>
 		</Entity>
 		<Entity uid="6025">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="559.78089" z="858.46528"/>
 			<Orientation y="-1.9639"/>
 		</Entity>
 		<Entity uid="6026">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="564.34522" z="850.52381"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Resource_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Resource_demo.xml
+++ binaries/data/mods/public/maps/scenarios/Resource_demo.xml
@@ -1266,55 +1266,55 @@
 			<Orientation y="0.3908"/>
 		</Entity>
 		<Entity uid="216">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="278.80326" z="355.64194"/>
 			<Orientation y="-1.20253"/>
 		</Entity>
 		<Entity uid="217">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="340.56006" z="428.14521"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="218">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="291.28437" z="342.84168"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="219">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="279.1998" z="365.61731"/>
 			<Orientation y="3.01034"/>
 		</Entity>
 		<Entity uid="220">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="284.17817" z="361.1244"/>
 			<Orientation y="-0.07573"/>
 		</Entity>
 		<Entity uid="221">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="370.54828" z="357.17283"/>
 			<Orientation y="-2.30025"/>
 		</Entity>
 		<Entity uid="222">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="373.96641" z="347.97291"/>
 			<Orientation y="0.61535"/>
 		</Entity>
 		<Entity uid="223">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="380.41205" z="356.53064"/>
 			<Orientation y="-2.67183"/>
 		</Entity>
 		<Entity uid="224">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="375.22703" z="354.47312"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
@@ -16397,79 +16397,79 @@
 			<Orientation y="-2.10845"/>
 		</Entity>
 		<Entity uid="2800">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="475.8238" z="436.22828"/>
 			<Orientation y="-1.07683"/>
 		</Entity>
 		<Entity uid="2801">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="480.41892" z="435.47053"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2802">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="477.90424" z="438.33436"/>
 			<Orientation y="-3.06923"/>
 		</Entity>
 		<Entity uid="2803">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="596.32605" z="546.20734"/>
 			<Orientation y="-1.4488"/>
 		</Entity>
 		<Entity uid="2804">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="618.15131" z="476.27845"/>
 			<Orientation y="-1.1191"/>
 		</Entity>
 		<Entity uid="2805">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="953.89063" z="550.37934"/>
 			<Orientation y="-2.80686"/>
 		</Entity>
 		<Entity uid="2806">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="951.99476" z="531.09601"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2807">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="879.20771" z="541.64081"/>
 			<Orientation y="-1.7187"/>
 		</Entity>
 		<Entity uid="2808">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="886.02155" z="545.20008"/>
 			<Orientation y="-1.45566"/>
 		</Entity>
 		<Entity uid="2809">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="457.48032" z="89.12278"/>
 			<Orientation y="-2.19726"/>
 		</Entity>
 		<Entity uid="2810">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="453.00336" z="93.67963"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2811">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="517.01917" z="134.89559"/>
 			<Orientation y="-2.25141"/>
 		</Entity>
 		<Entity uid="2812">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="297.25373" z="698.43543"/>
 			<Orientation y="2.35621"/>
@@ -17143,379 +17143,379 @@
 			<Orientation y="-0.16294"/>
 		</Entity>
 		<Entity uid="2928">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="127.55933" z="476.17103"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2929">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="128.41051" z="482.28022"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2930">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="132.58205" z="486.53364"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2931">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="137.55546" z="488.40442"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2932">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="143.53541" z="488.48401"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2933">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="148.84581" z="485.36298"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2934">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="152.01003" z="479.70521"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2935">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="152.36509" z="473.37751"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2936">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="150.08953" z="467.52982"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2937">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="145.0845" z="464.58716"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2938">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="138.28971" z="463.36628"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2939">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="132.76761" z="465.77411"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2940">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="128.97335" z="469.81742"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2941">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.45374" z="350.88178"/>
 			<Orientation y="0.18522"/>
 		</Entity>
 		<Entity uid="2942">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.67591" z="363.40803"/>
 			<Orientation y="-2.62882"/>
 		</Entity>
 		<Entity uid="2943">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.22303" z="376.86338"/>
 			<Orientation y="1.26204"/>
 		</Entity>
 		<Entity uid="2944">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.08307" z="384.4191"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2945">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="602.60615" z="381.63685"/>
 			<Orientation y="1.16474"/>
 		</Entity>
 		<Entity uid="2946">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="603.66071" z="374.64506"/>
 			<Orientation y="-3.02392"/>
 		</Entity>
 		<Entity uid="2947">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="605.31849" z="364.64152"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2948">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="604.4917" z="350.07386"/>
 			<Orientation y="0.49967"/>
 		</Entity>
 		<Entity uid="2949">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="778.23011" z="499.04523"/>
 			<Orientation y="-2.0892"/>
 		</Entity>
 		<Entity uid="2950">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="773.94355" z="495.51188"/>
 			<Orientation y="2.39942"/>
 		</Entity>
 		<Entity uid="2951">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="770.9026" z="490.83024"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2952">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="771.09968" z="485.1297"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2953">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="773.31415" z="480.58985"/>
 			<Orientation y="1.0818"/>
 		</Entity>
 		<Entity uid="2954">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="777.00464" z="477.40314"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2955">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="782.87995" z="475.81022"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2956">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="789.4491" z="476.26371"/>
 			<Orientation y="0.319"/>
 		</Entity>
 		<Entity uid="2957">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="795.0528" z="479.10578"/>
 			<Orientation y="-0.73967"/>
 		</Entity>
 		<Entity uid="2958">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="797.17328" z="483.71631"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2959">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="797.06287" z="490.40983"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2960">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="794.1396" z="495.66968"/>
 			<Orientation y="0.84469"/>
 		</Entity>
 		<Entity uid="2961">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="789.51606" z="498.67316"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2962">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="783.88508" z="499.61918"/>
 			<Orientation y="-1.77201"/>
 		</Entity>
 		<Entity uid="2963">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="580.99244" z="936.83729"/>
 			<Orientation y="-2.01511"/>
 		</Entity>
 		<Entity uid="2964">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="576.25788" z="934.49079"/>
 			<Orientation y="-2.18287"/>
 		</Entity>
 		<Entity uid="2965">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="572.75123" z="931.2729"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2966">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="571.59723" z="927.50281"/>
 			<Orientation y="1.70527"/>
 		</Entity>
 		<Entity uid="2967">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="571.18171" z="923.14289"/>
 			<Orientation y="2.97858"/>
 		</Entity>
 		<Entity uid="2968">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="571.94062" z="919.8371"/>
 			<Orientation y="1.03258"/>
 		</Entity>
 		<Entity uid="2969">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="574.52686" z="916.12323"/>
 			<Orientation y="2.3009"/>
 		</Entity>
 		<Entity uid="2970">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="579.00287" z="913.56385"/>
 			<Orientation y="-2.00489"/>
 		</Entity>
 		<Entity uid="2971">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="584.41901" z="912.37037"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2972">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="589.27973" z="913.81312"/>
 			<Orientation y="-1.3453"/>
 		</Entity>
 		<Entity uid="2973">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="593.36036" z="916.91718"/>
 			<Orientation y="0.69909"/>
 		</Entity>
 		<Entity uid="2974">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="595.99537" z="922.61811"/>
 			<Orientation y="1.75922"/>
 		</Entity>
 		<Entity uid="2975">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="595.50495" z="927.95716"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2976">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="594.41834" z="932.12177"/>
 			<Orientation y="-0.66585"/>
 		</Entity>
 		<Entity uid="2977">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="590.95954" z="935.25715"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2978">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="585.91102" z="937.03016"/>
 			<Orientation y="0.0957"/>
 		</Entity>
 		<Entity uid="2979">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="375.0034" z="766.80201"/>
 			<Orientation y="1.12903"/>
 		</Entity>
 		<Entity uid="2980">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="371.49817" z="766.24726"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2981">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="363.81305" z="764.96308"/>
 			<Orientation y="1.07279"/>
 		</Entity>
 		<Entity uid="2982">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="371.59195" z="747.90973"/>
 			<Orientation y="0.63883"/>
 		</Entity>
 		<Entity uid="2983">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="377.20917" z="753.19538"/>
 			<Orientation y="-2.18845"/>
 		</Entity>
 		<Entity uid="2984">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="270.91294" z="228.5395"/>
 			<Orientation y="2.46724"/>
 		</Entity>
 		<Entity uid="2985">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="276.9839" z="218.77237"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2986">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="281.8855" z="211.75187"/>
 			<Orientation y="1.10434"/>
 		</Entity>
 		<Entity uid="2987">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="266.62604" z="232.0117"/>
 			<Orientation y="-2.3889"/>
 		</Entity>
 		<Entity uid="2988">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="750.8794" z="122.86582"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2989">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="754.13294" z="108.912"/>
 			<Orientation y="-3.03138"/>
 		</Entity>
 		<Entity uid="2990">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="753.04261" z="99.05979"/>
 			<Orientation y="1.04381"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Carthaginians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Carthaginians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Carthaginians.xml
@@ -4756,115 +4756,115 @@
 			<Orientation y="0.20423"/>
 		</Entity>
 		<Entity uid="911">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="21.03248" z="484.40766"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="912">
-			<Template>gaia/special_treasure_golden_fleece</Template>
+			<Template>gaia/treasure/golden_fleece</Template>
 			<Player>0</Player>
 			<Position x="492.7977" z="872.5943"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="913">
-			<Template>gaia/special_treasure_pegasus</Template>
+			<Template>gaia/treasure/pegasus</Template>
 			<Player>0</Player>
 			<Position x="953.167" z="382.60544"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="914">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="674.58112" z="539.83277"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="915">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="679.07441" z="538.81824"/>
 			<Orientation y="-0.48063"/>
 		</Entity>
 		<Entity uid="916">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="669.2928" z="540.10877"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="917">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="692.90925" z="540.45594"/>
 			<Orientation y="1.08478"/>
 		</Entity>
 		<Entity uid="918">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="701.23438" z="539.5113"/>
 			<Orientation y="-2.23061"/>
 		</Entity>
 		<Entity uid="919">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="697.02936" z="539.57227"/>
 			<Orientation y="0.20266"/>
 		</Entity>
 		<Entity uid="920">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="650.01111" z="540.25239"/>
 			<Orientation y="-2.501"/>
 		</Entity>
 		<Entity uid="921">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="654.06196" z="540.18647"/>
 			<Orientation y="-0.11852"/>
 		</Entity>
 		<Entity uid="922">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="658.28296" z="539.839"/>
 			<Orientation y="-3.02872"/>
 		</Entity>
 		<Entity uid="923">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="630.7823" z="539.98487"/>
 			<Orientation y="1.49296"/>
 		</Entity>
 		<Entity uid="924">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="635.67438" z="539.98194"/>
 			<Orientation y="0.57854"/>
 		</Entity>
 		<Entity uid="925">
-			<Template>gaia/special_treasure_standing_stone</Template>
+			<Template>gaia/treasure/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="641.21882" z="539.96888"/>
 			<Orientation y="-2.87923"/>
 		</Entity>
 		<Entity uid="926">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="865.09449" z="787.55835"/>
 			<Orientation y="0.74196"/>
 		</Entity>
 		<Entity uid="927">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="331.80048" z="255.56434"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="928">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="336.53516" z="257.25281"/>
 			<Orientation y="-1.15275"/>
 		</Entity>
 		<Entity uid="929">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="338.44391" z="247.12403"/>
 			<Orientation y="0.56806"/>
@@ -5422,61 +5422,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1039">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="224.75867" z="671.456"/>
 			<Orientation y="0.54302"/>
 		</Entity>
 		<Entity uid="1040">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="420.4976" z="494.96894"/>
 			<Orientation y="-1.76716"/>
 		</Entity>
 		<Entity uid="1041">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="311.82584" z="446.21848"/>
 			<Orientation y="0.72051"/>
 		</Entity>
 		<Entity uid="1042">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="148.70237" z="615.93555"/>
 			<Orientation y="0.43255"/>
 		</Entity>
 		<Entity uid="1043">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="293.90757" z="646.88306"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1044">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="470.23465" z="458.80872"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1045">
-			<Template>other/pyramid_minor</Template>
+			<Template>gaia/ruins/pyramid_minor</Template>
 			<Player>0</Player>
 			<Position x="855.04676" z="625.57483"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1047">
-			<Template>other/pyramid_great</Template>
+			<Template>gaia/ruins/pyramid_great</Template>
 			<Player>0</Player>
 			<Position x="821.91584" z="561.72071"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1048">
-			<Template>other/unfinished_greek_temple</Template>
+			<Template>gaia/ruins/unfinished_greek_temple</Template>
 			<Player>0</Player>
 			<Position x="295.76252" z="155.02247"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1049">
-			<Template>other/unfinished_greek_temple</Template>
+			<Template>gaia/ruins/unfinished_greek_temple</Template>
 			<Player>0</Player>
 			<Position x="711.2121" z="114.3842"/>
 			<Orientation y="-2.16683"/>
@@ -5512,7 +5512,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1057">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="33.99418" z="603.86994"/>
 			<Orientation y="-0.60532"/>
@@ -5620,7 +5620,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1075">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="661.4679" z="224.66172"/>
 			<Orientation y="-0.3229"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
@@ -16403,79 +16403,79 @@
 			<Orientation y="-2.10845"/>
 		</Entity>
 		<Entity uid="2800">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="475.8238" z="436.22828"/>
 			<Orientation y="-1.07683"/>
 		</Entity>
 		<Entity uid="2801">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="480.41892" z="435.47053"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2802">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="477.90424" z="438.33436"/>
 			<Orientation y="-3.06923"/>
 		</Entity>
 		<Entity uid="2803">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="596.32605" z="546.20734"/>
 			<Orientation y="-1.4488"/>
 		</Entity>
 		<Entity uid="2804">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="618.15131" z="476.27845"/>
 			<Orientation y="-1.1191"/>
 		</Entity>
 		<Entity uid="2805">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="953.89063" z="550.37934"/>
 			<Orientation y="-2.80686"/>
 		</Entity>
 		<Entity uid="2806">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="951.99476" z="531.09601"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2807">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="879.20771" z="541.64081"/>
 			<Orientation y="-1.7187"/>
 		</Entity>
 		<Entity uid="2808">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="886.02155" z="545.20008"/>
 			<Orientation y="-1.45566"/>
 		</Entity>
 		<Entity uid="2809">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="457.48032" z="89.12278"/>
 			<Orientation y="-2.19726"/>
 		</Entity>
 		<Entity uid="2810">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="453.00336" z="93.67963"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2811">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="517.01917" z="134.89559"/>
 			<Orientation y="-2.25141"/>
 		</Entity>
 		<Entity uid="2812">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="297.25373" z="698.43543"/>
 			<Orientation y="2.35621"/>
@@ -17149,379 +17149,379 @@
 			<Orientation y="-0.16294"/>
 		</Entity>
 		<Entity uid="2928">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="127.55933" z="476.17103"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2929">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="128.41051" z="482.28022"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2930">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="132.58205" z="486.53364"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2931">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="137.55546" z="488.40442"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2932">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="143.53541" z="488.48401"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2933">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="148.84581" z="485.36298"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2934">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="152.01003" z="479.70521"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2935">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="152.36509" z="473.37751"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2936">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="150.08953" z="467.52982"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2937">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="145.0845" z="464.58716"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2938">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="138.28971" z="463.36628"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2939">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="132.76761" z="465.77411"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2940">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="128.97335" z="469.81742"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2941">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.45374" z="350.88178"/>
 			<Orientation y="0.18522"/>
 		</Entity>
 		<Entity uid="2942">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.67591" z="363.40803"/>
 			<Orientation y="-2.62882"/>
 		</Entity>
 		<Entity uid="2943">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.22303" z="376.86338"/>
 			<Orientation y="1.26204"/>
 		</Entity>
 		<Entity uid="2944">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="614.08307" z="384.4191"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2945">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="602.60615" z="381.63685"/>
 			<Orientation y="1.16474"/>
 		</Entity>
 		<Entity uid="2946">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="603.66071" z="374.64506"/>
 			<Orientation y="-3.02392"/>
 		</Entity>
 		<Entity uid="2947">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="605.31849" z="364.64152"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2948">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="604.4917" z="350.07386"/>
 			<Orientation y="0.49967"/>
 		</Entity>
 		<Entity uid="2949">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="778.23011" z="499.04523"/>
 			<Orientation y="-2.0892"/>
 		</Entity>
 		<Entity uid="2950">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="773.94355" z="495.51188"/>
 			<Orientation y="2.39942"/>
 		</Entity>
 		<Entity uid="2951">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="770.9026" z="490.83024"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2952">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="771.09968" z="485.1297"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2953">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="773.31415" z="480.58985"/>
 			<Orientation y="1.0818"/>
 		</Entity>
 		<Entity uid="2954">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="777.00464" z="477.40314"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2955">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="782.87995" z="475.81022"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2956">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="789.4491" z="476.26371"/>
 			<Orientation y="0.319"/>
 		</Entity>
 		<Entity uid="2957">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="795.0528" z="479.10578"/>
 			<Orientation y="-0.73967"/>
 		</Entity>
 		<Entity uid="2958">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="797.17328" z="483.71631"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2959">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="797.06287" z="490.40983"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2960">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="794.1396" z="495.66968"/>
 			<Orientation y="0.84469"/>
 		</Entity>
 		<Entity uid="2961">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="789.51606" z="498.67316"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2962">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="783.88508" z="499.61918"/>
 			<Orientation y="-1.77201"/>
 		</Entity>
 		<Entity uid="2963">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="580.99244" z="936.83729"/>
 			<Orientation y="-2.01511"/>
 		</Entity>
 		<Entity uid="2964">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="576.25788" z="934.49079"/>
 			<Orientation y="-2.18287"/>
 		</Entity>
 		<Entity uid="2965">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="572.75123" z="931.2729"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2966">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="571.59723" z="927.50281"/>
 			<Orientation y="1.70527"/>
 		</Entity>
 		<Entity uid="2967">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="571.18171" z="923.14289"/>
 			<Orientation y="2.97858"/>
 		</Entity>
 		<Entity uid="2968">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="571.94062" z="919.8371"/>
 			<Orientation y="1.03258"/>
 		</Entity>
 		<Entity uid="2969">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="574.52686" z="916.12323"/>
 			<Orientation y="2.3009"/>
 		</Entity>
 		<Entity uid="2970">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="579.00287" z="913.56385"/>
 			<Orientation y="-2.00489"/>
 		</Entity>
 		<Entity uid="2971">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="584.41901" z="912.37037"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2972">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="589.27973" z="913.81312"/>
 			<Orientation y="-1.3453"/>
 		</Entity>
 		<Entity uid="2973">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="593.36036" z="916.91718"/>
 			<Orientation y="0.69909"/>
 		</Entity>
 		<Entity uid="2974">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="595.99537" z="922.61811"/>
 			<Orientation y="1.75922"/>
 		</Entity>
 		<Entity uid="2975">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="595.50495" z="927.95716"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2976">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="594.41834" z="932.12177"/>
 			<Orientation y="-0.66585"/>
 		</Entity>
 		<Entity uid="2977">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="590.95954" z="935.25715"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2978">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="585.91102" z="937.03016"/>
 			<Orientation y="0.0957"/>
 		</Entity>
 		<Entity uid="2979">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="375.0034" z="766.80201"/>
 			<Orientation y="1.12903"/>
 		</Entity>
 		<Entity uid="2980">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="371.49817" z="766.24726"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2981">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="363.81305" z="764.96308"/>
 			<Orientation y="1.07279"/>
 		</Entity>
 		<Entity uid="2982">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="371.59195" z="747.90973"/>
 			<Orientation y="0.63883"/>
 		</Entity>
 		<Entity uid="2983">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="377.20917" z="753.19538"/>
 			<Orientation y="-2.18845"/>
 		</Entity>
 		<Entity uid="2984">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="270.91294" z="228.5395"/>
 			<Orientation y="2.46724"/>
 		</Entity>
 		<Entity uid="2985">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="276.9839" z="218.77237"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2986">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="281.8855" z="211.75187"/>
 			<Orientation y="1.10434"/>
 		</Entity>
 		<Entity uid="2987">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="266.62604" z="232.0117"/>
 			<Orientation y="-2.3889"/>
 		</Entity>
 		<Entity uid="2988">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="750.8794" z="122.86582"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2989">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="754.13294" z="108.912"/>
 			<Orientation y="-3.03138"/>
 		</Entity>
 		<Entity uid="2990">
-			<Template>gaia/special_ruins_standing_stone</Template>
+			<Template>gaia/ruins/standing_stone</Template>
 			<Player>0</Player>
 			<Position x="753.04261" z="99.05979"/>
 			<Orientation y="1.04381"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml
@@ -6866,14 +6866,14 @@
 			<Actor seed="41654"/>
 		</Entity>
 		<Entity uid="1279">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>0</Player>
 			<Position x="697.57056" z="1350.36304"/>
 			<Orientation y="-2.41318"/>
 			<Actor seed="50006"/>
 		</Entity>
 		<Entity uid="1280">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>0</Player>
 			<Position x="702.1131" z="1344.52991"/>
 			<Orientation y="-2.28968"/>
@@ -7234,112 +7234,112 @@
 			<Actor seed="15360"/>
 		</Entity>
 		<Entity uid="1338">
-			<Template>gaia/special_treasure_food_barrels_buried</Template>
+			<Template>gaia/treasure/food_barrels_buried</Template>
 			<Player>0</Player>
 			<Position x="786.41034" z="241.89525"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5084"/>
 		</Entity>
 		<Entity uid="1339">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="790.03956" z="245.70177"/>
 			<Orientation y="-1.14623"/>
 			<Actor seed="46492"/>
 		</Entity>
 		<Entity uid="1340">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="768.59693" z="247.70798"/>
 			<Orientation y="-1.28834"/>
 			<Actor seed="50578"/>
 		</Entity>
 		<Entity uid="1341">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="603.31135" z="543.91065"/>
 			<Orientation y="0.11364"/>
 			<Actor seed="25824"/>
 		</Entity>
 		<Entity uid="1342">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="500.8324" z="883.9206"/>
 			<Orientation y="-1.46007"/>
 			<Actor seed="39978"/>
 		</Entity>
 		<Entity uid="1343">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1276.12452" z="1455.80201"/>
 			<Orientation y="-1.80472"/>
 			<Actor seed="54542"/>
 		</Entity>
 		<Entity uid="1344">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1047.79578" z="1238.73438"/>
 			<Orientation y="1.08288"/>
 			<Actor seed="45816"/>
 		</Entity>
 		<Entity uid="1345">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="990.32856" z="1240.72925"/>
 			<Orientation y="1.95673"/>
 			<Actor seed="56364"/>
 		</Entity>
 		<Entity uid="1346">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="813.61707" z="693.448"/>
 			<Orientation y="-2.80111"/>
 			<Actor seed="59306"/>
 		</Entity>
 		<Entity uid="1347">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1223.06226" z="550.11323"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42950"/>
 		</Entity>
 		<Entity uid="1348">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1972.29261" z="1097.5724"/>
 			<Orientation y="1.2007"/>
 			<Actor seed="16142"/>
 		</Entity>
 		<Entity uid="1349">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1736.61084" z="361.34061"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62544"/>
 		</Entity>
 		<Entity uid="1350">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="94.91112" z="889.19434"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56726"/>
 		</Entity>
 		<Entity uid="1351">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="227.03882" z="949.64802"/>
 			<Orientation y="-1.29717"/>
 			<Actor seed="60740"/>
 		</Entity>
 		<Entity uid="1352">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="578.58509" z="1170.94361"/>
 			<Orientation y="0.93566"/>
 			<Actor seed="26350"/>
 		</Entity>
 		<Entity uid="1353">
-			<Template>gaia/special_treasure_golden_fleece</Template>
+			<Template>gaia/treasure/golden_fleece</Template>
 			<Player>0</Player>
 			<Position x="1655.12317" z="371.46021"/>
 			<Orientation y="0.68693"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
@@ -3801,7 +3801,7 @@
 			<Orientation y="0.56077"/>
 		</Entity>
 		<Entity uid="3614">
-			<Template>other/pyramid_great</Template>
+			<Template>gaia/ruins/pyramid_great</Template>
 			<Player>0</Player>
 			<Position x="343.77314" z="873.82062"/>
 			<Orientation y="2.35621"/>
@@ -13198,176 +13198,176 @@
 			<Actor seed="1886"/>
 		</Entity>
 		<Entity uid="5435">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="595.33924" z="322.06894"/>
 			<Orientation y="-0.79975"/>
 			<Actor seed="12040"/>
 		</Entity>
 		<Entity uid="5436">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="598.82001" z="326.809"/>
 			<Orientation y="-0.79204"/>
 			<Actor seed="57908"/>
 		</Entity>
 		<Entity uid="5437">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="602.65967" z="331.0395"/>
 			<Orientation y="-0.76413"/>
 			<Actor seed="20206"/>
 		</Entity>
 		<Entity uid="5438">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="694.7975" z="331.0395"/>
 			<Orientation y="-2.37354"/>
 			<Actor seed="46298"/>
 		</Entity>
 		<Entity uid="5439">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="591.30567" z="319.30051"/>
 			<Orientation y="-0.73237"/>
 			<Actor seed="16938"/>
 		</Entity>
 		<Entity uid="5440">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="690.43299" z="335.47394"/>
 			<Orientation y="-2.26456"/>
 			<Actor seed="37598"/>
 		</Entity>
 		<Entity uid="5441">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="885.79517" z="764.32752"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39218"/>
 		</Entity>
 		<Entity uid="5442">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="889.7909" z="769.03565"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37564"/>
 		</Entity>
 		<Entity uid="5443">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="894.04175" z="772.74378"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12864"/>
 		</Entity>
 		<Entity uid="5444">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="977.25782" z="809.95429"/>
 			<Orientation y="-2.34293"/>
 			<Actor seed="58930"/>
 		</Entity>
 		<Entity uid="5445">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="910.48078" z="743.88361"/>
 			<Orientation y="0.79964"/>
 			<Actor seed="60988"/>
 		</Entity>
 		<Entity uid="5446">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="948.71882" z="730.26069"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22618"/>
 		</Entity>
 		<Entity uid="5447">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="333.16147" z="612.90503"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44118"/>
 		</Entity>
 		<Entity uid="5448">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="370.11005" z="567.18085"/>
 			<Orientation y="-2.26816"/>
 			<Actor seed="28270"/>
 		</Entity>
 		<Entity uid="5449">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="327.13898" z="528.57776"/>
 			<Orientation y="0.6871"/>
 			<Actor seed="9078"/>
 		</Entity>
 		<Entity uid="5450">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="323.74543" z="532.83631"/>
 			<Orientation y="0.72921"/>
 			<Actor seed="47826"/>
 		</Entity>
 		<Entity uid="5451">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="337.51679" z="618.44349"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22592"/>
 		</Entity>
 		<Entity uid="5452">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="343.55954" z="623.54517"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16590"/>
 		</Entity>
 		<Entity uid="5453">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="582.87574" z="961.12183"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5454">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="587.59034" z="965.72681"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5455">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="673.47272" z="984.48694"/>
 			<Orientation y="-2.20614"/>
 		</Entity>
 		<Entity uid="5456">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="679.7779" z="976.28687"/>
 			<Orientation y="-2.30132"/>
 		</Entity>
 		<Entity uid="5457">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="663.53187" z="923.9051"/>
 			<Orientation y="-0.7758"/>
 		</Entity>
 		<Entity uid="5458">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="660.41498" z="920.68317"/>
 			<Orientation y="-0.76992"/>
 		</Entity>
 		<Entity uid="5459">
-			<Template>other/pyramid_minor</Template>
+			<Template>gaia/ruins/pyramid_minor</Template>
 			<Player>0</Player>
 			<Position x="243.75777" z="885.81122"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19712"/>
 		</Entity>
 		<Entity uid="5460">
-			<Template>other/pyramid_minor</Template>
+			<Template>gaia/ruins/pyramid_minor</Template>
 			<Player>0</Player>
 			<Position x="153.57877" z="866.59321"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
@@ -978,21 +978,21 @@
 			<Actor seed="17064"/>
 		</Entity>
 		<Entity uid="162">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="462.33356" z="614.46821"/>
 			<Orientation y="2.81003"/>
 			<Actor seed="28670"/>
 		</Entity>
 		<Entity uid="163">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="476.21274" z="586.84406"/>
 			<Orientation y="-1.7305"/>
 			<Actor seed="20632"/>
 		</Entity>
 		<Entity uid="164">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="449.82056" z="592.59394"/>
 			<Orientation y="1.00361"/>
@@ -8345,140 +8345,140 @@
 			<Actor seed="56472"/>
 		</Entity>
 		<Entity uid="1386">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="789.57313" z="223.01488"/>
 			<Orientation y="-1.09626"/>
 			<Actor seed="43796"/>
 		</Entity>
 		<Entity uid="1387">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="268.29035" z="178.87134"/>
 			<Orientation y="-0.01951"/>
 			<Actor seed="3244"/>
 		</Entity>
 		<Entity uid="1388">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="111.4125" z="434.03803"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12122"/>
 		</Entity>
 		<Entity uid="1389">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="291.4065" z="161.57"/>
 			<Orientation y="3.10283"/>
 			<Actor seed="11396"/>
 		</Entity>
 		<Entity uid="1390">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="717.94611" z="438.01877"/>
 			<Orientation y="-2.31653"/>
 			<Actor seed="56108"/>
 		</Entity>
 		<Entity uid="1391">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="805.4314" z="722.81135"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28446"/>
 		</Entity>
 		<Entity uid="1392">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="803.09467" z="283.66431"/>
 			<Orientation y="0.43171"/>
 			<Actor seed="2862"/>
 		</Entity>
 		<Entity uid="1393">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="604.72132" z="448.6548"/>
 			<Orientation y="0.11837"/>
 			<Actor seed="49874"/>
 		</Entity>
 		<Entity uid="1394">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="188.48673" z="499.55927"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="55784"/>
 		</Entity>
 		<Entity uid="1395">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="203.19623" z="492.50562"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48004"/>
 		</Entity>
 		<Entity uid="1396">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="437.69996" z="87.45052"/>
 			<Orientation y="-1.51787"/>
 			<Actor seed="24926"/>
 		</Entity>
 		<Entity uid="1397">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="431.9534" z="88.39113"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26994"/>
 		</Entity>
 		<Entity uid="1398">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="450.65076" z="717.68512"/>
 			<Orientation y="-2.14774"/>
 			<Actor seed="16940"/>
 		</Entity>
 		<Entity uid="1399">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="450.46479" z="710.36634"/>
 			<Orientation y="-0.32097"/>
 			<Actor seed="39950"/>
 		</Entity>
 		<Entity uid="1401">
-			<Template>gaia/special_treasure_metal_persian_bigl</Template>
+			<Template>gaia/treasure/metal_persian_bigl</Template>
 			<Player>0</Player>
 			<Position x="642.06684" z="449.28684"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21882"/>
 		</Entity>
 		<Entity uid="1402">
-			<Template>gaia/special_treasure_metal_persian_small</Template>
+			<Template>gaia/treasure/metal_persian_small</Template>
 			<Player>0</Player>
 			<Position x="147.89106" z="438.21833"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1508"/>
 		</Entity>
 		<Entity uid="1403">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="142.30353" z="442.50657"/>
 			<Orientation y="-1.38132"/>
 			<Actor seed="57274"/>
 		</Entity>
 		<Entity uid="1404">
-			<Template>gaia/special_treasure_food_barrels_buried</Template>
+			<Template>gaia/treasure/food_barrels_buried</Template>
 			<Player>0</Player>
 			<Position x="784.784" z="229.31418"/>
 			<Orientation y="2.44352"/>
 			<Actor seed="460"/>
 		</Entity>
 		<Entity uid="1405">
-			<Template>gaia/special_treasure_food_barrels_buried</Template>
+			<Template>gaia/treasure/food_barrels_buried</Template>
 			<Player>0</Player>
 			<Position x="789.95655" z="753.91901"/>
 			<Orientation y="-2.8873"/>
 			<Actor seed="6934"/>
 		</Entity>
 		<Entity uid="1406">
-			<Template>gaia/special_treasure_food_barrels_buried</Template>
+			<Template>gaia/treasure/food_barrels_buried</Template>
 			<Player>0</Player>
 			<Position x="138.80408" z="491.00098"/>
 			<Orientation y="0.61388"/>
@@ -10113,168 +10113,168 @@
 			<Actor seed="47458"/>
 		</Entity>
 		<Entity uid="1721">
-			<Template>other/pyramid_great</Template>
+			<Template>gaia/ruins/pyramid_great</Template>
 			<Player>1</Player>
 			<Position x="307.1995" z="887.37647"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59794"/>
 		</Entity>
 		<Entity uid="1724">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="431.69416" z="712.26172"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="6390"/>
 		</Entity>
 		<Entity uid="1725">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="449.6226" z="676.30982"/>
 			<Orientation y="2.32354"/>
 			<Actor seed="41366"/>
 		</Entity>
 		<Entity uid="1726">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="457.78415" z="683.53345"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21976"/>
 		</Entity>
 		<Entity uid="1727">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="435.19507" z="714.9549"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17288"/>
 		</Entity>
 		<Entity uid="1728">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="437.81086" z="718.1349"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23658"/>
 		</Entity>
 		<Entity uid="1729">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="440.52475" z="721.23151"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50620"/>
 		</Entity>
 		<Entity uid="1731">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="571.53443" z="756.94385"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49500"/>
 		</Entity>
 		<Entity uid="1732">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="522.34809" z="703.98871"/>
 			<Orientation y="-2.29787"/>
 			<Actor seed="15478"/>
 		</Entity>
 		<Entity uid="1733">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="508.7682" z="750.97028"/>
 			<Orientation y="2.4294"/>
 			<Actor seed="27792"/>
 		</Entity>
 		<Entity uid="1735">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="655.63971" z="793.7793"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57428"/>
 		</Entity>
 		<Entity uid="1736">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="817.65552" z="722.1579"/>
 			<Orientation y="-1.90638"/>
 			<Actor seed="58076"/>
 		</Entity>
 		<Entity uid="1737">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="497.57398" z="127.41898"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63586"/>
 		</Entity>
 		<Entity uid="1738">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="499.63688" z="131.59604"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64928"/>
 		</Entity>
 		<Entity uid="1739">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="152.53747" z="472.52714"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34106"/>
 		</Entity>
 		<Entity uid="1740">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="157.12073" z="481.00638"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56908"/>
 		</Entity>
 		<Entity uid="1741">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="372.95649" z="149.36023"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61280"/>
 		</Entity>
 		<Entity uid="1742">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="377.58979" z="151.03386"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25372"/>
 		</Entity>
 		<Entity uid="1743">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="379.9871" z="155.72286"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40806"/>
 		</Entity>
 		<Entity uid="1744">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="450.2374" z="93.30771"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="65276"/>
 		</Entity>
 		<Entity uid="1745">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>0</Player>
 			<Position x="595.58851" z="465.55802"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37436"/>
 		</Entity>
 		<Entity uid="1746">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="334.84964" z="649.23938"/>
 			<Orientation y="3.13704"/>
 			<Actor seed="3938"/>
 		</Entity>
 		<Entity uid="1747">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="256.38852" z="766.65326"/>
 			<Orientation y="-2.41807"/>
 			<Actor seed="22652"/>
 		</Entity>
 		<Entity uid="1748">
-			<Template>gaia/special_ruins_stone_statues_egyptian</Template>
+			<Template>gaia/ruins/stone_statues_egyptian</Template>
 			<Player>1</Player>
 			<Position x="198.15561" z="835.3722"/>
 			<Orientation y="-2.53447"/>
@@ -11588,42 +11588,42 @@
 			<Actor seed="866"/>
 		</Entity>
 		<Entity uid="1993">
-			<Template>other/special_treasure_shipwreck_sail_boat</Template>
+			<Template>gaia/treasure/shipwreck_sail_boat</Template>
 			<Player>0</Player>
 			<Position x="225.03716" z="797.3642"/>
 			<Orientation y="2.88807"/>
 			<Actor seed="21330"/>
 		</Entity>
 		<Entity uid="1994">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="219.22352" z="795.32789"/>
 			<Orientation y="-2.86226"/>
 			<Actor seed="40148"/>
 		</Entity>
 		<Entity uid="1995">
-			<Template>other/special_treasure_shipwreck_sail_boat</Template>
+			<Template>gaia/treasure/shipwreck_sail_boat</Template>
 			<Player>0</Player>
 			<Position x="367.82523" z="379.15006"/>
 			<Orientation y="-0.76609"/>
 			<Actor seed="9740"/>
 		</Entity>
 		<Entity uid="1996">
-			<Template>other/special_treasure_shipwreck_sail_boat_cut</Template>
+			<Template>gaia/treasure/shipwreck_sail_boat_cut</Template>
 			<Player>0</Player>
 			<Position x="214.48227" z="445.80304"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59866"/>
 		</Entity>
 		<Entity uid="1997">
-			<Template>other/special_treasure_shipwreck_ram_bow</Template>
+			<Template>gaia/treasure/shipwreck_ram_bow</Template>
 			<Player>0</Player>
 			<Position x="806.4095" z="237.7418"/>
 			<Orientation y="-2.41483"/>
 			<Actor seed="49302"/>
 		</Entity>
 		<Entity uid="1998">
-			<Template>other/special_treasure_shipwreck_ram_bow</Template>
+			<Template>gaia/treasure/shipwreck_ram_bow</Template>
 			<Player>0</Player>
 			<Position x="864.57685" z="792.65076"/>
 			<Orientation y="-1.14818"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Romans.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Romans.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Romans.xml
@@ -10640,67 +10640,67 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2379">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="548.87006" z="99.8287"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2380">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="555.09113" z="105.66436"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2381">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="560.95527" z="110.92994"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2382">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="635.39222" z="156.59386"/>
 			<Orientation y="-2.2151"/>
 		</Entity>
 		<Entity uid="2383">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="639.83484" z="150.1724"/>
 			<Orientation y="-2.28325"/>
 		</Entity>
 		<Entity uid="2384">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="653.9261" z="134.8394"/>
 			<Orientation y="-2.25353"/>
 		</Entity>
 		<Entity uid="2385">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="649.24451" z="140.83045"/>
 			<Orientation y="-2.25149"/>
 		</Entity>
 		<Entity uid="2386">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="605.8335" z="207.34827"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2387">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="613.93293" z="215.26638"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2388">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="620.19043" z="220.62558"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2389">
-			<Template>gaia/special_ruins_stone_statues_roman</Template>
+			<Template>gaia/ruins/stone_statues_roman</Template>
 			<Player>1</Player>
 			<Position x="644.43116" z="146.23076"/>
 			<Orientation y="-2.39644"/>
Index: binaries/data/mods/public/maps/scenarios/Treasure Islands.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Treasure Islands.xml
+++ binaries/data/mods/public/maps/scenarios/Treasure Islands.xml
@@ -6703,19 +6703,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1258">
-			<Template>gaia/special_treasure_golden_fleece</Template>
+			<Template>gaia/treasure/golden_fleece</Template>
 			<Player>0</Player>
 			<Position x="670.48945" z="678.0511"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1259">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="737.20215" z="677.26539"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1260">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="599.5254" z="677.68714"/>
 			<Orientation y="0.1618"/>
@@ -7276,49 +7276,49 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1374">
-			<Template>gaia/special_ruins</Template>
+			<Template>gaia/ruins/column_doric</Template>
 			<Player>0</Player>
 			<Position x="817.35431" z="366.20002"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1375">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="587.02698" z="684.34375"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1376">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="599.33222" z="689.83375"/>
 			<Orientation y="-2.39231"/>
 		</Entity>
 		<Entity uid="1377">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="566.30799" z="676.68116"/>
 			<Orientation y="0.27788"/>
 		</Entity>
 		<Entity uid="1378">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="883.47278" z="407.95542"/>
 			<Orientation y="0.86902"/>
 		</Entity>
 		<Entity uid="1379">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1090.98914" z="289.23664"/>
 			<Orientation y="0.6189"/>
 		</Entity>
 		<Entity uid="1381">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="954.03187" z="749.5094"/>
 			<Orientation y="0.56691"/>
 		</Entity>
 		<Entity uid="1382">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="384.10557" z="865.80097"/>
 			<Orientation y="0.07082"/>
@@ -8368,25 +8368,25 @@
 			<Orientation y="-2.41445"/>
 		</Entity>
 		<Entity uid="1558">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="623.91498" z="124.2452"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1559">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="685.33936" z="108.72007"/>
 			<Orientation y="-2.48221"/>
 		</Entity>
 		<Entity uid="1560">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="1316.70813" z="996.50843"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1561">
-			<Template>gaia/special_treasure_wood</Template>
+			<Template>gaia/treasure/wood</Template>
 			<Player>0</Player>
 			<Position x="1354.15943" z="930.54554"/>
 			<Orientation y="0.46933"/>
@@ -9040,37 +9040,37 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1671">
-			<Template>gaia/special_treasure_food_bin</Template>
+			<Template>gaia/treasure/food_bin</Template>
 			<Player>0</Player>
 			<Position x="1134.93787" z="273.22312"/>
 			<Orientation y="0.91955"/>
 		</Entity>
 		<Entity uid="1672">
-			<Template>gaia/special_treasure_food_crate</Template>
+			<Template>gaia/treasure/food_crate</Template>
 			<Player>0</Player>
 			<Position x="1137.23511" z="276.49457"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1673">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="1140.35682" z="273.0092"/>
 			<Orientation y="-1.62855"/>
 		</Entity>
 		<Entity uid="1674">
-			<Template>gaia/special_treasure_food_jars</Template>
+			<Template>gaia/treasure/food_jars</Template>
 			<Player>0</Player>
 			<Position x="359.20173" z="1243.61768"/>
 			<Orientation y="-0.47077"/>
 		</Entity>
 		<Entity uid="1675">
-			<Template>gaia/special_treasure_golden_fleece</Template>
+			<Template>gaia/treasure/golden_fleece</Template>
 			<Player>0</Player>
 			<Position x="285.3154" z="1180.38025"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1676">
-			<Template>gaia/special_treasure_golden_fleece</Template>
+			<Template>gaia/treasure/golden_fleece</Template>
 			<Player>0</Player>
 			<Position x="729.97852" z="1072.36146"/>
 			<Orientation y="-2.06179"/>
@@ -11068,61 +11068,61 @@
 			<Orientation y="-1.58507"/>
 		</Entity>
 		<Entity uid="2030">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1033.68287" z="1128.44068"/>
 			<Orientation y="1.13003"/>
 		</Entity>
 		<Entity uid="2031">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1065.2002" z="1117.72388"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2032">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="1046.54188" z="1124.78187"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2033">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="685.02405" z="1198.15882"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2034">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="689.77155" z="1180.55262"/>
 			<Orientation y="1.0892"/>
 		</Entity>
 		<Entity uid="2035">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1380.56739" z="877.33741"/>
 			<Orientation y="1.38758"/>
 		</Entity>
 		<Entity uid="2036">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="71.01655" z="814.63093"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2037">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="1282.16785" z="239.78025"/>
 			<Orientation y="0.31022"/>
 		</Entity>
 		<Entity uid="2038">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="425.48563" z="953.40357"/>
 			<Orientation y="-1.95913"/>
 		</Entity>
 		<Entity uid="2039">
-			<Template>gaia/special_treasure_stone</Template>
+			<Template>gaia/treasure/stone</Template>
 			<Player>0</Player>
 			<Position x="419.39152" z="950.36695"/>
 			<Orientation y="0.7752"/>
@@ -15569,42 +15569,42 @@
 			<Actor seed="44978"/>
 		</Entity>
 		<Entity uid="2911">
-			<Template>gaia/special_treasure_food_barrels_buried</Template>
+			<Template>gaia/treasure/food_barrels_buried</Template>
 			<Player>0</Player>
 			<Position x="1143.06141" z="490.76404"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14661"/>
 		</Entity>
 		<Entity uid="2912">
-			<Template>gaia/special_treasure_food_barrels_buried</Template>
+			<Template>gaia/treasure/food_barrels_buried</Template>
 			<Player>0</Player>
 			<Position x="1151.19459" z="492.41785"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63925"/>
 		</Entity>
 		<Entity uid="2913">
-			<Template>gaia/special_treasure_pegasus</Template>
+			<Template>gaia/treasure/pegasus</Template>
 			<Player>0</Player>
 			<Position x="1365.98401" z="526.39698"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2420"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>gaia/special_treasure_metal_persian_small</Template>
+			<Template>gaia/treasure/metal_persian_small</Template>
 			<Player>0</Player>
 			<Position x="247.33747" z="474.63874"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8527"/>
 		</Entity>
 		<Entity uid="2915">
-			<Template>gaia/special_treasure_metal_persian_small</Template>
+			<Template>gaia/treasure/metal_persian_small</Template>
 			<Player>0</Player>
 			<Position x="1104.74573" z="860.54712"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33288"/>
 		</Entity>
 		<Entity uid="2916">
-			<Template>gaia/special_treasure_golden_fleece</Template>
+			<Template>gaia/treasure/golden_fleece</Template>
 			<Player>0</Player>
 			<Position x="814.0943" z="363.39841"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Tropical Island.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Tropical Island.xml
+++ binaries/data/mods/public/maps/scenarios/Tropical Island.xml
@@ -2760,91 +2760,91 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="778">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="152.65032" z="474.7519"/>
 			<Orientation y="-2.9984"/>
 		</Entity>
 		<Entity uid="779">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="264.93854" z="210.37761"/>
 			<Orientation y="1.18491"/>
 		</Entity>
 		<Entity uid="780">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="705.72425" z="110.23795"/>
 			<Orientation y="-1.92563"/>
 		</Entity>
 		<Entity uid="781">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="819.07398" z="422.66291"/>
 			<Orientation y="0.71256"/>
 		</Entity>
 		<Entity uid="782">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="726.701" z="628.16382"/>
 			<Orientation y="-1.48647"/>
 		</Entity>
 		<Entity uid="783">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="588.89075" z="775.7978"/>
 			<Orientation y="0.04395"/>
 		</Entity>
 		<Entity uid="784">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="350.82868" z="834.77027"/>
 			<Orientation y="-2.87122"/>
 		</Entity>
 		<Entity uid="785">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="701.97162" z="149.6144"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="786">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="804.09375" z="190.67743"/>
 			<Orientation y="0.43503"/>
 		</Entity>
 		<Entity uid="787">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="395.70756" z="64.61438"/>
 			<Orientation y="0.92382"/>
 		</Entity>
 		<Entity uid="788">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="102.33198" z="299.6678"/>
 			<Orientation y="-1.64649"/>
 		</Entity>
 		<Entity uid="789">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="194.5565" z="733.07667"/>
 			<Orientation y="0.7898"/>
 		</Entity>
 		<Entity uid="790">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="398.17032" z="642.1294"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="791">
-			<Template>other/special_treasure_shipwreck_debris</Template>
+			<Template>gaia/treasure/shipwreck_debris</Template>
 			<Player>0</Player>
 			<Position x="948.35883" z="488.31647"/>
 			<Orientation y="-1.48688"/>
 		</Entity>
 		<Entity uid="792">
-			<Template>gaia/special_treasure_food_barrel</Template>
+			<Template>gaia/treasure/food_barrel</Template>
 			<Player>0</Player>
 			<Position x="379.79151" z="421.16065"/>
 			<Orientation y="0.0064"/>
@@ -2862,19 +2862,19 @@
 			<Orientation y="-0.67508"/>
 		</Entity>
 		<Entity uid="844">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="489.9633" z="253.5452"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="845">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="391.39414" z="318.93421"/>
 			<Orientation y="-0.75055"/>
 		</Entity>
 		<Entity uid="846">
-			<Template>other/special_treasure_shipwreck</Template>
+			<Template>gaia/treasure/shipwreck</Template>
 			<Player>0</Player>
 			<Position x="634.55658" z="528.1042"/>
 			<Orientation y="2.35621"/>