Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/cart_walls.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/civbonuses/cart_walls.json
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/cart_walls.json
@@ -8,7 +8,8 @@
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 2 },
 		{ "value": "Cost/Resources/stone", "multiply": 2 },
-		{ "value": "Health/Max", "multiply": 3 }
+		{ "value": "Health/Max", "multiply": 3 },
+		{ "value": "Loot/xp", "multiply": 3 }
 	],
 	"affects": ["Wall"]
 }
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
@@ -2,13 +2,19 @@
 	"genericName": "Wooden Construction",
 	"autoResearch": true,
 	"description": "Celtic structures were mostly made of wood with rubble foundations.",
-	"requirements": { "any": [{ "civ": "brit" }, { "civ": "gaul" }] },
+	"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": "Capturable/CapturePoints", "multiply": 0.8 },
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Health/Max", "multiply": 0.8 }
+		{ "value": "Health/Max", "multiply": 0.8 },
+		{ "value": "Loot/xp", "multiply": 0.8 }
 	],
 	"affects": ["Structure !Wonder"]
 }
Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json
@@ -13,7 +13,8 @@
 	"tooltip": "Structures +10% health and +10% capture points.",
 	"modifications": [
 		{ "value": "Capturable/CapturePoints", "multiply": 1.1 },
-		{ "value": "Health/Max", "multiply": 1.1 }
+		{ "value": "Health/Max", "multiply": 1.1 },
+		{ "value": "Loot/xp", "multiply": 1.1 }
 	],
 	"affects": ["Structure !Wonder"]
 }
Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/maur_walls.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/civbonuses/maur_walls.json
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/maur_walls.json
@@ -7,7 +7,8 @@
 	"tooltip": "Mauryan City Walls −20% build time and −20% health.",
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Health/Max", "multiply": 0.8 }
+		{ "value": "Health/Max", "multiply": 0.8 },
+		{ "value": "Loot/xp", "multiply": 0.8 }
 	],
 	"affects": ["Wall"]
 }
Index: binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json
+++ binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json
@@ -14,7 +14,8 @@
 	"modifications": [
 		{ "value": "Capturable/CapturePoints", "multiply": 1.2 },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
-		{ "value": "Health/Max", "multiply": 1.2 }
+		{ "value": "Health/Max", "multiply": 1.2 },
+		{ "value": "Loot/xp", "multiply": 1.2 }
 	],
 	"affects": ["Civic"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
+++ binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
@@ -2,14 +2,20 @@
 	"genericName": "Persian Architecture",
 	"description": "The Persians built the wonderful 1677 mile-long Royal Highway from Sardis to Susa; Darius the Great and Xerxes also built the magnificent Persepolis; Cyrus the Great greatly improved Ecbatana and virtually 'rebuilt' the old Elamite capital of Susa.",
 	"cost": { "food": 0, "wood": 200, "stone": 200, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_village" }, { "civ": "pers" }] },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_village" },
+			{ "civ": "pers" }
+		]
+	},
 	"icon": "stone_blocks.png",
 	"researchTime": 60,
 	"tooltip": "All Persian structures +25% health and capture points, but also +20% build time.",
 	"modifications": [
 		{ "value": "Capturable/CapturePoints", "multiply": 1.25 },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
-		{ "value": "Health/Max", "multiply": 1.25 }
+		{ "value": "Health/Max", "multiply": 1.25 },
+		{ "value": "Loot/xp", "multiply": 1.25 }
 	],
 	"affects": ["Structure !Wonder"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
@@ -11,6 +11,9 @@
     <SpecificName>Uxelon</SpecificName>
     <Tooltip disable=""/>
   </Identity>
+  <Loot>
+    <xp>0</xp>
+  </Loot>
   <Obstruction>
     <Static width="10" depth="9"/>
   </Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
@@ -11,6 +11,9 @@
     <SpecificName>Uxelon</SpecificName>
     <Tooltip disable=""/>
   </Identity>
+  <Loot>
+    <xp>0</xp>
+  </Loot>
   <Obstruction>
     <Static width="8" depth="8"/>
   </Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
@@ -34,6 +34,7 @@
   <Loot>
     <wood>10</wood>
     <stone>50</stone>
+    <xp>240</xp>
   </Loot>
   <Obstruction>
     <Static width="14.0" depth="14.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -16,6 +16,7 @@
   </Identity>
   <Loot>
     <stone>240</stone>
+    <xp>600</xp>
   </Loot>
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
+++ binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Attack disable=""/>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Distance>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Attack disable=""/>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Distance>
Index: binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
+<Entity parent="template_structure">
   <Attack>
     <Ranged>
       <Damage>
@@ -57,6 +57,8 @@
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>6</LoadingRange>
@@ -71,12 +73,13 @@
     <SpecificName>Castra</SpecificName>
     <Tooltip>Build in neutral or enemy territory. Train Citizen-Soldiers and construct Siege Engines. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">ArmyCamp</VisibleClasses>
+    <VisibleClasses datatype="tokens">City ArmyCamp</VisibleClasses>
     <Icon>structures/roman_camp.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>100</xp>
     <wood>100</wood>
+    <xp>250</xp>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="36.0"/>
@@ -106,9 +109,7 @@
     </Entity>
     <Foundation>
       <Damage>
-        <Hack>1</Hack>
         <Pierce>5</Pierce>
-        <Crush>1</Crush>
       </Damage>
     </Foundation>
   </Resistance>
@@ -121,7 +122,6 @@
   <TerritoryDecay>
     <DecayRate>37.5</DecayRate>
   </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>60</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure.xml
+++ binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -53,11 +53,11 @@
     <Undeletable>false</Undeletable>
   </Identity>
   <Loot>
-    <xp>0</xp>
     <food>0</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
+    <xp>0</xp>
   </Loot>
   <Looter/>
   <Minimap>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -83,10 +83,10 @@
     <Icon>structures/civic_centre.png</Icon>
   </Identity>
   <Loot>
-    <xp>200</xp>
     <wood>100</wood>
     <stone>100</stone>
     <metal>100</metal>
+    <xp>300</xp>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -34,6 +34,7 @@
     <wood>40</wood>
     <stone>40</stone>
     <metal>40</metal>
+    <xp>200</xp>
   </Loot>
   <ProductionQueue>
     <Technologies datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
@@ -4,22 +4,10 @@
     <GenericName>Defensive Structure</GenericName>
     <VisibleClasses datatype="tokens">Defensive</VisibleClasses>
   </Identity>
-  <Loot>
-    <xp>100</xp>
-  </Loot>
   <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>25</Hack>
-        <Pierce>30</Pierce>
-        <Crush>3</Crush>
-      </Damage>
-    </Entity>
     <Foundation>
       <Damage>
-        <Hack>1</Hack>
         <Pierce>5</Pierce>
-        <Crush>1</Crush>
       </Damage>
     </Foundation>
   </Resistance>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -45,7 +45,6 @@
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
-    <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -61,6 +60,11 @@
   <StatusBars>
     <HeightOffset>18.0</HeightOffset>
   </StatusBars>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>32</Radius>
+    <Weight>30000</Weight>
+  </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -63,6 +63,7 @@
   <Loot>
     <wood>40</wood>
     <stone>40</stone>
+    <xp>140</xp>
   </Loot>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
@@ -82,9 +83,4 @@
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>32</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -62,6 +62,7 @@
   <Loot>
     <stone>40</stone>
     <metal>20</metal>
+    <xp>140</xp>
   </Loot>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
@@ -81,9 +82,4 @@
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>32</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -36,6 +36,7 @@
   </Identity>
   <Loot>
     <wood>20</wood>
+    <xp>50</xp>
   </Loot>
   <Obstruction>
     <Static width="9.0" depth="7.5"/>
@@ -55,9 +56,7 @@
     </Entity>
   </Resistance>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>16</Radius>
-    <Weight>30000</Weight>
   </TerritoryInfluence>
   <Upgrade>
     <Tower>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
@@ -38,6 +38,7 @@
   <Loot>
     <wood>20</wood>
     <stone>20</stone>
+    <xp>100</xp>
   </Loot>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
@@ -51,9 +52,4 @@
       tower_armour
     </Technologies>
   </ProductionQueue>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>32</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
@@ -34,6 +34,15 @@
   <Repairable>
     <RepairTimeRatio>4.5</RepairTimeRatio>
   </Repairable>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>30</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_wall.xml</select>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -59,6 +59,15 @@
   <Obstruction>
     <ControlPersist/>
   </Obstruction>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>30</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -73,8 +73,8 @@
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>100</xp>
     <stone>200</stone>
+    <xp>420</xp>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
Index: binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -45,7 +45,6 @@
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>300</xp>
     <wood>200</wood>
     <stone>300</stone>
     <metal>200</metal>