Index: binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml
+++ binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml
@@ -420,7 +420,7 @@
 			<Orientation y="3.16405"/>
 		</Entity>
 		<Entity uid="82">
-			<Template>structures/brit_kennel</Template>
+			<Template>other/celt_longhouse</Template>
 			<Player>2</Player>
 			<Position x="402.766" z="251.594"/>
 			<Orientation y="2.67188"/>
@@ -522,7 +522,7 @@
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="100">
-			<Template>structures/brit_kennel</Template>
+			<Template>other/celt_longhouse</Template>
 			<Player>2</Player>
 			<Position x="463.375" z="256.234"/>
 			<Orientation y="2.67188"/>
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
@@ -22481,14 +22481,14 @@
 			<Actor seed="15244"/>
 		</Entity>
 		<Entity uid="3940">
-			<Template>structures/brit_kennel</Template>
+			<Template>units/brit_war_dog_b</Template>
 			<Player>1</Player>
 			<Position x="516.67469" z="525.47437"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33744"/>
 		</Entity>
 		<Entity uid="3941">
-			<Template>structures/brit_kennel</Template>
+			<Template>units/brit_war_dog_b</Template>
 			<Player>1</Player>
 			<Position x="482.8693" z="478.13968"/>
 			<Orientation y="1.92223"/>
Index: binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player/player.xml
+++ binaries/data/mods/public/simulation/templates/special/player/player.xml
@@ -33,16 +33,13 @@
       <UniqueBuilding>1</UniqueBuilding>
       <Hall>2</Hall>
       <Stoa>2</Stoa>
-      <Kennel>5</Kennel>
       <PyramidSmall>4</PyramidSmall>
       <PyramidLarge>2</PyramidLarge>
       <TempleOfAmun>1</TempleOfAmun>
       <Gladiator>0</Gladiator>
+      <WarDog>20</WarDog>
     </Limits>
     <LimitChangers>
-      <WarDog>
-        <Kennel>10</Kennel>
-      </WarDog>
       <Pillar>
         <Ashoka>5</Ashoka>
       </Pillar>
Index: binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_kennel">
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Cunattegia</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/britons/kennel.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -46,6 +46,7 @@
       units/{civ}_champion_maiden_barracks
       units/{civ}_champion_cavalry_barracks
       units/{civ}_champion_chariot_barracks
+      units/{civ}_war_dog_b
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
Index: binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military">
-  <Armour>
-    <Hack>10</Hack>
-    <Pierce>40</Pierce>
-    <Crush>5</Crush>
-    <Foundation>
-      <Hack>3</Hack>
-      <Pierce>8</Pierce>
-      <Crush>2</Crush>
-    </Foundation>
-  </Armour>
-  <BuildRestrictions>
-    <Category>Kennel</Category>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>50</BuildTime>
-    <Resources>
-      <wood>50</wood>
-      <stone>50</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="8.0" depth="7.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <List datatype="tokens">Dog</List>
-    <BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
-  <Health>
-    <Max>500</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">Kennel</Classes>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
-    <GenericName>Kennel</GenericName>
-    <SelectionGroupName>template_structure_military_kennel</SelectionGroupName>
-    <Tooltip>Train war dogs.</Tooltip>
-    <Icon>structures/kennel.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>10</wood>
-    <stone>10</stone>
-    <metal>40</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="7.5" depth="6.75"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_war_dog_b
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <constructed>interface/complete/building/complete_kennel.xml</constructed>
-      <select>interface/select/building/sel_kennel.xml</select>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <TerritoryInfluence>
-    <Radius>20</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_kennel
       structures/brit_rotarymill
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_kennel
       structures/brit_rotarymill
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_kennel
       structures/brit_rotarymill
     </Entities>
   </Builder>