diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
index b9a9e669f6..722cf982aa 100644
--- a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b4694aa464ab595ed196140223719c46262e44a202abac405ef2aa34c4181e4
-size 452563
+oid sha256:7801ccc3e0b2f3cb1c1bbdf4df6cb615d7a2c22543c409df0fe9048a75abc25b
+size 452554
diff --git a/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml b/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
index 4254126958..9e517d7aa0 100644
--- a/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07fde3c8f6645a115a08ff3c1ba048e646eb3dcbd4e8c1a2aa1d1301c3b733c0
-size 487525
+oid sha256:71b40cbe74b625aa356925da14772d9084bf5d02abd07267fea49990dfd1fb0e
+size 487435
diff --git a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
index 686bd05338..48609b5d3f 100644
--- a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de164e3353488a77d180bedd5a997f5ee11f58d52186b6c67e5dd23919b126dc
-size 564836
+oid sha256:bdb8c1c72c9649e87a12ba9a27457b89fb4aa97cb45ae107df7bc9d857c7eba0
+size 564826
diff --git a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
index 3a143ff9cd..6af3c43da4 100644
--- a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4fd51edc3c991818eaa1948525d1fe3c1f3a2cc40edf1c7a2cfdb2461c518cb
-size 939472
+oid sha256:58d2895d2291e8e30fa27495241bf9fbbb009ce0094b4c9523a5f0899ee8b843
+size 939417
diff --git a/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml b/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
index d287061058..efcd8bd45e 100644
--- a/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c057dfd9cf748021aac9457ee09f9b1cbb15a9c3ce6dbf56840e6a66ec6ba6c5
-size 1115755
+oid sha256:43f567b9496dc1e56888ae90ed7ad1d7f088a79836d03fe5908d427a260b84c7
+size 1115635
diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
index 5e5af138ae..c587ed4f40 100644
--- a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3244c33684c3392f947b7dd93fe9e2142ab04e85c35a663b2065c69a4737b083
-size 354680
+oid sha256:c4caec4a1c73fcbd7f49bc97a3b76d17be13e77100a5ede8b63511e40e567763
+size 354670
diff --git a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
index 4821fc085d..5b742215a2 100644
--- a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dd8d88ca73466b51b7dba0a8025136198b8753de6190e50cdd1dc6ed7da8af0
-size 999658
+oid sha256:7893186bf21d800976624739e44bc7a07940f22a3f3d55569ad05aa368694690
+size 999568
diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
index 051d18997f..cf465707f1 100644
--- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b39d58e2dd5f176e1bfab422b17f05785b1344aaeed1c239aa511a3954e87c4
-size 811200
+oid sha256:9d04878737f40e63360171fa6f0235d438ef12f877fd907442df5289ab4b8d62
+size 811180
diff --git a/binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json b/binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json
index 5e358292c0..8fb57a238a 100644
--- a/binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json
+++ b/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",
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml b/binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml
similarity index 63%
rename from binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
rename to binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml
index 81f608bfc0..a7edddd8ef 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml
@@ -1,59 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
+<Entity>
   <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>
+    <GenericName>Rotary Mill</GenericName>
     <SpecificName>Rotary Mill</SpecificName>
-    <VisibleClasses datatype="tokens">Farmstead</VisibleClasses>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  RotaryMill
-	</Classes>
+	</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>
-  <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>
+  <Researcher disable=""/>
+  <Resistance replace=""/>
   <Selectable>
     <Overlay>
       <Outline>
@@ -79,7 +56,6 @@
     <Range>30</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml b/binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml
index bda848509c..08f8823359 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml b/binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml
index c9e92e769d..ff76782d7c 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml b/binaries/data/mods/public/simulation/templates/structures/mill_desert.xml
similarity index 73%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_desert.xml
index 50e6d1db78..0691b4ff28 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_desert.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
     <Circle radius="12.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>ptol</Civ>
-    <Lang>napatan</Lang>
     <SpecificName>snwt</SpecificName>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml b/binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml
similarity index 95%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml
index b1a0405e2c..0505b5bb39 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml
@@ -3,7 +3,6 @@
   <Capturable disable=""/>
   <Health disable=""/>
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>Wheat Field</SpecificName>
   </Identity>
   <Resistance replace=""/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml b/binaries/data/mods/public/simulation/templates/structures/mill_greek.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_greek.xml
index 6a06801665..82901dbbeb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_greek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
     <Circle radius="11.0"/>
     <Height>10.0</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml b/binaries/data/mods/public/simulation/templates/structures/mill_indian.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_indian.xml
index 354a7db4de..26f0583698 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_indian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
     <Circle radius="11.0"/>
     <Height>10.0</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml b/binaries/data/mods/public/simulation/templates/structures/mill_italian.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_italian.xml
index 158e6263e2..0a5e238fa1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_italian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
     <Circle radius="12.0"/>
     <Height>10.0</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml b/binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
similarity index 76%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
index 0c75e7ce22..1b569a4f18 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
     <Circle radius="13.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Lang>persian</Lang>
     <SpecificName>Kaštašta</SpecificName>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_saharan.xml b/binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml
similarity index 73%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_saharan.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml
index 640428cb6e..63496dc166 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_saharan.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
-  <Footprint replace="">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
+  <Footprint>
     <Circle radius="12.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>kush</Civ>
-    <Lang>napatan</Lang>
     <SpecificName>snwt</SpecificName>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml b/binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.xml
similarity index 74%
rename from binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml
rename to binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.xml
index 4f8680b99e..f07b272223 100644
--- a/binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.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>
     <SpecificName>Melonas</SpecificName>
   </Identity>