Index: binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
@@ -15375,7 +15375,7 @@
 			<Actor seed="25429"/>
 		</Entity>
 		<Entity uid="4802">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="85.02065" z="456.54877"/>
 			<Orientation y="2.35621"/>
@@ -15382,7 +15382,7 @@
 			<Actor seed="37045"/>
 		</Entity>
 		<Entity uid="4803">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="971.53705" z="550.59888"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
@@ -15879,7 +15879,7 @@
 			<Actor seed="3288"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>structures/farmstead_saharan</Template>
+			<Template>structures/mill_saharan</Template>
 			<Player>0</Player>
 			<Position x="644.4657" z="613.61487"/>
 			<Orientation y="2.35621"/>
@@ -15886,7 +15886,7 @@
 			<Actor seed="44620"/>
 		</Entity>
 		<Entity uid="3380">
-			<Template>structures/farmstead_saharan</Template>
+			<Template>structures/mill_saharan</Template>
 			<Player>0</Player>
 			<Position x="492.29563" z="346.09537"/>
 			<Orientation y="2.35622"/>
@@ -15893,7 +15893,7 @@
 			<Actor seed="44620"/>
 		</Entity>
 		<Entity uid="3381">
-			<Template>structures/farmstead_saharan</Template>
+			<Template>structures/mill_saharan</Template>
 			<Player>0</Player>
 			<Position x="92.05004" z="574.23707"/>
 			<Orientation y="2.35622"/>
@@ -15900,7 +15900,7 @@
 			<Actor seed="44620"/>
 		</Entity>
 		<Entity uid="3382">
-			<Template>structures/farmstead_saharan</Template>
+			<Template>structures/mill_saharan</Template>
 			<Player>0</Player>
 			<Position x="299.04606" z="782.49311"/>
 			<Orientation y="2.35622"/>
@@ -15907,7 +15907,7 @@
 			<Actor seed="44620"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="328.33341" z="780.22284"/>
 			<Orientation y="2.35621"/>
@@ -15914,7 +15914,7 @@
 			<Actor seed="61489"/>
 		</Entity>
 		<Entity uid="3384">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="308.88505" z="801.65339"/>
 			<Orientation y="2.35621"/>
@@ -15921,7 +15921,7 @@
 			<Actor seed="15036"/>
 		</Entity>
 		<Entity uid="3385">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="292.81733" z="822.40876"/>
 			<Orientation y="2.35621"/>
@@ -15928,7 +15928,7 @@
 			<Actor seed="46185"/>
 		</Entity>
 		<Entity uid="3386">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="272.42927" z="802.47571"/>
 			<Orientation y="2.35621"/>
@@ -15935,7 +15935,7 @@
 			<Actor seed="25861"/>
 		</Entity>
 		<Entity uid="3387">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="279.95368" z="768.08149"/>
 			<Orientation y="2.35621"/>
@@ -15942,7 +15942,7 @@
 			<Actor seed="34538"/>
 		</Entity>
 		<Entity uid="3388">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="297.5586" z="754.6413"/>
 			<Orientation y="2.35621"/>
@@ -15949,7 +15949,7 @@
 			<Actor seed="42080"/>
 		</Entity>
 		<Entity uid="3389">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="316.63617" z="766.53608"/>
 			<Orientation y="2.35621"/>
@@ -15956,7 +15956,7 @@
 			<Actor seed="42080"/>
 		</Entity>
 		<Entity uid="3390">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="102.4021" z="595.8744"/>
 			<Orientation y="2.35621"/>
@@ -15963,7 +15963,7 @@
 			<Actor seed="19044"/>
 		</Entity>
 		<Entity uid="3391">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="124.89626" z="573.99445"/>
 			<Orientation y="2.35621"/>
@@ -15970,7 +15970,7 @@
 			<Actor seed="23531"/>
 		</Entity>
 		<Entity uid="3392">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="106.9045" z="557.08552"/>
 			<Orientation y="2.35621"/>
@@ -15977,7 +15977,7 @@
 			<Actor seed="18683"/>
 		</Entity>
 		<Entity uid="3393">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="86.19979" z="544.24103"/>
 			<Orientation y="2.35621"/>
@@ -15984,7 +15984,7 @@
 			<Actor seed="5221"/>
 		</Entity>
 		<Entity uid="3394">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="65.93682" z="561.93256"/>
 			<Orientation y="2.35621"/>
@@ -15991,7 +15991,7 @@
 			<Actor seed="35216"/>
 		</Entity>
 		<Entity uid="3395">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="53.48116" z="578.44312"/>
 			<Orientation y="2.35621"/>
@@ -15998,7 +15998,7 @@
 			<Actor seed="32573"/>
 		</Entity>
 		<Entity uid="3396">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="68.10376" z="601.94886"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
@@ -18969,7 +18969,7 @@
 			<Actor seed="23978"/>
 		</Entity>
 		<Entity uid="3107">
-			<Template>structures/farmstead_middle_eastern</Template>
+			<Template>structures/mill_middle_eastern</Template>
 			<Player>0</Player>
 			<Position x="765.16016" z="260.724"/>
 			<Orientation y="2.35621"/>
@@ -18976,7 +18976,7 @@
 			<Actor seed="14400"/>
 		</Entity>
 		<Entity uid="3108">
-			<Template>structures/farmstead_middle_eastern</Template>
+			<Template>structures/mill_middle_eastern</Template>
 			<Player>0</Player>
 			<Position x="443.3759" z="329.88147"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
@@ -30583,7 +30583,7 @@
 			<Actor seed="29868"/>
 		</Entity>
 		<Entity uid="12538">
-			<Template>structures/farmstead_indian</Template>
+			<Template>structures/mill_indian</Template>
 			<Player>0</Player>
 			<Position x="317.29282" z="453.56971"/>
 			<Orientation y="2.35621"/>
@@ -30590,7 +30590,7 @@
 			<Actor seed="5308"/>
 		</Entity>
 		<Entity uid="12539">
-			<Template>structures/farmstead_indian</Template>
+			<Template>structures/mill_indian</Template>
 			<Player>0</Player>
 			<Position x="394.4459" z="545.69983"/>
 			<Orientation y="2.35621"/>
@@ -30597,7 +30597,7 @@
 			<Actor seed="1129"/>
 		</Entity>
 		<Entity uid="12540">
-			<Template>structures/farmstead_indian</Template>
+			<Template>structures/mill_indian</Template>
 			<Player>0</Player>
 			<Position x="215.18882" z="539.79737"/>
 			<Orientation y="2.35621"/>
@@ -30604,7 +30604,7 @@
 			<Actor seed="41150"/>
 		</Entity>
 		<Entity uid="12541">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="198.7663" z="557.48768"/>
 			<Orientation y="2.35621"/>
@@ -30611,7 +30611,7 @@
 			<Actor seed="61517"/>
 		</Entity>
 		<Entity uid="12542">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="177.86921" z="539.98914"/>
 			<Orientation y="2.35621"/>
@@ -30618,7 +30618,7 @@
 			<Actor seed="60257"/>
 		</Entity>
 		<Entity uid="12543">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="195.84702" z="521.75763"/>
 			<Orientation y="2.35621"/>
@@ -30625,7 +30625,7 @@
 			<Actor seed="7107"/>
 		</Entity>
 		<Entity uid="12544">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="212.32874" z="504.82758"/>
 			<Orientation y="2.35621"/>
@@ -30632,7 +30632,7 @@
 			<Actor seed="29860"/>
 		</Entity>
 		<Entity uid="12545">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="232.43848" z="519.1532"/>
 			<Orientation y="2.35621"/>
@@ -30639,7 +30639,7 @@
 			<Actor seed="56506"/>
 		</Entity>
 		<Entity uid="12546">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="250.88855" z="538.09748"/>
 			<Orientation y="2.35621"/>
@@ -30646,7 +30646,7 @@
 			<Actor seed="56018"/>
 		</Entity>
 		<Entity uid="12547">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="219.14039" z="575.11054"/>
 			<Orientation y="2.35621"/>
@@ -30653,7 +30653,7 @@
 			<Actor seed="15215"/>
 		</Entity>
 		<Entity uid="12548">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="234.09327" z="558.4911"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
@@ -36600,7 +36600,7 @@
 			<Actor seed="9428"/>
 		</Entity>
 		<Entity uid="6059">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="552.5777" z="151.42515"/>
 			<Orientation y="2.35621"/>
@@ -36607,7 +36607,7 @@
 			<Actor seed="14903"/>
 		</Entity>
 		<Entity uid="6060">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="527.90796" z="396.787"/>
 			<Orientation y="2.35621"/>
@@ -36614,7 +36614,7 @@
 			<Actor seed="49630"/>
 		</Entity>
 		<Entity uid="6061">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="685.52607" z="526.57795"/>
 			<Orientation y="2.35621"/>
@@ -36621,7 +36621,7 @@
 			<Actor seed="39873"/>
 		</Entity>
 		<Entity uid="6062">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="484.4437" z="678.02424"/>
 			<Orientation y="2.35621"/>
@@ -36628,7 +36628,7 @@
 			<Actor seed="33412"/>
 		</Entity>
 		<Entity uid="6063">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="261.63892" z="766.55622"/>
 			<Orientation y="2.35621"/>
@@ -36635,7 +36635,7 @@
 			<Actor seed="45604"/>
 		</Entity>
 		<Entity uid="6064">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="841.44025" z="313.67838"/>
 			<Orientation y="2.35621"/>
@@ -36642,7 +36642,7 @@
 			<Actor seed="38707"/>
 		</Entity>
 		<Entity uid="6065">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="544.2721" z="923.48157"/>
 			<Orientation y="2.35621"/>
@@ -36649,7 +36649,7 @@
 			<Actor seed="53478"/>
 		</Entity>
 		<Entity uid="6066">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="536.71863" z="132.0807"/>
 			<Orientation y="2.35621"/>
@@ -36656,7 +36656,7 @@
 			<Actor seed="46724"/>
 		</Entity>
 		<Entity uid="6067">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="556.9242" z="113.38668"/>
 			<Orientation y="2.35621"/>
@@ -36663,7 +36663,7 @@
 			<Actor seed="31536"/>
 		</Entity>
 		<Entity uid="6070">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="571.97394" z="167.81034"/>
 			<Orientation y="2.35621"/>
@@ -36670,7 +36670,7 @@
 			<Actor seed="59130"/>
 		</Entity>
 		<Entity uid="6074">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="527.55384" z="902.12836"/>
 			<Orientation y="2.35621"/>
@@ -36677,7 +36677,7 @@
 			<Actor seed="42043"/>
 		</Entity>
 		<Entity uid="6075">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="545.47205" z="885.08088"/>
 			<Orientation y="2.35621"/>
@@ -36684,7 +36684,7 @@
 			<Actor seed="63509"/>
 		</Entity>
 		<Entity uid="6076">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="566.23578" z="903.18018"/>
 			<Orientation y="2.35621"/>
@@ -36691,7 +36691,7 @@
 			<Actor seed="63509"/>
 		</Entity>
 		<Entity uid="6077">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="583.90986" z="918.8689"/>
 			<Orientation y="2.35621"/>
@@ -36698,7 +36698,7 @@
 			<Actor seed="5428"/>
 		</Entity>
 		<Entity uid="6078">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="567.10871" z="940.24671"/>
 			<Orientation y="2.35621"/>
@@ -36705,7 +36705,7 @@
 			<Actor seed="1357"/>
 		</Entity>
 		<Entity uid="6079">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="549.73597" z="961.11023"/>
 			<Orientation y="2.35621"/>
@@ -36712,7 +36712,7 @@
 			<Actor seed="1357"/>
 		</Entity>
 		<Entity uid="6080">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="528.7284" z="942.64411"/>
 			<Orientation y="2.35621"/>
@@ -36719,7 +36719,7 @@
 			<Actor seed="25447"/>
 		</Entity>
 		<Entity uid="6083">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="507.78644" z="924.49073"/>
 			<Orientation y="2.35621"/>
@@ -36726,7 +36726,7 @@
 			<Actor seed="43830"/>
 		</Entity>
 		<Entity uid="6086">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="577.60651" z="132.72608"/>
 			<Orientation y="2.35621"/>
@@ -36733,7 +36733,7 @@
 			<Actor seed="40979"/>
 		</Entity>
 		<Entity uid="6087">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="517.94965" z="153.20237"/>
 			<Orientation y="2.35621"/>
@@ -36740,7 +36740,7 @@
 			<Actor seed="40655"/>
 		</Entity>
 		<Entity uid="6094">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="549.81775" z="188.36121"/>
 			<Orientation y="-0.73974"/>
@@ -36747,7 +36747,7 @@
 			<Actor seed="34326"/>
 		</Entity>
 		<Entity uid="6095">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="534.23047" z="171.28171"/>
 			<Orientation y="2.35621"/>
@@ -36754,7 +36754,7 @@
 			<Actor seed="27697"/>
 		</Entity>
 		<Entity uid="6096">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="594.34412" z="151.52247"/>
 			<Orientation y="2.35621"/>
@@ -36761,7 +36761,7 @@
 			<Actor seed="27008"/>
 		</Entity>
 		<Entity uid="6097">
-			<Template>structures/farmstead_temperate_europe</Template>
+			<Template>structures/mill_temperate_europe</Template>
 			<Player>0</Player>
 			<Position x="311.81083" z="479.94526"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
@@ -11069,7 +11069,7 @@
 			<Actor seed="7065"/>
 		</Entity>
 		<Entity uid="2500">
-			<Template>structures/farmstead_desert</Template>
+			<Template>structures/mill_desert</Template>
 			<Player>0</Player>
 			<Position x="647.75416" z="613.64374"/>
 			<Orientation y="2.35621"/>
@@ -11076,7 +11076,7 @@
 			<Actor seed="64454"/>
 		</Entity>
 		<Entity uid="2501">
-			<Template>structures/farmstead_desert</Template>
+			<Template>structures/mill_desert</Template>
 			<Player>0</Player>
 			<Position x="486.16114" z="346.12366"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
+++ binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
@@ -32107,7 +32107,7 @@
 			<Actor seed="185"/>
 		</Entity>
 		<Entity uid="11070">
-			<Template>structures/farmstead_greek</Template>
+			<Template>structures/mill_greek</Template>
 			<Player>0</Player>
 			<Position x="790.06531" z="298.03458"/>
 			<Orientation y="2.35621"/>
@@ -32114,7 +32114,7 @@
 			<Actor seed="9976"/>
 		</Entity>
 		<Entity uid="11071">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="771.49482" z="314.93088"/>
 			<Orientation y="2.35621"/>
@@ -32121,7 +32121,7 @@
 			<Actor seed="3940"/>
 		</Entity>
 		<Entity uid="11072">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="751.22632" z="297.70307"/>
 			<Orientation y="2.35621"/>
@@ -32128,7 +32128,7 @@
 			<Actor seed="43091"/>
 		</Entity>
 		<Entity uid="11073">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="770.41327" z="276.99076"/>
 			<Orientation y="2.35621"/>
@@ -32135,7 +32135,7 @@
 			<Actor seed="54768"/>
 		</Entity>
 		<Entity uid="11074">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="789.85932" z="258.16633"/>
 			<Orientation y="2.35621"/>
@@ -32142,7 +32142,7 @@
 			<Actor seed="2509"/>
 		</Entity>
 		<Entity uid="11075">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="809.27387" z="274.9462"/>
 			<Orientation y="2.35621"/>
@@ -32149,7 +32149,7 @@
 			<Actor seed="61283"/>
 		</Entity>
 		<Entity uid="11076">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="827.14826" z="293.19947"/>
 			<Orientation y="2.35621"/>
@@ -32156,7 +32156,7 @@
 			<Actor seed="58130"/>
 		</Entity>
 		<Entity uid="11077">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="811.86579" z="313.69294"/>
 			<Orientation y="2.35621"/>
@@ -32163,7 +32163,7 @@
 			<Actor seed="33181"/>
 		</Entity>
 		<Entity uid="11078">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="793.92579" z="333.6067"/>
 			<Orientation y="2.35621"/>
@@ -32170,7 +32170,7 @@
 			<Actor seed="12544"/>
 		</Entity>
 		<Entity uid="11079">
-			<Template>structures/farmstead_greek</Template>
+			<Template>structures/mill_greek</Template>
 			<Player>0</Player>
 			<Position x="906.72602" z="756.09668"/>
 			<Orientation y="2.35621"/>
@@ -32177,7 +32177,7 @@
 			<Actor seed="13650"/>
 		</Entity>
 		<Entity uid="11080">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="886.18848" z="774.86402"/>
 			<Orientation y="2.35621"/>
@@ -32184,7 +32184,7 @@
 			<Actor seed="10612"/>
 		</Entity>
 		<Entity uid="11081">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="870.18104" z="754.68451"/>
 			<Orientation y="2.35621"/>
@@ -32191,7 +32191,7 @@
 			<Actor seed="1939"/>
 		</Entity>
 		<Entity uid="11082">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="892.32898" z="735.19971"/>
 			<Orientation y="2.35621"/>
@@ -32198,7 +32198,7 @@
 			<Actor seed="42743"/>
 		</Entity>
 		<Entity uid="11083">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="908.91437" z="719.3957"/>
 			<Orientation y="2.35621"/>
@@ -32205,7 +32205,7 @@
 			<Actor seed="42743"/>
 		</Entity>
 		<Entity uid="11084">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="927.17774" z="737.71235"/>
 			<Orientation y="2.35621"/>
@@ -32212,7 +32212,7 @@
 			<Actor seed="64903"/>
 		</Entity>
 		<Entity uid="11085">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="945.67646" z="755.32825"/>
 			<Orientation y="2.35621"/>
@@ -32219,7 +32219,7 @@
 			<Actor seed="1584"/>
 		</Entity>
 		<Entity uid="11086">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="925.72211" z="771.38697"/>
 			<Orientation y="2.35621"/>
@@ -32226,7 +32226,7 @@
 			<Actor seed="30161"/>
 		</Entity>
 		<Entity uid="11087">
-			<Template>structures/farmstead_field_wheat</Template>
+			<Template>structures/mill_field_wheat</Template>
 			<Player>0</Player>
 			<Position x="906.67322" z="794.02778"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
+++ binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
@@ -25704,7 +25704,7 @@
 			<Actor seed="16662"/>
 		</Entity>
 		<Entity uid="6446">
-			<Template>structures/farmstead_middle_eastern</Template>
+			<Template>structures/mill_middle_eastern</Template>
 			<Player>0</Player>
 			<Position x="686.19874" z="706.99708"/>
 			<Orientation y="2.35621"/>
@@ -25711,7 +25711,7 @@
 			<Actor seed="60640"/>
 		</Entity>
 		<Entity uid="6447">
-			<Template>structures/farmstead_middle_eastern</Template>
+			<Template>structures/mill_middle_eastern</Template>
 			<Player>0</Player>
 			<Position x="749.00837" z="1309.54249"/>
 			<Orientation y="2.35622"/>
@@ -25742,7 +25742,7 @@
 			<Actor seed="55976"/>
 		</Entity>
 		<Entity uid="6457">
-			<Template>structures/farmstead_middle_eastern</Template>
+			<Template>structures/mill_middle_eastern</Template>
 			<Player>0</Player>
 			<Position x="1194.54249" z="858.67237"/>
 			<Orientation y="2.35622"/>
@@ -25773,7 +25773,7 @@
 			<Actor seed="55976"/>
 		</Entity>
 		<Entity uid="6462">
-			<Template>structures/farmstead_middle_eastern</Template>
+			<Template>structures/mill_middle_eastern</Template>
 			<Player>0</Player>
 			<Position x="1296.59095" z="1258.84351"/>
 			<Orientation y="2.35622"/>
Index: binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json
+++ binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json
@@ -1,12 +1,12 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Gatherer", "Field"],
+	"affects": ["Worker", "Field"],
 	"modifications": [
 		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.75 }
 	],
 	"auraName": "Farmland",
-	"auraDescription": "Gatherers +75% farming rate around a captured Farmstead.",
+	"auraDescription": "Workers +75% grain gather rate around a captured Rotary Mill.",
 	"overlayIcon": "art/textures/ui/session/auras/farm_bonus.png",
 	"rangeOverlay" : {
 		"lineTexture": "outline_border.png",
Index: binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml
+++ binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <Auras datatype="tokens">
+    structures/farmstead_60
+  </Auras>
+  <Capturable>
+    <CapturePoints>500</CapturePoints>
+    <RegenRate>0</RegenRate>
+    <GarrisonRegenRate>3</GarrisonRegenRate>
+  </Capturable>
+  <Footprint replace="">
+    <Circle radius="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
+  <Health disable=""/>
+  <Identity>
+    <GenericName>Rotary Mill</GenericName>
+    <SpecificName>Rotary Mill</SpecificName>
+    <VisibleClasses datatype="tokens">
+	  RotaryMill
+	</VisibleClasses>
+    <Tooltip>Dropsite for harvested Food. Capture one of these to increase nearby food production.</Tooltip>
+    <Icon>structures/rotarymill.png</Icon>
+    <Undeletable>true</Undeletable>
+  </Identity>
+  <Minimap>
+    <Icon size="16.0">other.png</Icon>
+  </Minimap>
+  <Obstruction>
+    <Static width="16.0" depth="16.0"/>
+  </Obstruction>
+  <Researcher disable=""/>
+  <Resistance replace=""/>
+  <Selectable>
+    <Overlay>
+      <Outline>
+        <LineTexture>outline_border_02.png</LineTexture>
+        <LineTextureMask>outline_border_02_mask.png</LineTextureMask>
+        <LineThickness>0.5</LineThickness>
+      </Outline>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_ffactri.xml</select>
+      <constructed>interface/complete/building/complete_ffactri.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay disable=""/>
+  <TerritoryInfluence disable=""/>
+  <Vision>
+    <Range>30</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Melonas</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
-    <Circle radius="12.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>ptol</Civ>
-    <Lang>napatan</Lang>
-    <SpecificName>snwt</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="17.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/ptolemies/farmstead.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_resource_field">
-  <Capturable disable=""/>
-  <Health disable=""/>
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Wheat Field</SpecificName>
-  </Identity>
-  <Resistance replace=""/>
-  <ResourceSupply>
-    <MaxGatherers>2</MaxGatherers>
-  </ResourceSupply>
-  <TerritoryDecay disable=""/>
-  <VisualActor>
-    <Actor>structures/plot_field_temp.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
-    <Circle radius="11.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Epoikion</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="18.0" depth="16.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/spartans/farmstead.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
-    <Circle radius="11.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Kantu</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="12.0" depth="16.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/mauryas/farmstead.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
-    <Circle radius="12.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Villa</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="16.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/romans/farmstead.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
-    <Circle radius="13.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <Lang>persian</Lang>
-    <SpecificName>Kaštašta</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="18.0" depth="18.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/persians/farmstead.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_saharan.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_saharan.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_saharan.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
-    <Circle radius="12.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>kush</Civ>
-    <Lang>napatan</Lang>
-    <SpecificName>snwt</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="18.0" depth="16.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/kushites/farmstead.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml
+++ binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Identity>
-    <SpecificName>Melonas</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brauon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/mill_desert.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_desert.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_desert.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
+    <Circle radius="12.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>snwt</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="20.0" depth="17.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/ptolemies/farmstead.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_resource_field">
+  <Capturable disable=""/>
+  <Health disable=""/>
+  <Identity>
+    <SpecificName>Wheat Field</SpecificName>
+  </Identity>
+  <Resistance replace=""/>
+  <ResourceSupply>
+    <MaxGatherers>2</MaxGatherers>
+  </ResourceSupply>
+  <TerritoryDecay disable=""/>
+  <VisualActor>
+    <Actor>structures/plot_field_temp.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_greek.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_greek.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_greek.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
+    <Circle radius="11.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Epoikion</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="18.0" depth="16.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/spartans/farmstead.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_indian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_indian.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_indian.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
+    <Circle radius="11.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Kantu</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="12.0" depth="16.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/mauryas/farmstead.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_italian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_italian.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_italian.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
+    <Circle radius="12.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Villa</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="20.0" depth="16.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/romans/farmstead.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
+    <Circle radius="13.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Kaštašta</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="18.0" depth="18.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/persians/farmstead.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
+    <Circle radius="12.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>snwt</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="18.0" depth="16.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/kushites/farmstead.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.xml
+++ binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Identity>
+    <SpecificName>Melonas</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/celts/special.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Auras datatype="tokens">
-    structures/farmstead_60
-  </Auras>
-  <BuildRestrictions>
-    <Territory>own neutral</Territory>
-    <Category>RotaryMill</Category>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>500</CapturePoints>
-    <RegenRate>0</RegenRate>
-    <GarrisonRegenRate>3</GarrisonRegenRate>
-  </Capturable>
-  <Cost>
-    <BuildTime>100</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>200</wood>
-      <stone>100</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Circle radius="10.0"/>
-    <Height>6.0</Height>
-  </Footprint>
-  <GarrisonHolder disable=""/>
-  <Health disable=""/>
-  <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Farmstead</GenericName>
-    <SpecificName>Rotary Mill</SpecificName>
-    <VisibleClasses datatype="tokens">Farmstead</VisibleClasses>
-    <Classes datatype="tokens">
-	  RotaryMill
-	</Classes>
-    <Tooltip>Dropsite for harvested Food. Capture one of these to increase nearby food production.</Tooltip>
-    <Icon>structures/rotarymill.png</Icon>
-  </Identity>
-  <Loot>
-    <xp>100</xp>
-    <food>100</food>
-  </Loot>
-  <Minimap>
-    <Type>structure</Type>
-    <Icon size="16.0">other.png</Icon>
-  </Minimap>
-  <Obstruction>
-    <Static width="16.0" depth="16.0"/>
-  </Obstruction>
-  <RallyPoint disable=""/>
-  <ResourceDropsite>
-    <Types>food</Types>
-    <Sharable>true</Sharable>
-  </ResourceDropsite>
-  <Selectable>
-    <Overlay>
-      <Outline>
-        <LineTexture>outline_border_02.png</LineTexture>
-        <LineTextureMask>outline_border_02_mask.png</LineTextureMask>
-        <LineThickness>0.5</LineThickness>
-      </Outline>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_ffactri.xml</select>
-      <constructed>interface/complete/building/complete_ffactri.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay disable=""/>
-  <TerritoryInfluence disable=""/>
-  <Vision>
-    <Range>30</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
-</Entity>