Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <GenericName>Wooden Wall</GenericName>
     <SpecificName>Palisade</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Teîkhos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Rate</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Low Wall</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Jdar</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Rate</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Zabal Horma</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>sbty</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Teîkhos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Shilabanda</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Para</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>h-n-njwt</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Siege Wall</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Moenia</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Teîkhos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wallset_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wallset_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Teîkhos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Abstract entity to serve as a bare-minimum dummy constructable entity to initiate wall placement.
-     Defines the set of actual entities that are part of the same wall construction system (i.e., towers,
-     gates, wall segments of various length, etc.) using the WallSet component (to be overridden by child
-     templates). -->
-<Entity>
-  <Identity>
-    <Civ>gaia</Civ>
-    <Icon>structures/wall.png</Icon>
-    <Classes datatype="tokens">StoneWall</Classes>
-    <GenericName>City Wall</GenericName>
-    <Tooltip>Wall off your town for a stout defense.</Tooltip>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <Undeletable>true</Undeletable>
-  </Identity>
-  <WallSet>
-    <MaxTowerOverlap>0.85</MaxTowerOverlap>
-    <MinTowerOverlap>0.05</MinTowerOverlap>
-  </WallSet>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-    <AlwaysVisible>false</AlwaysVisible>
-    <Corpse>false</Corpse>
-    <Preview>false</Preview>
-  </Visibility>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Abstract entity to serve as a bare-minimum dummy constructable entity to initiate wall placement.
+     Defines the set of actual entities that are part of the same wall construction system (i.e., towers,
+     gates, wall segments of various length, etc.) using the WallSet component (to be overridden by child
+     templates). -->
+<Entity>
+  <Identity>
+    <Civ>gaia</Civ>
+    <Icon>structures/wall.png</Icon>
+    <Classes datatype="tokens">StoneWall</Classes>
+    <GenericName>City Wall</GenericName>
+    <Tooltip>Wall off your town for a stout defense.</Tooltip>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Undeletable>true</Undeletable>
+  </Identity>
+  <WallSet>
+    <MaxTowerOverlap>0.85</MaxTowerOverlap>
+    <MinTowerOverlap>0.05</MinTowerOverlap>
+  </WallSet>
+  <Visibility>
+    <RetainInFog>false</RetainInFog>
+    <AlwaysVisible>false</AlwaysVisible>
+    <Corpse>false</Corpse>
+    <Preview>false</Preview>
+  </Visibility>
+</Entity>