Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/brit_structures.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/brit_structures.json
@@ -0,0 +1,12 @@
+{
+	"genericName": "Living Space",
+	"autoResearch": true,
+	"description": "",
+	"requirements": { "civ": "brit" },
+	"icon": "wooden_buildings.png",
+	"tooltip": "Structures +2 population bonus.",
+	"modifications": [
+		{ "value": "Cost/PopulationBonus", "add": 2 }
+	],
+	"affects": ["Economic", "Military"]
+}
Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
@@ -1,14 +0,0 @@
-{
-	"genericName": "Wooden Construction",
-	"autoResearch": true,
-	"description": "Celtic structures were mostly made of wood with rubble foundations.",
-	"requirements": { "any": [{ "civ": "brit" }, { "civ": "gaul" }] },
-	"icon": "wooden_buildings.png",
-	"tooltip": "Briton and Gaulish Structures −20% build time, −20% health, and −20% capture points.",
-	"modifications": [
-		{ "value": "Health/Max", "multiply": 0.8 },
-		{ "value": "Capturable/CapturePoints", "multiply": 0.8 },
-		{ "value": "Cost/BuildTime", "multiply": 0.8 }
-	],
-	"affects": ["Structure"]
-}
Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/gaul_structures.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/civbonuses/gaul_structures.json
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/gaul_structures.json
@@ -2,13 +2,13 @@
 	"genericName": "Wooden Construction",
 	"autoResearch": true,
 	"description": "Celtic structures were mostly made of wood with rubble foundations.",
-	"requirements": { "any": [{ "civ": "brit" }, { "civ": "gaul" }] },
+	"requirements": { "civ": "gaul" },
 	"icon": "wooden_buildings.png",
-	"tooltip": "Briton and Gaulish Structures −20% build time, −20% health, and −20% capture points.",
+	"tooltip": "Structures −20% build time, −20% health, and −20% capture points.",
 	"modifications": [
-		{ "value": "Health/Max", "multiply": 0.8 },
 		{ "value": "Capturable/CapturePoints", "multiply": 0.8 },
-		{ "value": "Cost/BuildTime", "multiply": 0.8 }
+		{ "value": "Cost/BuildTime", "multiply": 0.8 },
+		{ "value": "Health/Max", "multiply": 0.8 }
 	],
-	"affects": ["Structure"]
+	"affects": ["Structure !Wonder"]
 }
Index: binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Cost>
-    <PopulationBonus>4</PopulationBonus>
     <Resources>
       <wood>300</wood>
     </Resources>
Index: binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_blacksmith">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Gobanion</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="12.0" depth="12.0"/>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
-  <Cost>
-    <PopulationBonus>12</PopulationBonus>
-  </Cost>
   <Footprint replace="">
     <Circle radius="17.0"/>
     <Height>18.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_house.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_house.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_house.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Footprint>
-    <Square disable=""/>
+  <Footprint replace="">
     <Circle radius="6.0"/>
+    <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
Index: binaries/data/mods/public/simulation/templates/structures/brit_market.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_market.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_market.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
-  <Cost>
-    <PopulationBonus>5</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_storehouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_storehouse.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_storehouse.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Cost>
-    <PopulationBonus>4</PopulationBonus>
     <Resources>
       <wood>300</wood>
     </Resources>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_blacksmith">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Gobanion</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="19.0" depth="18.0"/>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
-  <Cost>
-    <PopulationBonus>12</PopulationBonus>
-  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_market.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_market.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_market.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
-  <Cost>
-    <PopulationBonus>5</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_storehouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_storehouse.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_storehouse.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="15.0" depth="17.0"/>
   </Footprint>