Index: binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1805,9 +1805,9 @@
 		return;
 	}
 
-	if (this.canBuild(gameState, "structures/{civ}_siege_workshop") && !gameState.getOwnEntitiesByClass("Workshop", true).hasEntities())
+	if (this.canBuild(gameState, "structures/{civ}_workshop") && !gameState.getOwnEntitiesByClass("Workshop", true).hasEntities())
 	{
-		queues.militaryBuilding.addPlan(new m.ConstructionPlan(gameState, "structures/{civ}_siege_workshop", { "militaryBase": true }));
+		queues.militaryBuilding.addPlan(new m.ConstructionPlan(gameState, "structures/{civ}_workshop", { "militaryBase": true }));
 		return;
 	}
 
Index: binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
+++ binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
@@ -302,7 +302,7 @@
 	//obstructions.dumpIm(template.buildPlacementType() + "_obstructions.png");
 
 	let radius = 0;
-	if (template.hasClass("Fortress") || this.type === gameState.applyCiv("structures/{civ}_siege_workshop") ||
+	if (template.hasClass("Fortress") || this.type === gameState.applyCiv("structures/{civ}_workshop") ||
 		this.type === gameState.applyCiv("structures/{civ}_elephant_stables"))
 		radius = Math.floor((template.obstructionRadius().max + 12) / obstructions.cellSize);
 	else if (template.resourceDropsiteTypes() === undefined && !template.hasClass("House") && !template.hasClass("Field"))
Index: binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_workshop">
+<Entity parent="template_structure_military_workshop">
   <Footprint>
     <Square width="32.0" depth="32.0"/>
-    <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>brit</Civ>
   </Identity>
@@ -14,7 +10,6 @@
     <Static width="32.0" depth="32.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/britons/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+    <Actor>structures/brittons/workshop.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
@@ -1,21 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>cart</Civ>
-    <SpecificName>?</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>iber</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_siege_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_siege_workshop.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <wood>300</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>2000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Synergeîon Poliorkētṓn</SpecificName>
-    <GenericName>Siege Workshop</GenericName>
-    <Tooltip>Build siege engines. Research siege technologies.</Tooltip>
-    <Icon>structures/siege_workshop.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Workshop</VisibleClasses>
-  </Identity>
-  <Loot>
-    <wood>75</wood>
-  </Loot>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_mechanical_siege_ballista_packed
-      units/{civ}_mechanical_siege_scorpio_packed
-      units/{civ}_mechanical_siege_oxybeles_packed
-      units/{civ}_mechanical_siege_lithobolos_packed
-      units/{civ}_mechanical_siege_polybolos_packed
-      units/{civ}_mechanical_siege_ram
-      units/{civ}_mechanical_siege_tower
-    </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
-  <VisualActor>
-    <Actor>structures/hellenes/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_workshop">
+  <Footprint>
+    <Square width="24.0" depth="24.0"/>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Synergeîon Poliorkētṓn</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="24.0" depth="24.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/hellenes/blacksmith.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>pers</Civ>
-    <SpecificName>?</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/persians/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>sele</Civ>
-    <SpecificName>?</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/seleucids/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
+<Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Stratēgeîon</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/spartans/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks_workshop.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
-  <Cost>
-    <BuildTime>175</BuildTime>
-    <Resources>
-      <wood>450</wood>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <List datatype="tokens">Siege -Infantry -Cavalry</List>
-  </GarrisonHolder>
-  <Identity>
-    <GenericName>Siege Workshop</GenericName>
-    <Tooltip>Train siege weapons. Research training improvements.</Tooltip>
-    <Icon>structures/barracks.png</Icon>
-  </Identity>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
-      units/{civ}_mechanical_siege_ballista_packed
-      units/{civ}_mechanical_siege_scorpio_packed
-      units/{civ}_mechanical_siege_oxybeles_packed
-      units/{civ}_mechanical_siege_lithobolos_packed
-      units/{civ}_mechanical_siege_polybolos_packed
-      units/{civ}_mechanical_siege_ram
-      units/{civ}_mechanical_siege_tower
-    </Entities>
-  </ProductionQueue>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military">
+  <BuildRestrictions>
+    <Category>Barracks</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <wood>300</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="30.0" depth="30.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>2</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Siege</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Siege Workshop</GenericName>
+    <Icon>structures/siege_workshop.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+    <Tooltip>Build siege engines to destroy your opponents buildings. Research siege technologies to improve the effectiveness of these weapons.</Tooltip>
+    <VisibleClasses datatype="tokens">City Workshop</VisibleClasses>
+  </Identity>
+  <Loot>
+    <wood>75</wood>
+  </Loot>
+  <Obstruction>
+    <Static width="29.0" depth="29.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_mechanical_siege_ballista_packed
+      units/{civ}_mechanical_siege_scorpio_packed
+      units/{civ}_mechanical_siege_oxybeles_packed
+      units/{civ}_mechanical_siege_lithobolos_packed
+      units/{civ}_mechanical_siege_polybolos_packed
+      units/{civ}_mechanical_siege_ram
+      units/{civ}_mechanical_siege_tower
+    </Entities>
+    <Technologies datatype="tokens">
+      siege_attack
+      siege_armor
+      siege_cost_metal
+      siege_cost_wood
+      siege_bolt_accuracy
+    </Technologies>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <constructed>interface/complete/building/complete_barracks.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+      <select>interface/select/building/sel_barracks.xml</select>
+    </SoundGroups>
+  </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
+  <VisualActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_siege_workshop
+      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_siege_workshop
+      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_siege_workshop
+      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_siege_workshop
+      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>