Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic_cattle">
+<Entity parent="template_unit_fauna_domestic_cattle">
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic_cattle">
+<Entity parent="template_unit_fauna_domestic_cattle">
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic_cattle">
+<Entity parent="template_unit_fauna_domestic_cattle">
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_domestic">
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_domestic">
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_domestic">
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_domestic">
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_passive">
+<Entity parent="template_unit_fauna">
   <Footprint>
     <Square width="2.0" depth="8.0"/>
     <Height>2.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_domestic">
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_breed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_breed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_breed_passive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_breed_passive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_breed">
-  <Vision>
-    <Range>10</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_domestic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_domestic.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_domestic.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd">
+<Entity parent="template_unit_fauna">
   <Identity>
+    <Tooltip>Kill to gather meat for food.</Tooltip>
     <Classes datatype="tokens">Domestic</Classes>
   </Identity>
+  <ResourceSupply>
+    <KillBeforeGather>true</KillBeforeGather>
+    <Max>100</Max>
+    <Type>food.meat</Type>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <Vision>
     <Range>6</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_domestic_cattle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_domestic_cattle.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_domestic_cattle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_domestic">
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Identity>
-    <Tooltip>Kill to gather meat for food.</Tooltip>
-  </Identity>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Max>100</Max>
-    <Type>food.meat</Type>
-    <MaxGatherers>8</MaxGatherers>
-  </ResourceSupply>
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd">
-  <Identity>
-    <Classes datatype="tokens">Domestic</Classes>
-  </Identity>
-  <Vision>
-    <Range>6</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/cattle_select.xml</select>
-      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
-      <death>actor/fauna/animal/cattle_death.xml</death>
-      <trained>actor/fauna/animal/cattle_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.4</WalkSpeed>
-    <RunMultiplier>1.4</RunMultiplier>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_passive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_passive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild">
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
-</Entity>