diff --git a/binaries/data/mods/public/gui/session/selection_details.js b/binaries/data/mods/public/gui/session/selection_details.js
index 0aef33d368..7df298fbed 100644
--- a/binaries/data/mods/public/gui/session/selection_details.js
+++ b/binaries/data/mods/public/gui/session/selection_details.js
@@ -16,6 +16,9 @@ function displaySingle(entState, template)
 	// Get general unit and player data
 	var specificName = template.name.specific;
 	var genericName = template.name.generic != template.name.specific? template.name.generic : "";
+	// If packed, add that to the generic name (reduces template clutter)
+	if (genericName && template.pack.state == "packed")
+		genericName += " -- Packed";
 	var playerState = g_Players[entState.player];
 
 	var civName = g_CivData[playerState.civ].Name;
diff --git a/binaries/data/mods/public/gui/session/unit_commands.js b/binaries/data/mods/public/gui/session/unit_commands.js
index 147eb4b72e..7f07b220d7 100644
--- a/binaries/data/mods/public/gui/session/unit_commands.js
+++ b/binaries/data/mods/public/gui/session/unit_commands.js
@@ -1111,13 +1111,13 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
 				}
 			}
 			if (packButton)
-				items.push({ "packing": false, "packed": false, "tooltip": "Pack this unit", "callback": function() { packUnit(true); } });
+				items.push({ "packing": false, "packed": false, "tooltip": "Pack", "callback": function() { packUnit(true); } });
 			if (unpackButton)
-				items.push({ "packing": false, "packed": true, "tooltip": "Unpack this unit", "callback": function() { packUnit(false); } });
+				items.push({ "packing": false, "packed": true, "tooltip": "Unpack", "callback": function() { packUnit(false); } });
 			if (packCancelButton)
-				items.push({ "packing": true, "packed": false, "tooltip": "Stop packing this unit", "callback": function() { cancelPackUnit(true); } });
+				items.push({ "packing": true, "packed": false, "tooltip": "Cancel packing", "callback": function() { cancelPackUnit(true); } });
 			if (unpackCancelButton)
-				items.push({ "packing": true, "packed": true, "tooltip": "Stop unpacking this unit", "callback": function() { cancelPackUnit(false); } });
+				items.push({ "packing": true, "packed": true, "tooltip": "Cancel unpacking", "callback": function() { cancelPackUnit(false); } });
 
 			if (items.length)
 				setupUnitPanel(PACK, usedPanels, entState, playerState, items);
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista_unpacked.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
similarity index 89%
rename from binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista_unpacked.xml
rename to binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
index 02f4c9d74d..b95b8e6991 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@@ -57,11 +57,6 @@
     <stone>0</stone>
     <metal>10</metal>
   </Loot>
-  <Pack>
-    <Entity>template_unit_mechanical_siege_ballista_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
   <Selectable>
     <Overlay>
       <Texture>
@@ -71,9 +66,9 @@
     </Overlay>
   </Selectable>
   <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
+    <WalkSpeed>6.5</WalkSpeed>
     <Run>
-      <Speed>0.001</Speed>
+      <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista_packed.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista_packed.xml
deleted file mode 100644
index d4eb04eedd..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista_packed.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
-  <Armour>
-    <Hack>4.0</Hack>
-    <Crush>2.0</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>20.0</Crush>
-      <MaxRange>60</MaxRange>
-      <MinRange>8.0</MinRange>
-      <Spread>6.0</Spread>
-      <ProjectileSpeed>60.0</ProjectileSpeed>
-      <PrepareTime>5000</PrepareTime>
-      <RepeatTime>5000</RepeatTime>
-      <Bonuses>
-        <BonusOrganic>
-        <Classes>Organic</Classes>
-        <Multiplier>2.0</Multiplier>
-        </BonusOrganic>
-      </Bonuses>
-      <Splash>
-        <Shape>Linear</Shape>
-        <Range>12</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Hack>0.0</Hack>
-        <Pierce>30.0</Pierce>
-        <Crush>30.0</Crush>
-      </Splash>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-    <Population>2</Population>
-  </Cost>
-  <Footprint replace="">
-    <Square width="8.0" depth="9.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Bolt Shooter -- Packed</GenericName>
-    <Tooltip>Bonused vs. Infantry and Cavalry units.</Tooltip>
-  </Identity>
-  <Loot>
-    <xp>200</xp>
-    <food>0</food>
-    <wood>10</wood>
-    <stone>0</stone>
-    <metal>10</metal>
-  </Loot>
-  <Pack>
-    <Entity>template_unit_mechanical_siege_ballista_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
-  <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
-    <Run>
-      <Speed>12.0</Speed>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>70</Range>
-  </Vision>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager_packed.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
similarity index 91%
rename from binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager_packed.xml
rename to binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
index 0a0bd9454f..73edcef395 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@@ -50,7 +50,7 @@
     <Max>150</Max>
   </Health>
   <Identity>
-    <GenericName>Siege Catapult -- Packed</GenericName>
+    <GenericName>Siege Catapult</GenericName>
     <Tooltip>Bonused vs. Structures and Massed Infantry.</Tooltip>
   </Identity>
   <Loot>
@@ -60,11 +60,6 @@
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
-  <Pack>
-    <Entity>template_unit_mechanical_siege_onager_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
   <Selectable>
     <Overlay>
       <Texture>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager_unpacked.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager_unpacked.xml
deleted file mode 100644
index 4975afbd4b..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager_unpacked.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
-  <Armour>
-    <Hack>4.0</Hack>
-    <Crush>10.0</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Hack>30.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>30.0</Crush>
-      <MaxRange>68</MaxRange>
-      <MinRange>12.0</MinRange>
-      <ProjectileSpeed>28.0</ProjectileSpeed>
-      <PrepareTime>5000</PrepareTime>
-      <RepeatTime>5000</RepeatTime>
-      <Spread>6.0</Spread>
-      <Bonuses>
-        <BonusStruct>
-          <Classes>Structure</Classes>
-          <Multiplier>2.0</Multiplier>
-        </BonusStruct>
-        <NerfWall>
-          <Classes>StoneWall</Classes>
-          <Multiplier>0.75</Multiplier>
-        </NerfWall>
-      </Bonuses>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>8</Range>
-        <FriendlyFire>true</FriendlyFire>
-        <Hack>40.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>40.0</Crush>
-      </Splash>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <wood>200</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="10.0" depth="15.0"/>
-    <Height>4.5</Height>
-  </Footprint>
-  <Health>
-    <Max>150</Max>
-  </Health>
-  <Identity>
-    <GenericName>Siege Catapult</GenericName>
-    <Tooltip>Bonused vs. Structures and Massed Infantry.</Tooltip>
-  </Identity>
-  <Loot>
-    <xp>300</xp>
-    <food>0</food>
-    <wood>20</wood>
-    <stone>10</stone>
-    <metal>0</metal>
-  </Loot>
-  <Pack>
-    <Entity>template_unit_mechanical_siege_onager_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <attack>attack/siege/ballist_attack.xml</attack>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>4.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-  </StatusBars>
-  <UnitAI>
-    <DefaultStance>standground</DefaultStance>
-  </UnitAI>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_common.xml b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_common.xml
new file mode 100644
index 0000000000..482d15b3b2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_common.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml
index 7a03980808..6dae022c21 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_packed">
+<Entity parent="units/athen_mechanical_siege_lithobolos_common">
   <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/athen_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/athenians/siege_rock_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml
index 52d76c89d2..a622d88fc8 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_unpacked">
+<Entity parent="units/athen_mechanical_siege_lithobolos_common">
   <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/athen_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/athenians/siege_rock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_common.xml b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_common.xml
new file mode 100644
index 0000000000..f78afe7415
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_common.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml
index a212c8ce77..be982b1c7a 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_packed">
+<Entity parent="units/athen_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/athen_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/athenians/siege_spear_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml
index 734ffdd9bf..61cb8523b9 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_unpacked">
+<Entity parent="units/athen_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/athen_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/athenians/siege_spear.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_common.xml b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_common.xml
new file mode 100644
index 0000000000..a430091ecf
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_common.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Ballista</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml
index c5933620ec..b6566a315e 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_packed">
+<Entity parent="units/cart_mechanical_siege_ballista_common">
   <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Ballista</SpecificName>
     <Icon>units/cart_mechanical_siege_ballista_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/cart_mechanical_siege_ballista_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/carthaginians/siege_rock_packed.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml
index 1eb1119021..ae6c9eb2ad 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_unpacked">
+<Entity parent="units/cart_mechanical_siege_ballista_common">
   <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Ballista</SpecificName>
     <Icon>units/cart_mechanical_siege_ballista.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/cart_mechanical_siege_ballista_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/carthaginians/siege_rock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_common.xml b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_common.xml
new file mode 100644
index 0000000000..c42053b801
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_common.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Oxybeles</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml
index 6de6c76c18..8faa2e67cb 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_packed">
+<Entity parent="units/cart_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Oxybeles</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/cart_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/carthaginians/siege_spear_packed.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml
index b68341be74..5df245544d 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_unpacked">
+<Entity parent="units/cart_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Oxybeles</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/cart_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/carthaginians/siege_spear.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_common.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_common.xml
new file mode 100644
index 0000000000..2b0dd377ad
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_common.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_packed.xml
index 550eeda6dd..652c025e3d 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_packed.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_packed">
+<Entity parent="units/hele_mechanical_siege_lithobolos_common">
   <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/hele_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/siege_rock_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_unpacked.xml
index 22684bfa63..f5ce249315 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_unpacked.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_unpacked">
+<Entity parent="units/hele_mechanical_siege_lithobolos_common">
   <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/hele_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_rock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_common.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_common.xml
new file mode 100644
index 0000000000..d2d301b0af
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_common.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_packed.xml
index 8fee8da34d..208ef26816 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_packed.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_packed">
+<Entity parent="units/hele_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/hele_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/siege_spear_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_unpacked.xml
index 6434054cb8..cddcb915fc 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_unpacked.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_unpacked">
+<Entity parent="units/hele_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/hele_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_spear.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_common.xml b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_common.xml
new file mode 100644
index 0000000000..cf5700d8e0
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_common.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_packed.xml b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_packed.xml
index 0c042c2ecb..980e15b1cf 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_packed.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_packed">
+<Entity parent="units/mace_mechanical_siege_lithobolos_common">
   <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/siege_rock_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_unpacked.xml
index f143cc1fdf..742bb6d123 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_unpacked.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_unpacked">
+<Entity parent="units/mace_mechanical_siege_lithobolos_common">
   <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_rock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_common.xml b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_common.xml
new file mode 100644
index 0000000000..8700428ea1
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_common.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_packed.xml b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_packed.xml
index 93395db678..786d2b002e 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_packed.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_packed">
+<Entity parent="units/mace_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/mace_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/siege_spear_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_unpacked.xml
index d1dd49a6b1..b23db59c62 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_unpacked.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_unpacked">
+<Entity parent="units/mace_mechanical_siege_oxybeles_common">
   <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
   <Pack>
     <Entity>units/mace_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_spear.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_common.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_common.xml
new file mode 100644
index 0000000000..dfa9971083
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_common.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Attack>
+    <Ranged>
+      <MaxRange>76</MaxRange>
+      <MinRange>16.0</MinRange>
+      <ProjectileSpeed>22.0</ProjectileSpeed>
+      <RepeatTime>6000</RepeatTime>
+      <Splash>
+        <Shape>Circular</Shape>
+        <Range>10</Range>
+        <FriendlyFire>true</FriendlyFire>
+        <Hack>40.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>40.0</Crush>
+      </Splash>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>40</BuildTime>
+    <Resources>
+      <wood>300</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="10.0" depth="10.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Ballista</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_packed.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_packed.xml
index cedd18f728..2b3130117c 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_packed.xml
@@ -1,46 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_packed">
-  <Attack>
-    <Ranged>
-      <MaxRange>76</MaxRange>
-      <MinRange>16.0</MinRange>
-      <ProjectileSpeed>22.0</ProjectileSpeed>
-      <RepeatTime>6000</RepeatTime>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>10</Range>
-        <FriendlyFire>true</FriendlyFire>
-        <Hack>40.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>40.0</Crush>
-      </Splash>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>300</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
+<Entity parent="units/rome_mechanical_siege_ballista_common">
   <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Ballista</SpecificName>
     <Icon>units/rome_mechanical_siege_ballista_packed.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/rome_mechanical_siege_ballista_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/romans/siege_rock_packed.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_unpacked.xml
index f9cf3a4583..c7b6033f39 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_unpacked.xml
@@ -1,46 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager_unpacked">
-  <Attack>
-    <Ranged>
-      <MaxRange>76</MaxRange>
-      <MinRange>16.0</MinRange>
-      <ProjectileSpeed>22.0</ProjectileSpeed>
-      <RepeatTime>6000</RepeatTime>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>10</Range>
-        <FriendlyFire>true</FriendlyFire>
-        <Hack>40.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>40.0</Crush>
-      </Splash>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>300</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
+<Entity parent="units/rome_mechanical_siege_ballista_common">
   <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Ballista</SpecificName>
     <Icon>units/rome_mechanical_siege_ballista.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
   <Pack>
     <Entity>units/rome_mechanical_siege_ballista_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/romans/siege_rock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_common.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_common.xml
new file mode 100644
index 0000000000..d2fd754ed9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_common.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>40.0</Pierce>
+      <Crush>20.0</Crush>
+      <MaxRange>56</MaxRange>
+      <MinRange>4.0</MinRange>
+      <ProjectileSpeed>64.0</ProjectileSpeed>
+      <RepeatTime>2500</RepeatTime>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>15</BuildTime>
+    <Resources>
+      <wood>90</wood>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="5.0" depth="5.0"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Scorpio</SpecificName>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_packed.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_packed.xml
index 85d4fe9438..3ad7a14d66 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_packed.xml
@@ -1,36 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_packed">
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>40.0</Pierce>
-      <Crush>20.0</Crush>
-      <MaxRange>56</MaxRange>
-      <MinRange>4.0</MinRange>
-      <ProjectileSpeed>64.0</ProjectileSpeed>
-      <RepeatTime>2500</RepeatTime>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>90</wood>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="5.0" depth="5.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Health>
-    <Max>150</Max>
-  </Health>
+<Entity parent="units/rome_mechanical_siege_scorpio_common">
   <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Scorpio</SpecificName>
     <Icon>units/rome_mechanical_siege_scorpio_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome_mechanical_siege_scorpio_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/romans/siege_scorpio_packed.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_unpacked.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_unpacked.xml
index b13c956d2c..91cc12e790 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_unpacked.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_unpacked.xml
@@ -1,37 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista_unpacked">
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>40.0</Pierce>
-      <Crush>20.0</Crush>
-      <MaxRange>56</MaxRange>
-      <MinRange>4.0</MinRange>
-      <ProjectileSpeed>64.0</ProjectileSpeed>
-      <RepeatTime>2500</RepeatTime>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>90</wood>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="5.0" depth="5.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Health>
-    <Max>150</Max>
-  </Health>
+<Entity parent="units/rome_mechanical_siege_scorpio_common">
   <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Scorpio</SpecificName>
     <Icon>units/rome_mechanical_siege_scorpio.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome_mechanical_siege_scorpio_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
   </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/romans/siege_scorpio.xml</Actor>
   </VisualActor>