diff --git a/sc2/content/base/ships/samatra/genbig.ani b/sc2/content/base/ships/samatra/genbig.ani
deleted file mode 100644
index 5ab44539e..000000000
--- a/sc2/content/base/ships/samatra/genbig.ani
+++ /dev/null
@@ -1,22 +0,0 @@
-genbig.0.png 0 -1 16 16
-genbig.1.png 0 -1 16 16
-genbig.2.png 0 -1 16 16
-genbig.3.png 0 -1 16 16
-genbig.4.png 0 -1 16 16
-genbig.5.png 0 -1 16 16
-genbig.6.png 0 -1 16 16
-genbig.7.png 0 -1 16 16
-genbig.8.png 0 -1 16 16
-genbig.9.png 0 -1 16 16
-genbig.10.png 0 -1 16 16
-genbig.11.png 0 -1 16 16
-genbig.12.png 0 -1 16 16
-genbig.13.png 0 -1 16 16
-genbig.14.png 0 -1 16 16
-genbig.15.png 0 -1 16 16
-genbig.16.png 0 -1 16 16
-genbig.17.png 0 -1 16 16
-genbig.18.png 0 -1 16 16
-genbig.19.png 0 -1 16 16
-genbig.20.png 0 -1 16 16
-genbig.21.png 0 -1 16 16
diff --git a/sc2/content/base/ships/samatra/genbig.0.png b/sc2/content/base/ships/samatra/generator-big.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.0.png
rename to sc2/content/base/ships/samatra/generator-big.0.png
diff --git a/sc2/content/base/ships/samatra/genbig.1.png b/sc2/content/base/ships/samatra/generator-big.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.1.png
rename to sc2/content/base/ships/samatra/generator-big.1.png
diff --git a/sc2/content/base/ships/samatra/genbig.10.png b/sc2/content/base/ships/samatra/generator-big.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.10.png
rename to sc2/content/base/ships/samatra/generator-big.10.png
diff --git a/sc2/content/base/ships/samatra/genbig.11.png b/sc2/content/base/ships/samatra/generator-big.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.11.png
rename to sc2/content/base/ships/samatra/generator-big.11.png
diff --git a/sc2/content/base/ships/samatra/genbig.12.png b/sc2/content/base/ships/samatra/generator-big.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.12.png
rename to sc2/content/base/ships/samatra/generator-big.12.png
diff --git a/sc2/content/base/ships/samatra/genbig.13.png b/sc2/content/base/ships/samatra/generator-big.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.13.png
rename to sc2/content/base/ships/samatra/generator-big.13.png
diff --git a/sc2/content/base/ships/samatra/genbig.14.png b/sc2/content/base/ships/samatra/generator-big.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.14.png
rename to sc2/content/base/ships/samatra/generator-big.14.png
diff --git a/sc2/content/base/ships/samatra/genbig.15.png b/sc2/content/base/ships/samatra/generator-big.15.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.15.png
rename to sc2/content/base/ships/samatra/generator-big.15.png
diff --git a/sc2/content/base/ships/samatra/genbig.16.png b/sc2/content/base/ships/samatra/generator-big.16.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.16.png
rename to sc2/content/base/ships/samatra/generator-big.16.png
diff --git a/sc2/content/base/ships/samatra/genbig.17.png b/sc2/content/base/ships/samatra/generator-big.17.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.17.png
rename to sc2/content/base/ships/samatra/generator-big.17.png
diff --git a/sc2/content/base/ships/samatra/genbig.18.png b/sc2/content/base/ships/samatra/generator-big.18.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.18.png
rename to sc2/content/base/ships/samatra/generator-big.18.png
diff --git a/sc2/content/base/ships/samatra/genbig.19.png b/sc2/content/base/ships/samatra/generator-big.19.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.19.png
rename to sc2/content/base/ships/samatra/generator-big.19.png
diff --git a/sc2/content/base/ships/samatra/genbig.2.png b/sc2/content/base/ships/samatra/generator-big.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.2.png
rename to sc2/content/base/ships/samatra/generator-big.2.png
diff --git a/sc2/content/base/ships/samatra/genbig.20.png b/sc2/content/base/ships/samatra/generator-big.20.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.20.png
rename to sc2/content/base/ships/samatra/generator-big.20.png
diff --git a/sc2/content/base/ships/samatra/genbig.21.png b/sc2/content/base/ships/samatra/generator-big.21.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.21.png
rename to sc2/content/base/ships/samatra/generator-big.21.png
diff --git a/sc2/content/base/ships/samatra/genbig.3.png b/sc2/content/base/ships/samatra/generator-big.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.3.png
rename to sc2/content/base/ships/samatra/generator-big.3.png
diff --git a/sc2/content/base/ships/samatra/genbig.4.png b/sc2/content/base/ships/samatra/generator-big.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.4.png
rename to sc2/content/base/ships/samatra/generator-big.4.png
diff --git a/sc2/content/base/ships/samatra/genbig.5.png b/sc2/content/base/ships/samatra/generator-big.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.5.png
rename to sc2/content/base/ships/samatra/generator-big.5.png
diff --git a/sc2/content/base/ships/samatra/genbig.6.png b/sc2/content/base/ships/samatra/generator-big.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.6.png
rename to sc2/content/base/ships/samatra/generator-big.6.png
diff --git a/sc2/content/base/ships/samatra/genbig.7.png b/sc2/content/base/ships/samatra/generator-big.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.7.png
rename to sc2/content/base/ships/samatra/generator-big.7.png
diff --git a/sc2/content/base/ships/samatra/genbig.8.png b/sc2/content/base/ships/samatra/generator-big.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.8.png
rename to sc2/content/base/ships/samatra/generator-big.8.png
diff --git a/sc2/content/base/ships/samatra/genbig.9.png b/sc2/content/base/ships/samatra/generator-big.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genbig.9.png
rename to sc2/content/base/ships/samatra/generator-big.9.png
diff --git a/sc2/content/base/ships/samatra/generator-big.ani b/sc2/content/base/ships/samatra/generator-big.ani
new file mode 100644
index 000000000..2aed98dd1
--- /dev/null
+++ b/sc2/content/base/ships/samatra/generator-big.ani
@@ -0,0 +1,22 @@
+generator-big.0.png 0 -1 16 16
+generator-big.1.png 0 -1 16 16
+generator-big.2.png 0 -1 16 16
+generator-big.3.png 0 -1 16 16
+generator-big.4.png 0 -1 16 16
+generator-big.5.png 0 -1 16 16
+generator-big.6.png 0 -1 16 16
+generator-big.7.png 0 -1 16 16
+generator-big.8.png 0 -1 16 16
+generator-big.9.png 0 -1 16 16
+generator-big.10.png 0 -1 16 16
+generator-big.11.png 0 -1 16 16
+generator-big.12.png 0 -1 16 16
+generator-big.13.png 0 -1 16 16
+generator-big.14.png 0 -1 16 16
+generator-big.15.png 0 -1 16 16
+generator-big.16.png 0 -1 16 16
+generator-big.17.png 0 -1 16 16
+generator-big.18.png 0 -1 16 16
+generator-big.19.png 0 -1 16 16
+generator-big.20.png 0 -1 16 16
+generator-big.21.png 0 -1 16 16
diff --git a/sc2/content/base/ships/samatra/genmed.0.png b/sc2/content/base/ships/samatra/generator-med.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.0.png
rename to sc2/content/base/ships/samatra/generator-med.0.png
diff --git a/sc2/content/base/ships/samatra/genmed.1.png b/sc2/content/base/ships/samatra/generator-med.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.1.png
rename to sc2/content/base/ships/samatra/generator-med.1.png
diff --git a/sc2/content/base/ships/samatra/genmed.10.png b/sc2/content/base/ships/samatra/generator-med.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.10.png
rename to sc2/content/base/ships/samatra/generator-med.10.png
diff --git a/sc2/content/base/ships/samatra/genmed.11.png b/sc2/content/base/ships/samatra/generator-med.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.11.png
rename to sc2/content/base/ships/samatra/generator-med.11.png
diff --git a/sc2/content/base/ships/samatra/genmed.12.png b/sc2/content/base/ships/samatra/generator-med.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.12.png
rename to sc2/content/base/ships/samatra/generator-med.12.png
diff --git a/sc2/content/base/ships/samatra/genmed.13.png b/sc2/content/base/ships/samatra/generator-med.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.13.png
rename to sc2/content/base/ships/samatra/generator-med.13.png
diff --git a/sc2/content/base/ships/samatra/genmed.14.png b/sc2/content/base/ships/samatra/generator-med.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.14.png
rename to sc2/content/base/ships/samatra/generator-med.14.png
diff --git a/sc2/content/base/ships/samatra/genmed.15.png b/sc2/content/base/ships/samatra/generator-med.15.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.15.png
rename to sc2/content/base/ships/samatra/generator-med.15.png
diff --git a/sc2/content/base/ships/samatra/genmed.16.png b/sc2/content/base/ships/samatra/generator-med.16.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.16.png
rename to sc2/content/base/ships/samatra/generator-med.16.png
diff --git a/sc2/content/base/ships/samatra/genmed.17.png b/sc2/content/base/ships/samatra/generator-med.17.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.17.png
rename to sc2/content/base/ships/samatra/generator-med.17.png
diff --git a/sc2/content/base/ships/samatra/genmed.18.png b/sc2/content/base/ships/samatra/generator-med.18.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.18.png
rename to sc2/content/base/ships/samatra/generator-med.18.png
diff --git a/sc2/content/base/ships/samatra/genmed.19.png b/sc2/content/base/ships/samatra/generator-med.19.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.19.png
rename to sc2/content/base/ships/samatra/generator-med.19.png
diff --git a/sc2/content/base/ships/samatra/genmed.2.png b/sc2/content/base/ships/samatra/generator-med.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.2.png
rename to sc2/content/base/ships/samatra/generator-med.2.png
diff --git a/sc2/content/base/ships/samatra/genmed.20.png b/sc2/content/base/ships/samatra/generator-med.20.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.20.png
rename to sc2/content/base/ships/samatra/generator-med.20.png
diff --git a/sc2/content/base/ships/samatra/genmed.21.png b/sc2/content/base/ships/samatra/generator-med.21.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.21.png
rename to sc2/content/base/ships/samatra/generator-med.21.png
diff --git a/sc2/content/base/ships/samatra/genmed.3.png b/sc2/content/base/ships/samatra/generator-med.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.3.png
rename to sc2/content/base/ships/samatra/generator-med.3.png
diff --git a/sc2/content/base/ships/samatra/genmed.4.png b/sc2/content/base/ships/samatra/generator-med.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.4.png
rename to sc2/content/base/ships/samatra/generator-med.4.png
diff --git a/sc2/content/base/ships/samatra/genmed.5.png b/sc2/content/base/ships/samatra/generator-med.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.5.png
rename to sc2/content/base/ships/samatra/generator-med.5.png
diff --git a/sc2/content/base/ships/samatra/genmed.6.png b/sc2/content/base/ships/samatra/generator-med.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.6.png
rename to sc2/content/base/ships/samatra/generator-med.6.png
diff --git a/sc2/content/base/ships/samatra/genmed.7.png b/sc2/content/base/ships/samatra/generator-med.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.7.png
rename to sc2/content/base/ships/samatra/generator-med.7.png
diff --git a/sc2/content/base/ships/samatra/genmed.8.png b/sc2/content/base/ships/samatra/generator-med.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.8.png
rename to sc2/content/base/ships/samatra/generator-med.8.png
diff --git a/sc2/content/base/ships/samatra/genmed.9.png b/sc2/content/base/ships/samatra/generator-med.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/genmed.9.png
rename to sc2/content/base/ships/samatra/generator-med.9.png
diff --git a/sc2/content/base/ships/samatra/generator-med.ani b/sc2/content/base/ships/samatra/generator-med.ani
new file mode 100644
index 000000000..469e1bf4e
--- /dev/null
+++ b/sc2/content/base/ships/samatra/generator-med.ani
@@ -0,0 +1,22 @@
+generator-med.0.png 0 2 8 8
+generator-med.1.png 0 2 8 8
+generator-med.2.png 0 2 8 8
+generator-med.3.png 0 2 8 8
+generator-med.4.png 0 2 8 8
+generator-med.5.png 0 2 8 8
+generator-med.6.png 0 2 8 8
+generator-med.7.png 0 2 8 8
+generator-med.8.png 0 2 8 8
+generator-med.9.png 0 2 8 8
+generator-med.10.png 0 2 8 8
+generator-med.11.png 0 2 8 8
+generator-med.12.png 0 2 8 8
+generator-med.13.png 0 2 8 8
+generator-med.14.png 0 2 8 8
+generator-med.15.png 0 2 8 8
+generator-med.16.png 0 2 8 8
+generator-med.17.png 0 2 11 11
+generator-med.18.png 0 2 11 10
+generator-med.19.png 0 2 14 13
+generator-med.20.png 0 2 14 13
+generator-med.21.png 0 2 14 13
diff --git a/sc2/content/base/ships/samatra/gensml.0.png b/sc2/content/base/ships/samatra/generator-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.0.png
rename to sc2/content/base/ships/samatra/generator-sml.0.png
diff --git a/sc2/content/base/ships/samatra/gensml.1.png b/sc2/content/base/ships/samatra/generator-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.1.png
rename to sc2/content/base/ships/samatra/generator-sml.1.png
diff --git a/sc2/content/base/ships/samatra/gensml.10.png b/sc2/content/base/ships/samatra/generator-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.10.png
rename to sc2/content/base/ships/samatra/generator-sml.10.png
diff --git a/sc2/content/base/ships/samatra/gensml.11.png b/sc2/content/base/ships/samatra/generator-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.11.png
rename to sc2/content/base/ships/samatra/generator-sml.11.png
diff --git a/sc2/content/base/ships/samatra/gensml.12.png b/sc2/content/base/ships/samatra/generator-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.12.png
rename to sc2/content/base/ships/samatra/generator-sml.12.png
diff --git a/sc2/content/base/ships/samatra/gensml.13.png b/sc2/content/base/ships/samatra/generator-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.13.png
rename to sc2/content/base/ships/samatra/generator-sml.13.png
diff --git a/sc2/content/base/ships/samatra/gensml.14.png b/sc2/content/base/ships/samatra/generator-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.14.png
rename to sc2/content/base/ships/samatra/generator-sml.14.png
diff --git a/sc2/content/base/ships/samatra/gensml.15.png b/sc2/content/base/ships/samatra/generator-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.15.png
rename to sc2/content/base/ships/samatra/generator-sml.15.png
diff --git a/sc2/content/base/ships/samatra/gensml.16.png b/sc2/content/base/ships/samatra/generator-sml.16.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.16.png
rename to sc2/content/base/ships/samatra/generator-sml.16.png
diff --git a/sc2/content/base/ships/samatra/gensml.17.png b/sc2/content/base/ships/samatra/generator-sml.17.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.17.png
rename to sc2/content/base/ships/samatra/generator-sml.17.png
diff --git a/sc2/content/base/ships/samatra/gensml.18.png b/sc2/content/base/ships/samatra/generator-sml.18.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.18.png
rename to sc2/content/base/ships/samatra/generator-sml.18.png
diff --git a/sc2/content/base/ships/samatra/gensml.19.png b/sc2/content/base/ships/samatra/generator-sml.19.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.19.png
rename to sc2/content/base/ships/samatra/generator-sml.19.png
diff --git a/sc2/content/base/ships/samatra/gensml.2.png b/sc2/content/base/ships/samatra/generator-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.2.png
rename to sc2/content/base/ships/samatra/generator-sml.2.png
diff --git a/sc2/content/base/ships/samatra/gensml.20.png b/sc2/content/base/ships/samatra/generator-sml.20.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.20.png
rename to sc2/content/base/ships/samatra/generator-sml.20.png
diff --git a/sc2/content/base/ships/samatra/gensml.21.png b/sc2/content/base/ships/samatra/generator-sml.21.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.21.png
rename to sc2/content/base/ships/samatra/generator-sml.21.png
diff --git a/sc2/content/base/ships/samatra/gensml.3.png b/sc2/content/base/ships/samatra/generator-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.3.png
rename to sc2/content/base/ships/samatra/generator-sml.3.png
diff --git a/sc2/content/base/ships/samatra/gensml.4.png b/sc2/content/base/ships/samatra/generator-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.4.png
rename to sc2/content/base/ships/samatra/generator-sml.4.png
diff --git a/sc2/content/base/ships/samatra/gensml.5.png b/sc2/content/base/ships/samatra/generator-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.5.png
rename to sc2/content/base/ships/samatra/generator-sml.5.png
diff --git a/sc2/content/base/ships/samatra/gensml.6.png b/sc2/content/base/ships/samatra/generator-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.6.png
rename to sc2/content/base/ships/samatra/generator-sml.6.png
diff --git a/sc2/content/base/ships/samatra/gensml.7.png b/sc2/content/base/ships/samatra/generator-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.7.png
rename to sc2/content/base/ships/samatra/generator-sml.7.png
diff --git a/sc2/content/base/ships/samatra/gensml.8.png b/sc2/content/base/ships/samatra/generator-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.8.png
rename to sc2/content/base/ships/samatra/generator-sml.8.png
diff --git a/sc2/content/base/ships/samatra/gensml.9.png b/sc2/content/base/ships/samatra/generator-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/gensml.9.png
rename to sc2/content/base/ships/samatra/generator-sml.9.png
diff --git a/sc2/content/base/ships/samatra/generator-sml.ani b/sc2/content/base/ships/samatra/generator-sml.ani
new file mode 100644
index 000000000..c6ce20e52
--- /dev/null
+++ b/sc2/content/base/ships/samatra/generator-sml.ani
@@ -0,0 +1,22 @@
+generator-sml.0.png 0 2 4 4
+generator-sml.1.png 0 2 4 4
+generator-sml.2.png 0 2 4 4
+generator-sml.3.png 0 2 4 4
+generator-sml.4.png 0 2 4 4
+generator-sml.5.png 0 2 4 4
+generator-sml.6.png 0 2 4 4
+generator-sml.7.png 0 2 4 4
+generator-sml.8.png 0 2 4 4
+generator-sml.9.png 0 2 4 4
+generator-sml.10.png 0 2 4 4
+generator-sml.11.png 0 2 4 4
+generator-sml.12.png 0 2 4 4
+generator-sml.13.png 0 2 4 4
+generator-sml.14.png 0 2 4 4
+generator-sml.15.png 0 2 4 4
+generator-sml.16.png 0 2 4 4
+generator-sml.17.png 0 2 6 6
+generator-sml.18.png 0 2 5 5
+generator-sml.19.png 0 2 6 6
+generator-sml.20.png 0 2 6 6
+generator-sml.21.png 0 2 7 7
diff --git a/sc2/content/base/ships/samatra/genmed.ani b/sc2/content/base/ships/samatra/genmed.ani
deleted file mode 100644
index 2fc9b9d68..000000000
--- a/sc2/content/base/ships/samatra/genmed.ani
+++ /dev/null
@@ -1,22 +0,0 @@
-genmed.0.png 0 2 8 8
-genmed.1.png 0 2 8 8
-genmed.2.png 0 2 8 8
-genmed.3.png 0 2 8 8
-genmed.4.png 0 2 8 8
-genmed.5.png 0 2 8 8
-genmed.6.png 0 2 8 8
-genmed.7.png 0 2 8 8
-genmed.8.png 0 2 8 8
-genmed.9.png 0 2 8 8
-genmed.10.png 0 2 8 8
-genmed.11.png 0 2 8 8
-genmed.12.png 0 2 8 8
-genmed.13.png 0 2 8 8
-genmed.14.png 0 2 8 8
-genmed.15.png 0 2 8 8
-genmed.16.png 0 2 8 8
-genmed.17.png 0 2 11 11
-genmed.18.png 0 2 11 10
-genmed.19.png 0 2 14 13
-genmed.20.png 0 2 14 13
-genmed.21.png 0 2 14 13
diff --git a/sc2/content/base/ships/samatra/gensml.ani b/sc2/content/base/ships/samatra/gensml.ani
deleted file mode 100644
index c44041904..000000000
--- a/sc2/content/base/ships/samatra/gensml.ani
+++ /dev/null
@@ -1,22 +0,0 @@
-gensml.0.png 0 2 4 4
-gensml.1.png 0 2 4 4
-gensml.2.png 0 2 4 4
-gensml.3.png 0 2 4 4
-gensml.4.png 0 2 4 4
-gensml.5.png 0 2 4 4
-gensml.6.png 0 2 4 4
-gensml.7.png 0 2 4 4
-gensml.8.png 0 2 4 4
-gensml.9.png 0 2 4 4
-gensml.10.png 0 2 4 4
-gensml.11.png 0 2 4 4
-gensml.12.png 0 2 4 4
-gensml.13.png 0 2 4 4
-gensml.14.png 0 2 4 4
-gensml.15.png 0 2 4 4
-gensml.16.png 0 2 4 4
-gensml.17.png 0 2 6 6
-gensml.18.png 0 2 5 5
-gensml.19.png 0 2 6 6
-gensml.20.png 0 2 6 6
-gensml.21.png 0 2 7 7
diff --git a/sc2/content/base/ships/samatra/lascap.ani b/sc2/content/base/ships/samatra/lascap.ani
deleted file mode 100644
index 6c6616364..000000000
--- a/sc2/content/base/ships/samatra/lascap.ani
+++ /dev/null
@@ -1 +0,0 @@
-lascap.0.png 0 2 0 -1
diff --git a/sc2/content/base/ships/samatra/lastbat.big b/sc2/content/base/ships/samatra/lastbat.big
deleted file mode 100644
index ab314bd8e..000000000
--- a/sc2/content/base/ships/samatra/lastbat.big
+++ /dev/null
@@ -1,15 +0,0 @@
-lastbat.big.0.png 0 -1 158 70
-lastbat.big.1.png 0 -1 5 5
-lastbat.big.2.png 0 -1 4 4
-lastbat.big.3.png 0 -1 0 0
-lastbat.big.4.png 0 -1 0 0
-lastbat.big.5.png 0 -1 0 0
-lastbat.big.6.png 0 -1 0 0
-lastbat.big.7.png 0 -1 0 0
-lastbat.big.8.png 0 -1 0 0
-lastbat.big.9.png 0 -1 0 0
-lastbat.big.10.png 0 -1 0 0
-lastbat.big.11.png 0 -1 58 -62
-lastbat.big.12.png 0 -1 58 -62
-lastbat.big.13.png 0 -1 58 -62
-lastbat.big.14.png 0 -1 58 -62
diff --git a/sc2/content/base/ships/samatra/lastbat.med b/sc2/content/base/ships/samatra/lastbat.med
deleted file mode 100644
index cefd3eb74..000000000
--- a/sc2/content/base/ships/samatra/lastbat.med
+++ /dev/null
@@ -1,15 +0,0 @@
-lastbat.med.0.png 0 2 79 35
-lastbat.med.1.png 0 2 10 9
-lastbat.med.2.png 0 2 10 9
-lastbat.med.3.png 0 2 10 9
-lastbat.med.4.png 0 2 10 9
-lastbat.med.5.png 0 2 10 9
-lastbat.med.6.png 0 2 10 9
-lastbat.med.7.png 0 2 10 9
-lastbat.med.8.png 0 2 10 9
-lastbat.med.9.png 0 2 10 9
-lastbat.med.10.png 0 2 10 9
-lastbat.med.11.png -1 2 29 -32
-lastbat.med.12.png -1 2 29 -32
-lastbat.med.13.png -1 2 29 -32
-lastbat.med.14.png -1 2 29 -32
diff --git a/sc2/content/base/ships/samatra/lastbat.sml b/sc2/content/base/ships/samatra/lastbat.sml
deleted file mode 100644
index e81c3781b..000000000
--- a/sc2/content/base/ships/samatra/lastbat.sml
+++ /dev/null
@@ -1,15 +0,0 @@
-lastbat.sml.0.png 0 2 40 17
-lastbat.sml.1.png 0 2 5 4
-lastbat.sml.2.png 0 2 5 4
-lastbat.sml.3.png 0 2 5 4
-lastbat.sml.4.png 0 2 5 4
-lastbat.sml.5.png 0 2 5 4
-lastbat.sml.6.png 0 2 5 4
-lastbat.sml.7.png 0 2 5 4
-lastbat.sml.8.png 0 2 5 4
-lastbat.sml.9.png 0 2 5 4
-lastbat.sml.10.png 0 2 5 4
-lastbat.sml.11.png -1 2 15 -17
-lastbat.sml.12.png -1 2 15 -17
-lastbat.sml.13.png -1 2 15 -17
-lastbat.sml.14.png -1 2 15 -17
diff --git a/sc2/content/base/ships/samatra/lastbat.big.0.png b/sc2/content/base/ships/samatra/samatra-big.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.0.png
rename to sc2/content/base/ships/samatra/samatra-big.0.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.1.png b/sc2/content/base/ships/samatra/samatra-big.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.1.png
rename to sc2/content/base/ships/samatra/samatra-big.1.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.10.png b/sc2/content/base/ships/samatra/samatra-big.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.10.png
rename to sc2/content/base/ships/samatra/samatra-big.10.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.11.png b/sc2/content/base/ships/samatra/samatra-big.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.11.png
rename to sc2/content/base/ships/samatra/samatra-big.11.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.12.png b/sc2/content/base/ships/samatra/samatra-big.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.12.png
rename to sc2/content/base/ships/samatra/samatra-big.12.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.13.png b/sc2/content/base/ships/samatra/samatra-big.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.13.png
rename to sc2/content/base/ships/samatra/samatra-big.13.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.14.png b/sc2/content/base/ships/samatra/samatra-big.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.14.png
rename to sc2/content/base/ships/samatra/samatra-big.14.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.2.png b/sc2/content/base/ships/samatra/samatra-big.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.2.png
rename to sc2/content/base/ships/samatra/samatra-big.2.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.3.png b/sc2/content/base/ships/samatra/samatra-big.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.3.png
rename to sc2/content/base/ships/samatra/samatra-big.3.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.4.png b/sc2/content/base/ships/samatra/samatra-big.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.4.png
rename to sc2/content/base/ships/samatra/samatra-big.4.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.5.png b/sc2/content/base/ships/samatra/samatra-big.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.5.png
rename to sc2/content/base/ships/samatra/samatra-big.5.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.6.png b/sc2/content/base/ships/samatra/samatra-big.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.6.png
rename to sc2/content/base/ships/samatra/samatra-big.6.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.7.png b/sc2/content/base/ships/samatra/samatra-big.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.7.png
rename to sc2/content/base/ships/samatra/samatra-big.7.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.8.png b/sc2/content/base/ships/samatra/samatra-big.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.8.png
rename to sc2/content/base/ships/samatra/samatra-big.8.png
diff --git a/sc2/content/base/ships/samatra/lastbat.big.9.png b/sc2/content/base/ships/samatra/samatra-big.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.big.9.png
rename to sc2/content/base/ships/samatra/samatra-big.9.png
diff --git a/sc2/content/base/ships/samatra/samatra-big.ani b/sc2/content/base/ships/samatra/samatra-big.ani
new file mode 100644
index 000000000..d6fbdb5fe
--- /dev/null
+++ b/sc2/content/base/ships/samatra/samatra-big.ani
@@ -0,0 +1,15 @@
+samatra-big.0.png 0 -1 158 70
+samatra-big.1.png 0 -1 5 5
+samatra-big.2.png 0 -1 4 4
+samatra-big.3.png 0 -1 0 0
+samatra-big.4.png 0 -1 0 0
+samatra-big.5.png 0 -1 0 0
+samatra-big.6.png 0 -1 0 0
+samatra-big.7.png 0 -1 0 0
+samatra-big.8.png 0 -1 0 0
+samatra-big.9.png 0 -1 0 0
+samatra-big.10.png 0 -1 0 0
+samatra-big.11.png 0 -1 58 -62
+samatra-big.12.png 0 -1 58 -62
+samatra-big.13.png 0 -1 58 -62
+samatra-big.14.png 0 -1 58 -62
diff --git a/sc2/content/base/ships/samatra/lascap.0.Y=200.png b/sc2/content/base/ships/samatra/samatra-cap-000.Y=200.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lascap.0.Y=200.png
rename to sc2/content/base/ships/samatra/samatra-cap-000.Y=200.png
diff --git a/sc2/content/base/ships/samatra/lascap.0.png b/sc2/content/base/ships/samatra/samatra-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lascap.0.png
rename to sc2/content/base/ships/samatra/samatra-cap.0.png
diff --git a/sc2/content/base/ships/samatra/samatra-cap.ani b/sc2/content/base/ships/samatra/samatra-cap.ani
new file mode 100644
index 000000000..e37e3e5d9
--- /dev/null
+++ b/sc2/content/base/ships/samatra/samatra-cap.ani
@@ -0,0 +1 @@
+samatra-cap.0.png 0 2 0 -1
diff --git a/sc2/content/base/ships/samatra/lastbat.med.0.png b/sc2/content/base/ships/samatra/samatra-med.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.0.png
rename to sc2/content/base/ships/samatra/samatra-med.0.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.1.png b/sc2/content/base/ships/samatra/samatra-med.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.1.png
rename to sc2/content/base/ships/samatra/samatra-med.1.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.10.png b/sc2/content/base/ships/samatra/samatra-med.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.10.png
rename to sc2/content/base/ships/samatra/samatra-med.10.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.11.png b/sc2/content/base/ships/samatra/samatra-med.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.11.png
rename to sc2/content/base/ships/samatra/samatra-med.11.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.12.png b/sc2/content/base/ships/samatra/samatra-med.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.12.png
rename to sc2/content/base/ships/samatra/samatra-med.12.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.13.png b/sc2/content/base/ships/samatra/samatra-med.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.13.png
rename to sc2/content/base/ships/samatra/samatra-med.13.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.14.png b/sc2/content/base/ships/samatra/samatra-med.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.14.png
rename to sc2/content/base/ships/samatra/samatra-med.14.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.2.png b/sc2/content/base/ships/samatra/samatra-med.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.2.png
rename to sc2/content/base/ships/samatra/samatra-med.2.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.3.png b/sc2/content/base/ships/samatra/samatra-med.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.3.png
rename to sc2/content/base/ships/samatra/samatra-med.3.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.4.png b/sc2/content/base/ships/samatra/samatra-med.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.4.png
rename to sc2/content/base/ships/samatra/samatra-med.4.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.5.png b/sc2/content/base/ships/samatra/samatra-med.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.5.png
rename to sc2/content/base/ships/samatra/samatra-med.5.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.6.png b/sc2/content/base/ships/samatra/samatra-med.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.6.png
rename to sc2/content/base/ships/samatra/samatra-med.6.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.7.png b/sc2/content/base/ships/samatra/samatra-med.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.7.png
rename to sc2/content/base/ships/samatra/samatra-med.7.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.8.png b/sc2/content/base/ships/samatra/samatra-med.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.8.png
rename to sc2/content/base/ships/samatra/samatra-med.8.png
diff --git a/sc2/content/base/ships/samatra/lastbat.med.9.png b/sc2/content/base/ships/samatra/samatra-med.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.med.9.png
rename to sc2/content/base/ships/samatra/samatra-med.9.png
diff --git a/sc2/content/base/ships/samatra/samatra-med.ani b/sc2/content/base/ships/samatra/samatra-med.ani
new file mode 100644
index 000000000..9331f05f3
--- /dev/null
+++ b/sc2/content/base/ships/samatra/samatra-med.ani
@@ -0,0 +1,15 @@
+samatra-med.0.png 0 2 79 35
+samatra-med.1.png 0 2 10 9
+samatra-med.2.png 0 2 10 9
+samatra-med.3.png 0 2 10 9
+samatra-med.4.png 0 2 10 9
+samatra-med.5.png 0 2 10 9
+samatra-med.6.png 0 2 10 9
+samatra-med.7.png 0 2 10 9
+samatra-med.8.png 0 2 10 9
+samatra-med.9.png 0 2 10 9
+samatra-med.10.png 0 2 10 9
+samatra-med.11.png -1 2 29 -32
+samatra-med.12.png -1 2 29 -32
+samatra-med.13.png -1 2 29 -32
+samatra-med.14.png -1 2 29 -32
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.0.png b/sc2/content/base/ships/samatra/samatra-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.0.png
rename to sc2/content/base/ships/samatra/samatra-sml.0.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.1.png b/sc2/content/base/ships/samatra/samatra-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.1.png
rename to sc2/content/base/ships/samatra/samatra-sml.1.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.10.png b/sc2/content/base/ships/samatra/samatra-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.10.png
rename to sc2/content/base/ships/samatra/samatra-sml.10.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.11.png b/sc2/content/base/ships/samatra/samatra-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.11.png
rename to sc2/content/base/ships/samatra/samatra-sml.11.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.12.png b/sc2/content/base/ships/samatra/samatra-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.12.png
rename to sc2/content/base/ships/samatra/samatra-sml.12.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.13.png b/sc2/content/base/ships/samatra/samatra-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.13.png
rename to sc2/content/base/ships/samatra/samatra-sml.13.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.14.png b/sc2/content/base/ships/samatra/samatra-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.14.png
rename to sc2/content/base/ships/samatra/samatra-sml.14.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.2.png b/sc2/content/base/ships/samatra/samatra-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.2.png
rename to sc2/content/base/ships/samatra/samatra-sml.2.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.3.png b/sc2/content/base/ships/samatra/samatra-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.3.png
rename to sc2/content/base/ships/samatra/samatra-sml.3.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.4.png b/sc2/content/base/ships/samatra/samatra-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.4.png
rename to sc2/content/base/ships/samatra/samatra-sml.4.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.5.png b/sc2/content/base/ships/samatra/samatra-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.5.png
rename to sc2/content/base/ships/samatra/samatra-sml.5.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.6.png b/sc2/content/base/ships/samatra/samatra-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.6.png
rename to sc2/content/base/ships/samatra/samatra-sml.6.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.7.png b/sc2/content/base/ships/samatra/samatra-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.7.png
rename to sc2/content/base/ships/samatra/samatra-sml.7.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.8.png b/sc2/content/base/ships/samatra/samatra-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.8.png
rename to sc2/content/base/ships/samatra/samatra-sml.8.png
diff --git a/sc2/content/base/ships/samatra/lastbat.sml.9.png b/sc2/content/base/ships/samatra/samatra-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/lastbat.sml.9.png
rename to sc2/content/base/ships/samatra/samatra-sml.9.png
diff --git a/sc2/content/base/ships/samatra/samatra-sml.ani b/sc2/content/base/ships/samatra/samatra-sml.ani
new file mode 100644
index 000000000..768982b51
--- /dev/null
+++ b/sc2/content/base/ships/samatra/samatra-sml.ani
@@ -0,0 +1,15 @@
+samatra-sml.0.png 0 2 40 17
+samatra-sml.1.png 0 2 5 4
+samatra-sml.2.png 0 2 5 4
+samatra-sml.3.png 0 2 5 4
+samatra-sml.4.png 0 2 5 4
+samatra-sml.5.png 0 2 5 4
+samatra-sml.6.png 0 2 5 4
+samatra-sml.7.png 0 2 5 4
+samatra-sml.8.png 0 2 5 4
+samatra-sml.9.png 0 2 5 4
+samatra-sml.10.png 0 2 5 4
+samatra-sml.11.png -1 2 15 -17
+samatra-sml.12.png -1 2 15 -17
+samatra-sml.13.png -1 2 15 -17
+samatra-sml.14.png -1 2 15 -17
diff --git a/sc2/content/base/ships/samatra/lassound.snd b/sc2/content/base/ships/samatra/samatra.snd
similarity index 100%
rename from sc2/content/base/ships/samatra/lassound.snd
rename to sc2/content/base/ships/samatra/samatra.snd
diff --git a/sc2/content/base/ships/samatra/senbig.ani b/sc2/content/base/ships/samatra/senbig.ani
deleted file mode 100644
index 98909f0cf..000000000
--- a/sc2/content/base/ships/samatra/senbig.ani
+++ /dev/null
@@ -1,30 +0,0 @@
-senbig.0.png 0 -1 6 6
-senbig.1.png 0 -1 6 6
-senbig.2.png 0 -1 6 6
-senbig.3.png 0 -1 6 6
-senbig.4.png 0 -1 6 6
-senbig.5.png 0 -1 6 6
-senbig.6.png 0 -1 6 6
-senbig.7.png 0 -1 6 6
-senbig.8.png 0 -1 6 6
-senbig.9.png 0 -1 6 6
-senbig.10.png 0 -1 6 6
-senbig.11.png 0 -1 6 6
-senbig.12.png 0 -1 6 6
-senbig.13.png 0 -1 6 6
-senbig.14.png 0 -1 6 6
-senbig.15.png 0 -1 6 6
-senbig.16.png 0 -1 6 6
-senbig.17.png 0 -1 6 6
-senbig.18.png 0 -1 0 0
-senbig.19.png 0 -1 0 0
-senbig.20.png 0 -1 0 0
-senbig.21.png 0 -1 0 0
-senbig.22.png 0 -1 0 0
-senbig.23.png 0 -1 0 0
-senbig.24.png 0 -1 5 5
-senbig.25.png 0 -1 4 4
-senbig.26.png 0 -1 3 3
-senbig.27.png 0 -1 2 2
-senbig.28.png 0 -1 1 1
-senbig.29.png 0 -1 1 1
diff --git a/sc2/content/base/ships/samatra/senmed.ani b/sc2/content/base/ships/samatra/senmed.ani
deleted file mode 100644
index 05fb88738..000000000
--- a/sc2/content/base/ships/samatra/senmed.ani
+++ /dev/null
@@ -1,30 +0,0 @@
-senmed.0.png 0 2 3 3
-senmed.1.png 0 2 3 3
-senmed.2.png 0 2 3 3
-senmed.3.png 0 2 3 3
-senmed.4.png 0 2 3 3
-senmed.5.png 0 2 3 3
-senmed.6.png 0 2 4 4
-senmed.7.png 0 2 3 3
-senmed.8.png 0 2 3 3
-senmed.9.png 0 2 3 3
-senmed.10.png 0 2 3 3
-senmed.11.png 0 2 3 3
-senmed.12.png 0 2 3 3
-senmed.13.png 0 2 3 3
-senmed.14.png 0 2 3 3
-senmed.15.png 0 2 3 3
-senmed.16.png 0 2 16 16
-senmed.17.png 0 2 16 16
-senmed.18.png 0 2 16 16
-senmed.19.png 0 2 16 16
-senmed.20.png 0 2 12 12
-senmed.21.png 0 2 9 9
-senmed.22.png 0 2 6 6
-senmed.23.png 0 2 4 4
-senmed.24.png 0 2 2 2
-senmed.25.png 0 2 2 2
-senmed.26.png 0 2 1 1
-senmed.27.png 0 2 1 1
-senmed.28.png -1 2 0 0
-senmed.29.png -1 2 0 0
diff --git a/sc2/content/base/ships/samatra/sensml.ani b/sc2/content/base/ships/samatra/sensml.ani
deleted file mode 100644
index f96cb81b7..000000000
--- a/sc2/content/base/ships/samatra/sensml.ani
+++ /dev/null
@@ -1,30 +0,0 @@
-sensml.0.png 0 2 1 1
-sensml.1.png 0 2 1 1
-sensml.2.png 0 2 1 1
-sensml.3.png 0 2 1 1
-sensml.4.png 0 2 1 1
-sensml.5.png 0 2 1 1
-sensml.6.png -1 2 1 1
-sensml.7.png -1 2 1 1
-sensml.8.png 0 2 1 1
-sensml.9.png 0 2 1 1
-sensml.10.png 0 2 1 1
-sensml.11.png 0 2 1 1
-sensml.12.png 0 2 1 1
-sensml.13.png 0 2 2 2
-sensml.14.png 0 2 1 1
-sensml.15.png 0 2 1 1
-sensml.16.png 0 2 8 8
-sensml.17.png 0 2 8 8
-sensml.18.png 0 2 8 8
-sensml.19.png 0 2 8 8
-sensml.20.png 0 2 6 6
-sensml.21.png 0 2 4 4
-sensml.22.png 0 2 3 3
-sensml.23.png 0 2 2 2
-sensml.24.png 0 2 1 1
-sensml.25.png 0 2 1 1
-sensml.26.png 0 2 1 1
-sensml.27.png 0 2 1 1
-sensml.28.png -1 2 0 0
-sensml.29.png -1 2 0 0
diff --git a/sc2/content/base/ships/samatra/senbig.0.png b/sc2/content/base/ships/samatra/sentinel-big.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.0.png
rename to sc2/content/base/ships/samatra/sentinel-big.0.png
diff --git a/sc2/content/base/ships/samatra/senbig.1.png b/sc2/content/base/ships/samatra/sentinel-big.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.1.png
rename to sc2/content/base/ships/samatra/sentinel-big.1.png
diff --git a/sc2/content/base/ships/samatra/senbig.10.png b/sc2/content/base/ships/samatra/sentinel-big.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.10.png
rename to sc2/content/base/ships/samatra/sentinel-big.10.png
diff --git a/sc2/content/base/ships/samatra/senbig.11.png b/sc2/content/base/ships/samatra/sentinel-big.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.11.png
rename to sc2/content/base/ships/samatra/sentinel-big.11.png
diff --git a/sc2/content/base/ships/samatra/senbig.12.png b/sc2/content/base/ships/samatra/sentinel-big.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.12.png
rename to sc2/content/base/ships/samatra/sentinel-big.12.png
diff --git a/sc2/content/base/ships/samatra/senbig.13.png b/sc2/content/base/ships/samatra/sentinel-big.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.13.png
rename to sc2/content/base/ships/samatra/sentinel-big.13.png
diff --git a/sc2/content/base/ships/samatra/senbig.14.png b/sc2/content/base/ships/samatra/sentinel-big.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.14.png
rename to sc2/content/base/ships/samatra/sentinel-big.14.png
diff --git a/sc2/content/base/ships/samatra/senbig.15.png b/sc2/content/base/ships/samatra/sentinel-big.15.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.15.png
rename to sc2/content/base/ships/samatra/sentinel-big.15.png
diff --git a/sc2/content/base/ships/samatra/senbig.16.png b/sc2/content/base/ships/samatra/sentinel-big.16.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.16.png
rename to sc2/content/base/ships/samatra/sentinel-big.16.png
diff --git a/sc2/content/base/ships/samatra/senbig.17.png b/sc2/content/base/ships/samatra/sentinel-big.17.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.17.png
rename to sc2/content/base/ships/samatra/sentinel-big.17.png
diff --git a/sc2/content/base/ships/samatra/senbig.18.png b/sc2/content/base/ships/samatra/sentinel-big.18.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.18.png
rename to sc2/content/base/ships/samatra/sentinel-big.18.png
diff --git a/sc2/content/base/ships/samatra/senbig.19.png b/sc2/content/base/ships/samatra/sentinel-big.19.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.19.png
rename to sc2/content/base/ships/samatra/sentinel-big.19.png
diff --git a/sc2/content/base/ships/samatra/senbig.2.png b/sc2/content/base/ships/samatra/sentinel-big.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.2.png
rename to sc2/content/base/ships/samatra/sentinel-big.2.png
diff --git a/sc2/content/base/ships/samatra/senbig.20.png b/sc2/content/base/ships/samatra/sentinel-big.20.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.20.png
rename to sc2/content/base/ships/samatra/sentinel-big.20.png
diff --git a/sc2/content/base/ships/samatra/senbig.21.png b/sc2/content/base/ships/samatra/sentinel-big.21.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.21.png
rename to sc2/content/base/ships/samatra/sentinel-big.21.png
diff --git a/sc2/content/base/ships/samatra/senbig.22.png b/sc2/content/base/ships/samatra/sentinel-big.22.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.22.png
rename to sc2/content/base/ships/samatra/sentinel-big.22.png
diff --git a/sc2/content/base/ships/samatra/senbig.23.png b/sc2/content/base/ships/samatra/sentinel-big.23.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.23.png
rename to sc2/content/base/ships/samatra/sentinel-big.23.png
diff --git a/sc2/content/base/ships/samatra/senbig.24.png b/sc2/content/base/ships/samatra/sentinel-big.24.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.24.png
rename to sc2/content/base/ships/samatra/sentinel-big.24.png
diff --git a/sc2/content/base/ships/samatra/senbig.25.png b/sc2/content/base/ships/samatra/sentinel-big.25.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.25.png
rename to sc2/content/base/ships/samatra/sentinel-big.25.png
diff --git a/sc2/content/base/ships/samatra/senbig.26.png b/sc2/content/base/ships/samatra/sentinel-big.26.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.26.png
rename to sc2/content/base/ships/samatra/sentinel-big.26.png
diff --git a/sc2/content/base/ships/samatra/senbig.27.png b/sc2/content/base/ships/samatra/sentinel-big.27.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.27.png
rename to sc2/content/base/ships/samatra/sentinel-big.27.png
diff --git a/sc2/content/base/ships/samatra/senbig.28.png b/sc2/content/base/ships/samatra/sentinel-big.28.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.28.png
rename to sc2/content/base/ships/samatra/sentinel-big.28.png
diff --git a/sc2/content/base/ships/samatra/senbig.29.png b/sc2/content/base/ships/samatra/sentinel-big.29.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.29.png
rename to sc2/content/base/ships/samatra/sentinel-big.29.png
diff --git a/sc2/content/base/ships/samatra/senbig.3.png b/sc2/content/base/ships/samatra/sentinel-big.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.3.png
rename to sc2/content/base/ships/samatra/sentinel-big.3.png
diff --git a/sc2/content/base/ships/samatra/senbig.4.png b/sc2/content/base/ships/samatra/sentinel-big.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.4.png
rename to sc2/content/base/ships/samatra/sentinel-big.4.png
diff --git a/sc2/content/base/ships/samatra/senbig.5.png b/sc2/content/base/ships/samatra/sentinel-big.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.5.png
rename to sc2/content/base/ships/samatra/sentinel-big.5.png
diff --git a/sc2/content/base/ships/samatra/senbig.6.png b/sc2/content/base/ships/samatra/sentinel-big.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.6.png
rename to sc2/content/base/ships/samatra/sentinel-big.6.png
diff --git a/sc2/content/base/ships/samatra/senbig.7.png b/sc2/content/base/ships/samatra/sentinel-big.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.7.png
rename to sc2/content/base/ships/samatra/sentinel-big.7.png
diff --git a/sc2/content/base/ships/samatra/senbig.8.png b/sc2/content/base/ships/samatra/sentinel-big.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.8.png
rename to sc2/content/base/ships/samatra/sentinel-big.8.png
diff --git a/sc2/content/base/ships/samatra/senbig.9.png b/sc2/content/base/ships/samatra/sentinel-big.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senbig.9.png
rename to sc2/content/base/ships/samatra/sentinel-big.9.png
diff --git a/sc2/content/base/ships/samatra/sentinel-big.ani b/sc2/content/base/ships/samatra/sentinel-big.ani
new file mode 100644
index 000000000..2e6e8e869
--- /dev/null
+++ b/sc2/content/base/ships/samatra/sentinel-big.ani
@@ -0,0 +1,30 @@
+sentinel-big.0.png 0 -1 6 6
+sentinel-big.1.png 0 -1 6 6
+sentinel-big.2.png 0 -1 6 6
+sentinel-big.3.png 0 -1 6 6
+sentinel-big.4.png 0 -1 6 6
+sentinel-big.5.png 0 -1 6 6
+sentinel-big.6.png 0 -1 6 6
+sentinel-big.7.png 0 -1 6 6
+sentinel-big.8.png 0 -1 6 6
+sentinel-big.9.png 0 -1 6 6
+sentinel-big.10.png 0 -1 6 6
+sentinel-big.11.png 0 -1 6 6
+sentinel-big.12.png 0 -1 6 6
+sentinel-big.13.png 0 -1 6 6
+sentinel-big.14.png 0 -1 6 6
+sentinel-big.15.png 0 -1 6 6
+sentinel-big.16.png 0 -1 6 6
+sentinel-big.17.png 0 -1 6 6
+sentinel-big.18.png 0 -1 0 0
+sentinel-big.19.png 0 -1 0 0
+sentinel-big.20.png 0 -1 0 0
+sentinel-big.21.png 0 -1 0 0
+sentinel-big.22.png 0 -1 0 0
+sentinel-big.23.png 0 -1 0 0
+sentinel-big.24.png 0 -1 5 5
+sentinel-big.25.png 0 -1 4 4
+sentinel-big.26.png 0 -1 3 3
+sentinel-big.27.png 0 -1 2 2
+sentinel-big.28.png 0 -1 1 1
+sentinel-big.29.png 0 -1 1 1
diff --git a/sc2/content/base/ships/samatra/senmed.0.png b/sc2/content/base/ships/samatra/sentinel-med.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.0.png
rename to sc2/content/base/ships/samatra/sentinel-med.0.png
diff --git a/sc2/content/base/ships/samatra/senmed.1.png b/sc2/content/base/ships/samatra/sentinel-med.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.1.png
rename to sc2/content/base/ships/samatra/sentinel-med.1.png
diff --git a/sc2/content/base/ships/samatra/senmed.10.png b/sc2/content/base/ships/samatra/sentinel-med.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.10.png
rename to sc2/content/base/ships/samatra/sentinel-med.10.png
diff --git a/sc2/content/base/ships/samatra/senmed.11.png b/sc2/content/base/ships/samatra/sentinel-med.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.11.png
rename to sc2/content/base/ships/samatra/sentinel-med.11.png
diff --git a/sc2/content/base/ships/samatra/senmed.12.png b/sc2/content/base/ships/samatra/sentinel-med.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.12.png
rename to sc2/content/base/ships/samatra/sentinel-med.12.png
diff --git a/sc2/content/base/ships/samatra/senmed.13.png b/sc2/content/base/ships/samatra/sentinel-med.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.13.png
rename to sc2/content/base/ships/samatra/sentinel-med.13.png
diff --git a/sc2/content/base/ships/samatra/senmed.14.png b/sc2/content/base/ships/samatra/sentinel-med.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.14.png
rename to sc2/content/base/ships/samatra/sentinel-med.14.png
diff --git a/sc2/content/base/ships/samatra/senmed.15.png b/sc2/content/base/ships/samatra/sentinel-med.15.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.15.png
rename to sc2/content/base/ships/samatra/sentinel-med.15.png
diff --git a/sc2/content/base/ships/samatra/senmed.16.png b/sc2/content/base/ships/samatra/sentinel-med.16.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.16.png
rename to sc2/content/base/ships/samatra/sentinel-med.16.png
diff --git a/sc2/content/base/ships/samatra/senmed.17.png b/sc2/content/base/ships/samatra/sentinel-med.17.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.17.png
rename to sc2/content/base/ships/samatra/sentinel-med.17.png
diff --git a/sc2/content/base/ships/samatra/senmed.18.png b/sc2/content/base/ships/samatra/sentinel-med.18.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.18.png
rename to sc2/content/base/ships/samatra/sentinel-med.18.png
diff --git a/sc2/content/base/ships/samatra/senmed.19.png b/sc2/content/base/ships/samatra/sentinel-med.19.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.19.png
rename to sc2/content/base/ships/samatra/sentinel-med.19.png
diff --git a/sc2/content/base/ships/samatra/senmed.2.png b/sc2/content/base/ships/samatra/sentinel-med.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.2.png
rename to sc2/content/base/ships/samatra/sentinel-med.2.png
diff --git a/sc2/content/base/ships/samatra/senmed.20.png b/sc2/content/base/ships/samatra/sentinel-med.20.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.20.png
rename to sc2/content/base/ships/samatra/sentinel-med.20.png
diff --git a/sc2/content/base/ships/samatra/senmed.21.png b/sc2/content/base/ships/samatra/sentinel-med.21.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.21.png
rename to sc2/content/base/ships/samatra/sentinel-med.21.png
diff --git a/sc2/content/base/ships/samatra/senmed.22.png b/sc2/content/base/ships/samatra/sentinel-med.22.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.22.png
rename to sc2/content/base/ships/samatra/sentinel-med.22.png
diff --git a/sc2/content/base/ships/samatra/senmed.23.png b/sc2/content/base/ships/samatra/sentinel-med.23.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.23.png
rename to sc2/content/base/ships/samatra/sentinel-med.23.png
diff --git a/sc2/content/base/ships/samatra/senmed.24.png b/sc2/content/base/ships/samatra/sentinel-med.24.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.24.png
rename to sc2/content/base/ships/samatra/sentinel-med.24.png
diff --git a/sc2/content/base/ships/samatra/senmed.25.png b/sc2/content/base/ships/samatra/sentinel-med.25.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.25.png
rename to sc2/content/base/ships/samatra/sentinel-med.25.png
diff --git a/sc2/content/base/ships/samatra/senmed.26.png b/sc2/content/base/ships/samatra/sentinel-med.26.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.26.png
rename to sc2/content/base/ships/samatra/sentinel-med.26.png
diff --git a/sc2/content/base/ships/samatra/senmed.27.png b/sc2/content/base/ships/samatra/sentinel-med.27.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.27.png
rename to sc2/content/base/ships/samatra/sentinel-med.27.png
diff --git a/sc2/content/base/ships/samatra/senmed.28.png b/sc2/content/base/ships/samatra/sentinel-med.28.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.28.png
rename to sc2/content/base/ships/samatra/sentinel-med.28.png
diff --git a/sc2/content/base/ships/samatra/senmed.29.png b/sc2/content/base/ships/samatra/sentinel-med.29.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.29.png
rename to sc2/content/base/ships/samatra/sentinel-med.29.png
diff --git a/sc2/content/base/ships/samatra/senmed.3.png b/sc2/content/base/ships/samatra/sentinel-med.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.3.png
rename to sc2/content/base/ships/samatra/sentinel-med.3.png
diff --git a/sc2/content/base/ships/samatra/senmed.4.png b/sc2/content/base/ships/samatra/sentinel-med.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.4.png
rename to sc2/content/base/ships/samatra/sentinel-med.4.png
diff --git a/sc2/content/base/ships/samatra/senmed.5.png b/sc2/content/base/ships/samatra/sentinel-med.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.5.png
rename to sc2/content/base/ships/samatra/sentinel-med.5.png
diff --git a/sc2/content/base/ships/samatra/senmed.6.png b/sc2/content/base/ships/samatra/sentinel-med.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.6.png
rename to sc2/content/base/ships/samatra/sentinel-med.6.png
diff --git a/sc2/content/base/ships/samatra/senmed.7.png b/sc2/content/base/ships/samatra/sentinel-med.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.7.png
rename to sc2/content/base/ships/samatra/sentinel-med.7.png
diff --git a/sc2/content/base/ships/samatra/senmed.8.png b/sc2/content/base/ships/samatra/sentinel-med.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.8.png
rename to sc2/content/base/ships/samatra/sentinel-med.8.png
diff --git a/sc2/content/base/ships/samatra/senmed.9.png b/sc2/content/base/ships/samatra/sentinel-med.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/senmed.9.png
rename to sc2/content/base/ships/samatra/sentinel-med.9.png
diff --git a/sc2/content/base/ships/samatra/sentinel-med.ani b/sc2/content/base/ships/samatra/sentinel-med.ani
new file mode 100644
index 000000000..4b1ee7cac
--- /dev/null
+++ b/sc2/content/base/ships/samatra/sentinel-med.ani
@@ -0,0 +1,30 @@
+sentinel-med.0.png 0 2 3 3
+sentinel-med.1.png 0 2 3 3
+sentinel-med.2.png 0 2 3 3
+sentinel-med.3.png 0 2 3 3
+sentinel-med.4.png 0 2 3 3
+sentinel-med.5.png 0 2 3 3
+sentinel-med.6.png 0 2 4 4
+sentinel-med.7.png 0 2 3 3
+sentinel-med.8.png 0 2 3 3
+sentinel-med.9.png 0 2 3 3
+sentinel-med.10.png 0 2 3 3
+sentinel-med.11.png 0 2 3 3
+sentinel-med.12.png 0 2 3 3
+sentinel-med.13.png 0 2 3 3
+sentinel-med.14.png 0 2 3 3
+sentinel-med.15.png 0 2 3 3
+sentinel-med.16.png 0 2 16 16
+sentinel-med.17.png 0 2 16 16
+sentinel-med.18.png 0 2 16 16
+sentinel-med.19.png 0 2 16 16
+sentinel-med.20.png 0 2 12 12
+sentinel-med.21.png 0 2 9 9
+sentinel-med.22.png 0 2 6 6
+sentinel-med.23.png 0 2 4 4
+sentinel-med.24.png 0 2 2 2
+sentinel-med.25.png 0 2 2 2
+sentinel-med.26.png 0 2 1 1
+sentinel-med.27.png 0 2 1 1
+sentinel-med.28.png -1 2 0 0
+sentinel-med.29.png -1 2 0 0
diff --git a/sc2/content/base/ships/samatra/sensml.0.png b/sc2/content/base/ships/samatra/sentinel-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.0.png
rename to sc2/content/base/ships/samatra/sentinel-sml.0.png
diff --git a/sc2/content/base/ships/samatra/sensml.1.png b/sc2/content/base/ships/samatra/sentinel-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.1.png
rename to sc2/content/base/ships/samatra/sentinel-sml.1.png
diff --git a/sc2/content/base/ships/samatra/sensml.10.png b/sc2/content/base/ships/samatra/sentinel-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.10.png
rename to sc2/content/base/ships/samatra/sentinel-sml.10.png
diff --git a/sc2/content/base/ships/samatra/sensml.11.png b/sc2/content/base/ships/samatra/sentinel-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.11.png
rename to sc2/content/base/ships/samatra/sentinel-sml.11.png
diff --git a/sc2/content/base/ships/samatra/sensml.12.png b/sc2/content/base/ships/samatra/sentinel-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.12.png
rename to sc2/content/base/ships/samatra/sentinel-sml.12.png
diff --git a/sc2/content/base/ships/samatra/sensml.13.png b/sc2/content/base/ships/samatra/sentinel-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.13.png
rename to sc2/content/base/ships/samatra/sentinel-sml.13.png
diff --git a/sc2/content/base/ships/samatra/sensml.14.png b/sc2/content/base/ships/samatra/sentinel-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.14.png
rename to sc2/content/base/ships/samatra/sentinel-sml.14.png
diff --git a/sc2/content/base/ships/samatra/sensml.15.png b/sc2/content/base/ships/samatra/sentinel-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.15.png
rename to sc2/content/base/ships/samatra/sentinel-sml.15.png
diff --git a/sc2/content/base/ships/samatra/sensml.16.png b/sc2/content/base/ships/samatra/sentinel-sml.16.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.16.png
rename to sc2/content/base/ships/samatra/sentinel-sml.16.png
diff --git a/sc2/content/base/ships/samatra/sensml.17.png b/sc2/content/base/ships/samatra/sentinel-sml.17.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.17.png
rename to sc2/content/base/ships/samatra/sentinel-sml.17.png
diff --git a/sc2/content/base/ships/samatra/sensml.18.png b/sc2/content/base/ships/samatra/sentinel-sml.18.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.18.png
rename to sc2/content/base/ships/samatra/sentinel-sml.18.png
diff --git a/sc2/content/base/ships/samatra/sensml.19.png b/sc2/content/base/ships/samatra/sentinel-sml.19.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.19.png
rename to sc2/content/base/ships/samatra/sentinel-sml.19.png
diff --git a/sc2/content/base/ships/samatra/sensml.2.png b/sc2/content/base/ships/samatra/sentinel-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.2.png
rename to sc2/content/base/ships/samatra/sentinel-sml.2.png
diff --git a/sc2/content/base/ships/samatra/sensml.20.png b/sc2/content/base/ships/samatra/sentinel-sml.20.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.20.png
rename to sc2/content/base/ships/samatra/sentinel-sml.20.png
diff --git a/sc2/content/base/ships/samatra/sensml.21.png b/sc2/content/base/ships/samatra/sentinel-sml.21.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.21.png
rename to sc2/content/base/ships/samatra/sentinel-sml.21.png
diff --git a/sc2/content/base/ships/samatra/sensml.22.png b/sc2/content/base/ships/samatra/sentinel-sml.22.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.22.png
rename to sc2/content/base/ships/samatra/sentinel-sml.22.png
diff --git a/sc2/content/base/ships/samatra/sensml.23.png b/sc2/content/base/ships/samatra/sentinel-sml.23.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.23.png
rename to sc2/content/base/ships/samatra/sentinel-sml.23.png
diff --git a/sc2/content/base/ships/samatra/sensml.24.png b/sc2/content/base/ships/samatra/sentinel-sml.24.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.24.png
rename to sc2/content/base/ships/samatra/sentinel-sml.24.png
diff --git a/sc2/content/base/ships/samatra/sensml.25.png b/sc2/content/base/ships/samatra/sentinel-sml.25.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.25.png
rename to sc2/content/base/ships/samatra/sentinel-sml.25.png
diff --git a/sc2/content/base/ships/samatra/sensml.26.png b/sc2/content/base/ships/samatra/sentinel-sml.26.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.26.png
rename to sc2/content/base/ships/samatra/sentinel-sml.26.png
diff --git a/sc2/content/base/ships/samatra/sensml.27.png b/sc2/content/base/ships/samatra/sentinel-sml.27.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.27.png
rename to sc2/content/base/ships/samatra/sentinel-sml.27.png
diff --git a/sc2/content/base/ships/samatra/sensml.28.png b/sc2/content/base/ships/samatra/sentinel-sml.28.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.28.png
rename to sc2/content/base/ships/samatra/sentinel-sml.28.png
diff --git a/sc2/content/base/ships/samatra/sensml.29.png b/sc2/content/base/ships/samatra/sentinel-sml.29.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.29.png
rename to sc2/content/base/ships/samatra/sentinel-sml.29.png
diff --git a/sc2/content/base/ships/samatra/sensml.3.png b/sc2/content/base/ships/samatra/sentinel-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.3.png
rename to sc2/content/base/ships/samatra/sentinel-sml.3.png
diff --git a/sc2/content/base/ships/samatra/sensml.4.png b/sc2/content/base/ships/samatra/sentinel-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.4.png
rename to sc2/content/base/ships/samatra/sentinel-sml.4.png
diff --git a/sc2/content/base/ships/samatra/sensml.5.png b/sc2/content/base/ships/samatra/sentinel-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.5.png
rename to sc2/content/base/ships/samatra/sentinel-sml.5.png
diff --git a/sc2/content/base/ships/samatra/sensml.6.png b/sc2/content/base/ships/samatra/sentinel-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.6.png
rename to sc2/content/base/ships/samatra/sentinel-sml.6.png
diff --git a/sc2/content/base/ships/samatra/sensml.7.png b/sc2/content/base/ships/samatra/sentinel-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.7.png
rename to sc2/content/base/ships/samatra/sentinel-sml.7.png
diff --git a/sc2/content/base/ships/samatra/sensml.8.png b/sc2/content/base/ships/samatra/sentinel-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.8.png
rename to sc2/content/base/ships/samatra/sentinel-sml.8.png
diff --git a/sc2/content/base/ships/samatra/sensml.9.png b/sc2/content/base/ships/samatra/sentinel-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/samatra/sensml.9.png
rename to sc2/content/base/ships/samatra/sentinel-sml.9.png
diff --git a/sc2/content/base/ships/samatra/sentinel-sml.ani b/sc2/content/base/ships/samatra/sentinel-sml.ani
new file mode 100644
index 000000000..80c9835b1
--- /dev/null
+++ b/sc2/content/base/ships/samatra/sentinel-sml.ani
@@ -0,0 +1,30 @@
+sentinel-sml.0.png 0 2 1 1
+sentinel-sml.1.png 0 2 1 1
+sentinel-sml.2.png 0 2 1 1
+sentinel-sml.3.png 0 2 1 1
+sentinel-sml.4.png 0 2 1 1
+sentinel-sml.5.png 0 2 1 1
+sentinel-sml.6.png -1 2 1 1
+sentinel-sml.7.png -1 2 1 1
+sentinel-sml.8.png 0 2 1 1
+sentinel-sml.9.png 0 2 1 1
+sentinel-sml.10.png 0 2 1 1
+sentinel-sml.11.png 0 2 1 1
+sentinel-sml.12.png 0 2 1 1
+sentinel-sml.13.png 0 2 2 2
+sentinel-sml.14.png 0 2 1 1
+sentinel-sml.15.png 0 2 1 1
+sentinel-sml.16.png 0 2 8 8
+sentinel-sml.17.png 0 2 8 8
+sentinel-sml.18.png 0 2 8 8
+sentinel-sml.19.png 0 2 8 8
+sentinel-sml.20.png 0 2 6 6
+sentinel-sml.21.png 0 2 4 4
+sentinel-sml.22.png 0 2 3 3
+sentinel-sml.23.png 0 2 2 2
+sentinel-sml.24.png 0 2 1 1
+sentinel-sml.25.png 0 2 1 1
+sentinel-sml.26.png 0 2 1 1
+sentinel-sml.27.png 0 2 1 1
+sentinel-sml.28.png -1 2 0 0
+sentinel-sml.29.png -1 2 0 0
diff --git a/sc2/content/base/ships/shofixti/oldcap.ani b/sc2/content/base/ships/shofixti/oldcap.ani
deleted file mode 100644
index 6d7cc4944..000000000
--- a/sc2/content/base/ships/shofixti/oldcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-oldcap.0.png -1 1 0 0
-oldcap.1.png -1 1 -2 -10
-oldcap.2.png -1 1 -2 -10
-oldcap.3.png -1 1 -2 -10
-oldcap.4.png -1 1 -2 -10
-oldcap.5.png -1 1 -2 -10
-oldcap.6.png 1 1 -15 -1
-oldcap.7.png 1 1 -15 -1
-oldcap.8.png 1 1 -15 -1
-oldcap.9.png -1 1 -41 -11
-oldcap.10.png -1 1 -41 -11
-oldcap.11.png -1 1 -41 -11
-oldcap.12.png -1 1 0 -23
-oldcap.13.png -1 1 0 -23
-oldcap.14.png -1 1 0 -23
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.0.png b/sc2/content/base/ships/shofixti/oldscout-big.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.0.png
rename to sc2/content/base/ships/shofixti/oldscout-big.0.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.1.png b/sc2/content/base/ships/shofixti/oldscout-big.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.1.png
rename to sc2/content/base/ships/shofixti/oldscout-big.1.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.10.png b/sc2/content/base/ships/shofixti/oldscout-big.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.10.png
rename to sc2/content/base/ships/shofixti/oldscout-big.10.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.11.png b/sc2/content/base/ships/shofixti/oldscout-big.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.11.png
rename to sc2/content/base/ships/shofixti/oldscout-big.11.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.12.png b/sc2/content/base/ships/shofixti/oldscout-big.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.12.png
rename to sc2/content/base/ships/shofixti/oldscout-big.12.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.13.png b/sc2/content/base/ships/shofixti/oldscout-big.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.13.png
rename to sc2/content/base/ships/shofixti/oldscout-big.13.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.14.png b/sc2/content/base/ships/shofixti/oldscout-big.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.14.png
rename to sc2/content/base/ships/shofixti/oldscout-big.14.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.15.png b/sc2/content/base/ships/shofixti/oldscout-big.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.15.png
rename to sc2/content/base/ships/shofixti/oldscout-big.15.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.2.png b/sc2/content/base/ships/shofixti/oldscout-big.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.2.png
rename to sc2/content/base/ships/shofixti/oldscout-big.2.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.3.png b/sc2/content/base/ships/shofixti/oldscout-big.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.3.png
rename to sc2/content/base/ships/shofixti/oldscout-big.3.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.4.png b/sc2/content/base/ships/shofixti/oldscout-big.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.4.png
rename to sc2/content/base/ships/shofixti/oldscout-big.4.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.5.png b/sc2/content/base/ships/shofixti/oldscout-big.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.5.png
rename to sc2/content/base/ships/shofixti/oldscout-big.5.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.6.png b/sc2/content/base/ships/shofixti/oldscout-big.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.6.png
rename to sc2/content/base/ships/shofixti/oldscout-big.6.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.7.png b/sc2/content/base/ships/shofixti/oldscout-big.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.7.png
rename to sc2/content/base/ships/shofixti/oldscout-big.7.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.8.png b/sc2/content/base/ships/shofixti/oldscout-big.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.8.png
rename to sc2/content/base/ships/shofixti/oldscout-big.8.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.big.9.png b/sc2/content/base/ships/shofixti/oldscout-big.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.big.9.png
rename to sc2/content/base/ships/shofixti/oldscout-big.9.png
diff --git a/sc2/content/base/ships/shofixti/oldscout-big.ani b/sc2/content/base/ships/shofixti/oldscout-big.ani
new file mode 100644
index 000000000..d4ebb523f
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/oldscout-big.ani
@@ -0,0 +1,16 @@
+oldscout-big.0.png 0 1 4 7
+oldscout-big.1.png 0 1 4 6
+oldscout-big.2.png 0 1 5 5
+oldscout-big.3.png 0 1 5 4
+oldscout-big.4.png 0 1 8 4
+oldscout-big.5.png 0 1 5 4
+oldscout-big.6.png 0 1 5 5
+oldscout-big.7.png 0 1 4 6
+oldscout-big.8.png 0 1 4 7
+oldscout-big.9.png 0 1 3 6
+oldscout-big.10.png 0 1 5 5
+oldscout-big.11.png 0 1 7 4
+oldscout-big.12.png 0 1 8 4
+oldscout-big.13.png 0 1 7 4
+oldscout-big.14.png 0 1 5 5
+oldscout-big.15.png 0 1 3 7
diff --git a/sc2/content/base/ships/shofixti/oldcap.0.png b/sc2/content/base/ships/shofixti/oldscout-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.0.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.0.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.1.png b/sc2/content/base/ships/shofixti/oldscout-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.1.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.1.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.10.png b/sc2/content/base/ships/shofixti/oldscout-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.10.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.10.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.11.png b/sc2/content/base/ships/shofixti/oldscout-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.11.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.11.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.12.png b/sc2/content/base/ships/shofixti/oldscout-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.12.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.12.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.13.png b/sc2/content/base/ships/shofixti/oldscout-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.13.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.13.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.14.png b/sc2/content/base/ships/shofixti/oldscout-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.14.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.14.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.2.png b/sc2/content/base/ships/shofixti/oldscout-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.2.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.2.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.3.png b/sc2/content/base/ships/shofixti/oldscout-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.3.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.3.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.4.png b/sc2/content/base/ships/shofixti/oldscout-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.4.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.4.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.5.png b/sc2/content/base/ships/shofixti/oldscout-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.5.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.5.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.6.png b/sc2/content/base/ships/shofixti/oldscout-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.6.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.6.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.7.png b/sc2/content/base/ships/shofixti/oldscout-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.7.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.7.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.8.png b/sc2/content/base/ships/shofixti/oldscout-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.8.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.8.png
diff --git a/sc2/content/base/ships/shofixti/oldcap.9.png b/sc2/content/base/ships/shofixti/oldscout-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldcap.9.png
rename to sc2/content/base/ships/shofixti/oldscout-cap.9.png
diff --git a/sc2/content/base/ships/shofixti/oldscout-cap.ani b/sc2/content/base/ships/shofixti/oldscout-cap.ani
new file mode 100644
index 000000000..0f65bab96
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/oldscout-cap.ani
@@ -0,0 +1,15 @@
+oldscout-cap.0.png -1 1 0 0
+oldscout-cap.1.png -1 1 -2 -10
+oldscout-cap.2.png -1 1 -2 -10
+oldscout-cap.3.png -1 1 -2 -10
+oldscout-cap.4.png -1 1 -2 -10
+oldscout-cap.5.png -1 1 -2 -10
+oldscout-cap.6.png 1 1 -15 -1
+oldscout-cap.7.png 1 1 -15 -1
+oldscout-cap.8.png 1 1 -15 -1
+oldscout-cap.9.png -1 1 -41 -11
+oldscout-cap.10.png -1 1 -41 -11
+oldscout-cap.11.png -1 1 -41 -11
+oldscout-cap.12.png -1 1 0 -23
+oldscout-cap.13.png -1 1 0 -23
+oldscout-cap.14.png -1 1 0 -23
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.0.png b/sc2/content/base/ships/shofixti/oldscout-med.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.0.png
rename to sc2/content/base/ships/shofixti/oldscout-med.0.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.1.png b/sc2/content/base/ships/shofixti/oldscout-med.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.1.png
rename to sc2/content/base/ships/shofixti/oldscout-med.1.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.10.png b/sc2/content/base/ships/shofixti/oldscout-med.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.10.png
rename to sc2/content/base/ships/shofixti/oldscout-med.10.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.11.png b/sc2/content/base/ships/shofixti/oldscout-med.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.11.png
rename to sc2/content/base/ships/shofixti/oldscout-med.11.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.12.png b/sc2/content/base/ships/shofixti/oldscout-med.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.12.png
rename to sc2/content/base/ships/shofixti/oldscout-med.12.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.13.png b/sc2/content/base/ships/shofixti/oldscout-med.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.13.png
rename to sc2/content/base/ships/shofixti/oldscout-med.13.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.14.png b/sc2/content/base/ships/shofixti/oldscout-med.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.14.png
rename to sc2/content/base/ships/shofixti/oldscout-med.14.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.15.png b/sc2/content/base/ships/shofixti/oldscout-med.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.15.png
rename to sc2/content/base/ships/shofixti/oldscout-med.15.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.2.png b/sc2/content/base/ships/shofixti/oldscout-med.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.2.png
rename to sc2/content/base/ships/shofixti/oldscout-med.2.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.3.png b/sc2/content/base/ships/shofixti/oldscout-med.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.3.png
rename to sc2/content/base/ships/shofixti/oldscout-med.3.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.4.png b/sc2/content/base/ships/shofixti/oldscout-med.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.4.png
rename to sc2/content/base/ships/shofixti/oldscout-med.4.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.5.png b/sc2/content/base/ships/shofixti/oldscout-med.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.5.png
rename to sc2/content/base/ships/shofixti/oldscout-med.5.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.6.png b/sc2/content/base/ships/shofixti/oldscout-med.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.6.png
rename to sc2/content/base/ships/shofixti/oldscout-med.6.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.7.png b/sc2/content/base/ships/shofixti/oldscout-med.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.7.png
rename to sc2/content/base/ships/shofixti/oldscout-med.7.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.8.png b/sc2/content/base/ships/shofixti/oldscout-med.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.8.png
rename to sc2/content/base/ships/shofixti/oldscout-med.8.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.med.9.png b/sc2/content/base/ships/shofixti/oldscout-med.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.med.9.png
rename to sc2/content/base/ships/shofixti/oldscout-med.9.png
diff --git a/sc2/content/base/ships/shofixti/oldscout-med.ani b/sc2/content/base/ships/shofixti/oldscout-med.ani
new file mode 100644
index 000000000..68006c53b
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/oldscout-med.ani
@@ -0,0 +1,16 @@
+oldscout-med.0.png 0 1 2 4
+oldscout-med.1.png 0 1 2 4
+oldscout-med.2.png 0 1 3 3
+oldscout-med.3.png 0 1 4 2
+oldscout-med.4.png 0 1 5 2
+oldscout-med.5.png 0 1 4 2
+oldscout-med.6.png 0 1 3 3
+oldscout-med.7.png 0 1 2 4
+oldscout-med.8.png 0 1 2 4
+oldscout-med.9.png 0 1 2 4
+oldscout-med.10.png 0 1 3 3
+oldscout-med.11.png 0 1 4 2
+oldscout-med.12.png 0 1 5 2
+oldscout-med.13.png 0 1 4 2
+oldscout-med.14.png 0 1 3 3
+oldscout-med.15.png 0 1 2 4
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.0.png b/sc2/content/base/ships/shofixti/oldscout-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.0.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.0.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.1.png b/sc2/content/base/ships/shofixti/oldscout-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.1.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.1.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.10.png b/sc2/content/base/ships/shofixti/oldscout-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.10.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.10.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.11.png b/sc2/content/base/ships/shofixti/oldscout-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.11.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.11.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.12.png b/sc2/content/base/ships/shofixti/oldscout-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.12.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.12.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.13.png b/sc2/content/base/ships/shofixti/oldscout-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.13.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.13.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.14.png b/sc2/content/base/ships/shofixti/oldscout-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.14.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.14.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.15.png b/sc2/content/base/ships/shofixti/oldscout-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.15.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.15.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.2.png b/sc2/content/base/ships/shofixti/oldscout-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.2.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.2.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.3.png b/sc2/content/base/ships/shofixti/oldscout-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.3.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.3.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.4.png b/sc2/content/base/ships/shofixti/oldscout-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.4.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.4.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.5.png b/sc2/content/base/ships/shofixti/oldscout-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.5.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.5.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.6.png b/sc2/content/base/ships/shofixti/oldscout-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.6.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.6.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.7.png b/sc2/content/base/ships/shofixti/oldscout-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.7.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.7.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.8.png b/sc2/content/base/ships/shofixti/oldscout-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.8.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.8.png
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml.9.png b/sc2/content/base/ships/shofixti/oldscout-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/oldshof.sml.9.png
rename to sc2/content/base/ships/shofixti/oldscout-sml.9.png
diff --git a/sc2/content/base/ships/shofixti/oldscout-sml.ani b/sc2/content/base/ships/shofixti/oldscout-sml.ani
new file mode 100644
index 000000000..6ca8a13bf
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/oldscout-sml.ani
@@ -0,0 +1,16 @@
+oldscout-sml.0.png 0 1 1 3
+oldscout-sml.1.png 0 1 1 2
+oldscout-sml.2.png 0 1 2 2
+oldscout-sml.3.png 0 1 2 1
+oldscout-sml.4.png 0 1 2 1
+oldscout-sml.5.png 0 1 2 1
+oldscout-sml.6.png 0 1 2 2
+oldscout-sml.7.png 0 1 1 2
+oldscout-sml.8.png 0 1 1 3
+oldscout-sml.9.png 0 1 1 2
+oldscout-sml.10.png 0 1 2 2
+oldscout-sml.11.png 0 1 2 1
+oldscout-sml.12.png 0 1 2 1
+oldscout-sml.13.png 0 1 2 1
+oldscout-sml.14.png 0 1 2 2
+oldscout-sml.15.png 0 1 1 2
diff --git a/sc2/content/base/ships/shofixti/oldshof.big b/sc2/content/base/ships/shofixti/oldshof.big
deleted file mode 100644
index b578c3edb..000000000
--- a/sc2/content/base/ships/shofixti/oldshof.big
+++ /dev/null
@@ -1,16 +0,0 @@
-oldshof.big.0.png 0 1 4 7
-oldshof.big.1.png 0 1 4 6
-oldshof.big.2.png 0 1 5 5
-oldshof.big.3.png 0 1 5 4
-oldshof.big.4.png 0 1 8 4
-oldshof.big.5.png 0 1 5 4
-oldshof.big.6.png 0 1 5 5
-oldshof.big.7.png 0 1 4 6
-oldshof.big.8.png 0 1 4 7
-oldshof.big.9.png 0 1 3 6
-oldshof.big.10.png 0 1 5 5
-oldshof.big.11.png 0 1 7 4
-oldshof.big.12.png 0 1 8 4
-oldshof.big.13.png 0 1 7 4
-oldshof.big.14.png 0 1 5 5
-oldshof.big.15.png 0 1 3 7
diff --git a/sc2/content/base/ships/shofixti/oldshof.med b/sc2/content/base/ships/shofixti/oldshof.med
deleted file mode 100644
index 148d770d6..000000000
--- a/sc2/content/base/ships/shofixti/oldshof.med
+++ /dev/null
@@ -1,16 +0,0 @@
-oldshof.med.0.png 0 1 2 4
-oldshof.med.1.png 0 1 2 4
-oldshof.med.2.png 0 1 3 3
-oldshof.med.3.png 0 1 4 2
-oldshof.med.4.png 0 1 5 2
-oldshof.med.5.png 0 1 4 2
-oldshof.med.6.png 0 1 3 3
-oldshof.med.7.png 0 1 2 4
-oldshof.med.8.png 0 1 2 4
-oldshof.med.9.png 0 1 2 4
-oldshof.med.10.png 0 1 3 3
-oldshof.med.11.png 0 1 4 2
-oldshof.med.12.png 0 1 5 2
-oldshof.med.13.png 0 1 4 2
-oldshof.med.14.png 0 1 3 3
-oldshof.med.15.png 0 1 2 4
diff --git a/sc2/content/base/ships/shofixti/oldshof.sml b/sc2/content/base/ships/shofixti/oldshof.sml
deleted file mode 100644
index b810908f8..000000000
--- a/sc2/content/base/ships/shofixti/oldshof.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-oldshof.sml.0.png 0 1 1 3
-oldshof.sml.1.png 0 1 1 2
-oldshof.sml.2.png 0 1 2 2
-oldshof.sml.3.png 0 1 2 1
-oldshof.sml.4.png 0 1 2 1
-oldshof.sml.5.png 0 1 2 1
-oldshof.sml.6.png 0 1 2 2
-oldshof.sml.7.png 0 1 1 2
-oldshof.sml.8.png 0 1 1 3
-oldshof.sml.9.png 0 1 1 2
-oldshof.sml.10.png 0 1 2 2
-oldshof.sml.11.png 0 1 2 1
-oldshof.sml.12.png 0 1 2 1
-oldshof.sml.13.png 0 1 2 1
-oldshof.sml.14.png 0 1 2 2
-oldshof.sml.15.png 0 1 1 2
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.0.png b/sc2/content/base/ships/shofixti/scout-big.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.0.png
rename to sc2/content/base/ships/shofixti/scout-big.0.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.1.png b/sc2/content/base/ships/shofixti/scout-big.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.1.png
rename to sc2/content/base/ships/shofixti/scout-big.1.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.10.png b/sc2/content/base/ships/shofixti/scout-big.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.10.png
rename to sc2/content/base/ships/shofixti/scout-big.10.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.11.png b/sc2/content/base/ships/shofixti/scout-big.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.11.png
rename to sc2/content/base/ships/shofixti/scout-big.11.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.12.png b/sc2/content/base/ships/shofixti/scout-big.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.12.png
rename to sc2/content/base/ships/shofixti/scout-big.12.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.13.png b/sc2/content/base/ships/shofixti/scout-big.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.13.png
rename to sc2/content/base/ships/shofixti/scout-big.13.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.14.png b/sc2/content/base/ships/shofixti/scout-big.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.14.png
rename to sc2/content/base/ships/shofixti/scout-big.14.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.15.png b/sc2/content/base/ships/shofixti/scout-big.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.15.png
rename to sc2/content/base/ships/shofixti/scout-big.15.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.2.png b/sc2/content/base/ships/shofixti/scout-big.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.2.png
rename to sc2/content/base/ships/shofixti/scout-big.2.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.3.png b/sc2/content/base/ships/shofixti/scout-big.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.3.png
rename to sc2/content/base/ships/shofixti/scout-big.3.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.4.png b/sc2/content/base/ships/shofixti/scout-big.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.4.png
rename to sc2/content/base/ships/shofixti/scout-big.4.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.5.png b/sc2/content/base/ships/shofixti/scout-big.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.5.png
rename to sc2/content/base/ships/shofixti/scout-big.5.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.6.png b/sc2/content/base/ships/shofixti/scout-big.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.6.png
rename to sc2/content/base/ships/shofixti/scout-big.6.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.7.png b/sc2/content/base/ships/shofixti/scout-big.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.7.png
rename to sc2/content/base/ships/shofixti/scout-big.7.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.8.png b/sc2/content/base/ships/shofixti/scout-big.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.8.png
rename to sc2/content/base/ships/shofixti/scout-big.8.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.big.9.png b/sc2/content/base/ships/shofixti/scout-big.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.big.9.png
rename to sc2/content/base/ships/shofixti/scout-big.9.png
diff --git a/sc2/content/base/ships/shofixti/scout-big.ani b/sc2/content/base/ships/shofixti/scout-big.ani
new file mode 100644
index 000000000..8ee4d03b3
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/scout-big.ani
@@ -0,0 +1,16 @@
+scout-big.0.png 0 1 4 9
+scout-big.1.png 0 1 3 9
+scout-big.2.png 0 1 4 6
+scout-big.3.png 0 1 5 3
+scout-big.4.png 0 1 6 4
+scout-big.5.png 0 1 5 4
+scout-big.6.png 0 1 4 4
+scout-big.7.png 0 1 4 4
+scout-big.8.png 0 1 4 5
+scout-big.9.png 0 1 3 4
+scout-big.10.png 0 1 6 4
+scout-big.11.png 0 1 7 4
+scout-big.12.png 0 1 9 4
+scout-big.13.png 0 1 7 3
+scout-big.14.png 0 1 6 6
+scout-big.15.png 0 1 3 7
diff --git a/sc2/content/base/ships/shofixti/shocap.0.png b/sc2/content/base/ships/shofixti/scout-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.0.png
rename to sc2/content/base/ships/shofixti/scout-cap.0.png
diff --git a/sc2/content/base/ships/shofixti/shocap.1.png b/sc2/content/base/ships/shofixti/scout-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.1.png
rename to sc2/content/base/ships/shofixti/scout-cap.1.png
diff --git a/sc2/content/base/ships/shofixti/shocap.10.png b/sc2/content/base/ships/shofixti/scout-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.10.png
rename to sc2/content/base/ships/shofixti/scout-cap.10.png
diff --git a/sc2/content/base/ships/shofixti/shocap.11.png b/sc2/content/base/ships/shofixti/scout-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.11.png
rename to sc2/content/base/ships/shofixti/scout-cap.11.png
diff --git a/sc2/content/base/ships/shofixti/shocap.12.png b/sc2/content/base/ships/shofixti/scout-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.12.png
rename to sc2/content/base/ships/shofixti/scout-cap.12.png
diff --git a/sc2/content/base/ships/shofixti/shocap.13.png b/sc2/content/base/ships/shofixti/scout-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.13.png
rename to sc2/content/base/ships/shofixti/scout-cap.13.png
diff --git a/sc2/content/base/ships/shofixti/shocap.14.png b/sc2/content/base/ships/shofixti/scout-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.14.png
rename to sc2/content/base/ships/shofixti/scout-cap.14.png
diff --git a/sc2/content/base/ships/shofixti/shocap.15.png b/sc2/content/base/ships/shofixti/scout-cap.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.15.png
rename to sc2/content/base/ships/shofixti/scout-cap.15.png
diff --git a/sc2/content/base/ships/shofixti/shocap.16.png b/sc2/content/base/ships/shofixti/scout-cap.16.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.16.png
rename to sc2/content/base/ships/shofixti/scout-cap.16.png
diff --git a/sc2/content/base/ships/shofixti/shocap.17.png b/sc2/content/base/ships/shofixti/scout-cap.17.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.17.png
rename to sc2/content/base/ships/shofixti/scout-cap.17.png
diff --git a/sc2/content/base/ships/shofixti/shocap.18.png b/sc2/content/base/ships/shofixti/scout-cap.18.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.18.png
rename to sc2/content/base/ships/shofixti/scout-cap.18.png
diff --git a/sc2/content/base/ships/shofixti/shocap.19.png b/sc2/content/base/ships/shofixti/scout-cap.19.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.19.png
rename to sc2/content/base/ships/shofixti/scout-cap.19.png
diff --git a/sc2/content/base/ships/shofixti/shocap.2.png b/sc2/content/base/ships/shofixti/scout-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.2.png
rename to sc2/content/base/ships/shofixti/scout-cap.2.png
diff --git a/sc2/content/base/ships/shofixti/shocap.3.png b/sc2/content/base/ships/shofixti/scout-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.3.png
rename to sc2/content/base/ships/shofixti/scout-cap.3.png
diff --git a/sc2/content/base/ships/shofixti/shocap.4.png b/sc2/content/base/ships/shofixti/scout-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.4.png
rename to sc2/content/base/ships/shofixti/scout-cap.4.png
diff --git a/sc2/content/base/ships/shofixti/shocap.5.png b/sc2/content/base/ships/shofixti/scout-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.5.png
rename to sc2/content/base/ships/shofixti/scout-cap.5.png
diff --git a/sc2/content/base/ships/shofixti/shocap.6.png b/sc2/content/base/ships/shofixti/scout-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.6.png
rename to sc2/content/base/ships/shofixti/scout-cap.6.png
diff --git a/sc2/content/base/ships/shofixti/shocap.7.png b/sc2/content/base/ships/shofixti/scout-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.7.png
rename to sc2/content/base/ships/shofixti/scout-cap.7.png
diff --git a/sc2/content/base/ships/shofixti/shocap.8.png b/sc2/content/base/ships/shofixti/scout-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.8.png
rename to sc2/content/base/ships/shofixti/scout-cap.8.png
diff --git a/sc2/content/base/ships/shofixti/shocap.9.png b/sc2/content/base/ships/shofixti/scout-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shocap.9.png
rename to sc2/content/base/ships/shofixti/scout-cap.9.png
diff --git a/sc2/content/base/ships/shofixti/scout-cap.ani b/sc2/content/base/ships/shofixti/scout-cap.ani
new file mode 100644
index 000000000..3d941f1e4
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/scout-cap.ani
@@ -0,0 +1,20 @@
+scout-cap.0.png -1 1 0 0
+scout-cap.1.png -1 1 -2 -10
+scout-cap.2.png -1 1 -2 -10
+scout-cap.3.png -1 1 -2 -10
+scout-cap.4.png -1 1 -2 -10
+scout-cap.5.png -1 1 -2 -10
+scout-cap.6.png 3 1 -15 -1
+scout-cap.7.png 3 1 -15 -1
+scout-cap.8.png 3 1 -15 -1
+scout-cap.9.png -1 1 -41 -11
+scout-cap.10.png -1 1 -41 -11
+scout-cap.11.png -1 1 -41 -11
+scout-cap.12.png -1 1 0 -23
+scout-cap.13.png -1 1 0 -23
+scout-cap.14.png -1 1 0 -23
+scout-cap.15.png -1 1 0 -23
+scout-cap.16.png -1 1 0 -23
+scout-cap.17.png -1 1 0 -23
+scout-cap.18.png -1 1 0 -23
+scout-cap.19.png -1 1 0 -23
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.0.png b/sc2/content/base/ships/shofixti/scout-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.0.png
rename to sc2/content/base/ships/shofixti/scout-icons.0.png
diff --git a/sc2/content/base/ships/shofixti/shoicons.1.png b/sc2/content/base/ships/shofixti/scout-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shoicons.1.png
rename to sc2/content/base/ships/shofixti/scout-icons.1.png
diff --git a/sc2/content/base/ships/shofixti/scout-icons.ani b/sc2/content/base/ships/shofixti/scout-icons.ani
new file mode 100644
index 000000000..db84a7e5a
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/scout-icons.ani
@@ -0,0 +1,2 @@
+scout-icons.0.png 0 1 -5 -4
+scout-icons.1.png 0 1 18 22
diff --git a/sc2/content/base/ships/shofixti/shoicons.0.png b/sc2/content/base/ships/shofixti/scout-med.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shoicons.0.png
rename to sc2/content/base/ships/shofixti/scout-med.0.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.1.png b/sc2/content/base/ships/shofixti/scout-med.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.1.png
rename to sc2/content/base/ships/shofixti/scout-med.1.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.10.png b/sc2/content/base/ships/shofixti/scout-med.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.10.png
rename to sc2/content/base/ships/shofixti/scout-med.10.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.11.png b/sc2/content/base/ships/shofixti/scout-med.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.11.png
rename to sc2/content/base/ships/shofixti/scout-med.11.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.12.png b/sc2/content/base/ships/shofixti/scout-med.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.12.png
rename to sc2/content/base/ships/shofixti/scout-med.12.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.13.png b/sc2/content/base/ships/shofixti/scout-med.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.13.png
rename to sc2/content/base/ships/shofixti/scout-med.13.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.14.png b/sc2/content/base/ships/shofixti/scout-med.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.14.png
rename to sc2/content/base/ships/shofixti/scout-med.14.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.15.png b/sc2/content/base/ships/shofixti/scout-med.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.15.png
rename to sc2/content/base/ships/shofixti/scout-med.15.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.2.png b/sc2/content/base/ships/shofixti/scout-med.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.2.png
rename to sc2/content/base/ships/shofixti/scout-med.2.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.3.png b/sc2/content/base/ships/shofixti/scout-med.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.3.png
rename to sc2/content/base/ships/shofixti/scout-med.3.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.4.png b/sc2/content/base/ships/shofixti/scout-med.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.4.png
rename to sc2/content/base/ships/shofixti/scout-med.4.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.5.png b/sc2/content/base/ships/shofixti/scout-med.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.5.png
rename to sc2/content/base/ships/shofixti/scout-med.5.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.6.png b/sc2/content/base/ships/shofixti/scout-med.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.6.png
rename to sc2/content/base/ships/shofixti/scout-med.6.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.7.png b/sc2/content/base/ships/shofixti/scout-med.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.7.png
rename to sc2/content/base/ships/shofixti/scout-med.7.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.8.png b/sc2/content/base/ships/shofixti/scout-med.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.8.png
rename to sc2/content/base/ships/shofixti/scout-med.8.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.med.9.png b/sc2/content/base/ships/shofixti/scout-med.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.med.9.png
rename to sc2/content/base/ships/shofixti/scout-med.9.png
diff --git a/sc2/content/base/ships/shofixti/scout-med.ani b/sc2/content/base/ships/shofixti/scout-med.ani
new file mode 100644
index 000000000..6b82cbb98
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/scout-med.ani
@@ -0,0 +1,16 @@
+scout-med.0.png 0 1 2 4
+scout-med.1.png 0 1 2 4
+scout-med.2.png 0 1 3 3
+scout-med.3.png 0 1 4 2
+scout-med.4.png 0 1 5 2
+scout-med.5.png 0 1 4 2
+scout-med.6.png 0 1 3 3
+scout-med.7.png 0 1 2 4
+scout-med.8.png 0 1 2 4
+scout-med.9.png 0 1 2 4
+scout-med.10.png 0 1 3 3
+scout-med.11.png 0 1 4 2
+scout-med.12.png 0 1 5 2
+scout-med.13.png 0 1 4 2
+scout-med.14.png 0 1 3 3
+scout-med.15.png 0 1 2 4
diff --git a/sc2/content/base/ships/shofixti/shomicon.0.png b/sc2/content/base/ships/shofixti/scout-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shomicon.0.png
rename to sc2/content/base/ships/shofixti/scout-meleeicons.0.png
diff --git a/sc2/content/base/ships/shofixti/shomicon.1.png b/sc2/content/base/ships/shofixti/scout-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shomicon.1.png
rename to sc2/content/base/ships/shofixti/scout-meleeicons.1.png
diff --git a/sc2/content/base/ships/shofixti/scout-meleeicons.ani b/sc2/content/base/ships/shofixti/scout-meleeicons.ani
new file mode 100644
index 000000000..d967a4482
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/scout-meleeicons.ani
@@ -0,0 +1,2 @@
+scout-meleeicons.0.png 0 1 5 6
+scout-meleeicons.1.png 0 1 2 4
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.0.png b/sc2/content/base/ships/shofixti/scout-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.0.png
rename to sc2/content/base/ships/shofixti/scout-sml.0.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.1.png b/sc2/content/base/ships/shofixti/scout-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.1.png
rename to sc2/content/base/ships/shofixti/scout-sml.1.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.10.png b/sc2/content/base/ships/shofixti/scout-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.10.png
rename to sc2/content/base/ships/shofixti/scout-sml.10.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.11.png b/sc2/content/base/ships/shofixti/scout-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.11.png
rename to sc2/content/base/ships/shofixti/scout-sml.11.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.12.png b/sc2/content/base/ships/shofixti/scout-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.12.png
rename to sc2/content/base/ships/shofixti/scout-sml.12.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.13.png b/sc2/content/base/ships/shofixti/scout-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.13.png
rename to sc2/content/base/ships/shofixti/scout-sml.13.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.14.png b/sc2/content/base/ships/shofixti/scout-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.14.png
rename to sc2/content/base/ships/shofixti/scout-sml.14.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.15.png b/sc2/content/base/ships/shofixti/scout-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.15.png
rename to sc2/content/base/ships/shofixti/scout-sml.15.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.2.png b/sc2/content/base/ships/shofixti/scout-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.2.png
rename to sc2/content/base/ships/shofixti/scout-sml.2.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.3.png b/sc2/content/base/ships/shofixti/scout-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.3.png
rename to sc2/content/base/ships/shofixti/scout-sml.3.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.4.png b/sc2/content/base/ships/shofixti/scout-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.4.png
rename to sc2/content/base/ships/shofixti/scout-sml.4.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.5.png b/sc2/content/base/ships/shofixti/scout-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.5.png
rename to sc2/content/base/ships/shofixti/scout-sml.5.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.6.png b/sc2/content/base/ships/shofixti/scout-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.6.png
rename to sc2/content/base/ships/shofixti/scout-sml.6.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.7.png b/sc2/content/base/ships/shofixti/scout-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.7.png
rename to sc2/content/base/ships/shofixti/scout-sml.7.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.8.png b/sc2/content/base/ships/shofixti/scout-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.8.png
rename to sc2/content/base/ships/shofixti/scout-sml.8.png
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml.9.png b/sc2/content/base/ships/shofixti/scout-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/shofixti/shofixti.sml.9.png
rename to sc2/content/base/ships/shofixti/scout-sml.9.png
diff --git a/sc2/content/base/ships/shofixti/scout-sml.ani b/sc2/content/base/ships/shofixti/scout-sml.ani
new file mode 100644
index 000000000..f198d322d
--- /dev/null
+++ b/sc2/content/base/ships/shofixti/scout-sml.ani
@@ -0,0 +1,16 @@
+scout-sml.0.png 0 1 1 3
+scout-sml.1.png 0 1 1 2
+scout-sml.2.png 0 1 2 2
+scout-sml.3.png 0 1 2 1
+scout-sml.4.png 0 1 2 1
+scout-sml.5.png 0 1 2 1
+scout-sml.6.png 0 1 2 2
+scout-sml.7.png 0 1 1 2
+scout-sml.8.png 0 1 1 3
+scout-sml.9.png 0 1 1 2
+scout-sml.10.png 0 1 2 2
+scout-sml.11.png 0 1 2 1
+scout-sml.12.png 0 1 2 1
+scout-sml.13.png 0 1 2 1
+scout-sml.14.png 0 1 2 2
+scout-sml.15.png 0 1 1 2
diff --git a/sc2/content/base/ships/shofixti/shoditty.mod b/sc2/content/base/ships/shofixti/scout.mod
similarity index 100%
rename from sc2/content/base/ships/shofixti/shoditty.mod
rename to sc2/content/base/ships/shofixti/scout.mod
diff --git a/sc2/content/base/ships/shofixti/shosound.snd b/sc2/content/base/ships/shofixti/scout.snd
similarity index 100%
rename from sc2/content/base/ships/shofixti/shosound.snd
rename to sc2/content/base/ships/shofixti/scout.snd
diff --git a/sc2/content/base/ships/shofixti/shotext.txt b/sc2/content/base/ships/shofixti/scout.txt
similarity index 100%
rename from sc2/content/base/ships/shofixti/shotext.txt
rename to sc2/content/base/ships/shofixti/scout.txt
diff --git a/sc2/content/base/ships/shofixti/shocap.ani b/sc2/content/base/ships/shofixti/shocap.ani
deleted file mode 100644
index 5b6e34a1b..000000000
--- a/sc2/content/base/ships/shofixti/shocap.ani
+++ /dev/null
@@ -1,20 +0,0 @@
-shocap.0.png -1 1 0 0
-shocap.1.png -1 1 -2 -10
-shocap.2.png -1 1 -2 -10
-shocap.3.png -1 1 -2 -10
-shocap.4.png -1 1 -2 -10
-shocap.5.png -1 1 -2 -10
-shocap.6.png 3 1 -15 -1
-shocap.7.png 3 1 -15 -1
-shocap.8.png 3 1 -15 -1
-shocap.9.png -1 1 -41 -11
-shocap.10.png -1 1 -41 -11
-shocap.11.png -1 1 -41 -11
-shocap.12.png -1 1 0 -23
-shocap.13.png -1 1 0 -23
-shocap.14.png -1 1 0 -23
-shocap.15.png -1 1 0 -23
-shocap.16.png -1 1 0 -23
-shocap.17.png -1 1 0 -23
-shocap.18.png -1 1 0 -23
-shocap.19.png -1 1 0 -23
diff --git a/sc2/content/base/ships/shofixti/shofixti.big b/sc2/content/base/ships/shofixti/shofixti.big
deleted file mode 100644
index d258f1837..000000000
--- a/sc2/content/base/ships/shofixti/shofixti.big
+++ /dev/null
@@ -1,16 +0,0 @@
-shofixti.big.0.png 0 1 4 9
-shofixti.big.1.png 0 1 3 9
-shofixti.big.2.png 0 1 4 6
-shofixti.big.3.png 0 1 5 3
-shofixti.big.4.png 0 1 6 4
-shofixti.big.5.png 0 1 5 4
-shofixti.big.6.png 0 1 4 4
-shofixti.big.7.png 0 1 4 4
-shofixti.big.8.png 0 1 4 5
-shofixti.big.9.png 0 1 3 4
-shofixti.big.10.png 0 1 6 4
-shofixti.big.11.png 0 1 7 4
-shofixti.big.12.png 0 1 9 4
-shofixti.big.13.png 0 1 7 3
-shofixti.big.14.png 0 1 6 6
-shofixti.big.15.png 0 1 3 7
diff --git a/sc2/content/base/ships/shofixti/shofixti.med b/sc2/content/base/ships/shofixti/shofixti.med
deleted file mode 100644
index 0fe4eef7b..000000000
--- a/sc2/content/base/ships/shofixti/shofixti.med
+++ /dev/null
@@ -1,16 +0,0 @@
-shofixti.med.0.png 0 1 2 4
-shofixti.med.1.png 0 1 2 4
-shofixti.med.2.png 0 1 3 3
-shofixti.med.3.png 0 1 4 2
-shofixti.med.4.png 0 1 5 2
-shofixti.med.5.png 0 1 4 2
-shofixti.med.6.png 0 1 3 3
-shofixti.med.7.png 0 1 2 4
-shofixti.med.8.png 0 1 2 4
-shofixti.med.9.png 0 1 2 4
-shofixti.med.10.png 0 1 3 3
-shofixti.med.11.png 0 1 4 2
-shofixti.med.12.png 0 1 5 2
-shofixti.med.13.png 0 1 4 2
-shofixti.med.14.png 0 1 3 3
-shofixti.med.15.png 0 1 2 4
diff --git a/sc2/content/base/ships/shofixti/shofixti.sml b/sc2/content/base/ships/shofixti/shofixti.sml
deleted file mode 100644
index 7217b2a27..000000000
--- a/sc2/content/base/ships/shofixti/shofixti.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-shofixti.sml.0.png 0 1 1 3
-shofixti.sml.1.png 0 1 1 2
-shofixti.sml.2.png 0 1 2 2
-shofixti.sml.3.png 0 1 2 1
-shofixti.sml.4.png 0 1 2 1
-shofixti.sml.5.png 0 1 2 1
-shofixti.sml.6.png 0 1 2 2
-shofixti.sml.7.png 0 1 1 2
-shofixti.sml.8.png 0 1 1 3
-shofixti.sml.9.png 0 1 1 2
-shofixti.sml.10.png 0 1 2 2
-shofixti.sml.11.png 0 1 2 1
-shofixti.sml.12.png 0 1 2 1
-shofixti.sml.13.png 0 1 2 1
-shofixti.sml.14.png 0 1 2 2
-shofixti.sml.15.png 0 1 1 2
diff --git a/sc2/content/base/ships/shofixti/shoicons.ani b/sc2/content/base/ships/shofixti/shoicons.ani
deleted file mode 100644
index 824b252a9..000000000
--- a/sc2/content/base/ships/shofixti/shoicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-shoicons.0.png 0 1 -5 -4
-shoicons.1.png 0 1 18 22
diff --git a/sc2/content/base/ships/shofixti/shomicon.ani b/sc2/content/base/ships/shofixti/shomicon.ani
deleted file mode 100644
index 37da11ff4..000000000
--- a/sc2/content/base/ships/shofixti/shomicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-shomicon.0.png 0 1 5 6
-shomicon.1.png 0 1 2 4
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.0.png b/sc2/content/base/ships/slylandro/probe-big.0.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.0.png
rename to sc2/content/base/ships/slylandro/probe-big.0.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.1.png b/sc2/content/base/ships/slylandro/probe-big.1.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.1.png
rename to sc2/content/base/ships/slylandro/probe-big.1.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.10.png b/sc2/content/base/ships/slylandro/probe-big.10.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.10.png
rename to sc2/content/base/ships/slylandro/probe-big.10.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.11.png b/sc2/content/base/ships/slylandro/probe-big.11.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.11.png
rename to sc2/content/base/ships/slylandro/probe-big.11.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.12.png b/sc2/content/base/ships/slylandro/probe-big.12.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.12.png
rename to sc2/content/base/ships/slylandro/probe-big.12.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.13.png b/sc2/content/base/ships/slylandro/probe-big.13.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.13.png
rename to sc2/content/base/ships/slylandro/probe-big.13.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.14.png b/sc2/content/base/ships/slylandro/probe-big.14.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.14.png
rename to sc2/content/base/ships/slylandro/probe-big.14.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.15.png b/sc2/content/base/ships/slylandro/probe-big.15.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.15.png
rename to sc2/content/base/ships/slylandro/probe-big.15.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.2.png b/sc2/content/base/ships/slylandro/probe-big.2.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.2.png
rename to sc2/content/base/ships/slylandro/probe-big.2.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.3.png b/sc2/content/base/ships/slylandro/probe-big.3.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.3.png
rename to sc2/content/base/ships/slylandro/probe-big.3.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.4.png b/sc2/content/base/ships/slylandro/probe-big.4.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.4.png
rename to sc2/content/base/ships/slylandro/probe-big.4.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.5.png b/sc2/content/base/ships/slylandro/probe-big.5.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.5.png
rename to sc2/content/base/ships/slylandro/probe-big.5.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.6.png b/sc2/content/base/ships/slylandro/probe-big.6.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.6.png
rename to sc2/content/base/ships/slylandro/probe-big.6.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.7.png b/sc2/content/base/ships/slylandro/probe-big.7.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.7.png
rename to sc2/content/base/ships/slylandro/probe-big.7.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.8.png b/sc2/content/base/ships/slylandro/probe-big.8.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.8.png
rename to sc2/content/base/ships/slylandro/probe-big.8.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.big.9.png b/sc2/content/base/ships/slylandro/probe-big.9.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.big.9.png
rename to sc2/content/base/ships/slylandro/probe-big.9.png
diff --git a/sc2/content/base/ships/slylandro/probe-big.ani b/sc2/content/base/ships/slylandro/probe-big.ani
new file mode 100644
index 000000000..1c8aaa859
--- /dev/null
+++ b/sc2/content/base/ships/slylandro/probe-big.ani
@@ -0,0 +1,16 @@
+probe-big.0.png 0 1 13 22
+probe-big.1.png 0 1 14 22
+probe-big.2.png 0 1 17 21
+probe-big.3.png 0 1 19 20
+probe-big.4.png 0 1 21 18
+probe-big.5.png 0 1 23 16
+probe-big.6.png 0 1 24 14
+probe-big.7.png 0 1 25 12
+probe-big.8.png 0 1 25 11
+probe-big.9.png 0 1 25 12
+probe-big.10.png 0 1 24 14
+probe-big.11.png 0 1 23 16
+probe-big.12.png 0 1 21 18
+probe-big.13.png 0 1 19 20
+probe-big.14.png 0 1 17 21
+probe-big.15.png 0 1 14 22
diff --git a/sc2/content/base/ships/slylandro/slycap.0.png b/sc2/content/base/ships/slylandro/probe-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.0.png
rename to sc2/content/base/ships/slylandro/probe-cap.0.png
diff --git a/sc2/content/base/ships/slylandro/slycap.1.png b/sc2/content/base/ships/slylandro/probe-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.1.png
rename to sc2/content/base/ships/slylandro/probe-cap.1.png
diff --git a/sc2/content/base/ships/slylandro/slycap.10.png b/sc2/content/base/ships/slylandro/probe-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.10.png
rename to sc2/content/base/ships/slylandro/probe-cap.10.png
diff --git a/sc2/content/base/ships/slylandro/slycap.11.png b/sc2/content/base/ships/slylandro/probe-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.11.png
rename to sc2/content/base/ships/slylandro/probe-cap.11.png
diff --git a/sc2/content/base/ships/slylandro/slycap.12.png b/sc2/content/base/ships/slylandro/probe-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.12.png
rename to sc2/content/base/ships/slylandro/probe-cap.12.png
diff --git a/sc2/content/base/ships/slylandro/slycap.13.png b/sc2/content/base/ships/slylandro/probe-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.13.png
rename to sc2/content/base/ships/slylandro/probe-cap.13.png
diff --git a/sc2/content/base/ships/slylandro/slycap.14.png b/sc2/content/base/ships/slylandro/probe-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.14.png
rename to sc2/content/base/ships/slylandro/probe-cap.14.png
diff --git a/sc2/content/base/ships/slylandro/slycap.2.png b/sc2/content/base/ships/slylandro/probe-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.2.png
rename to sc2/content/base/ships/slylandro/probe-cap.2.png
diff --git a/sc2/content/base/ships/slylandro/slycap.3.png b/sc2/content/base/ships/slylandro/probe-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.3.png
rename to sc2/content/base/ships/slylandro/probe-cap.3.png
diff --git a/sc2/content/base/ships/slylandro/slycap.4.png b/sc2/content/base/ships/slylandro/probe-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.4.png
rename to sc2/content/base/ships/slylandro/probe-cap.4.png
diff --git a/sc2/content/base/ships/slylandro/slycap.5.png b/sc2/content/base/ships/slylandro/probe-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.5.png
rename to sc2/content/base/ships/slylandro/probe-cap.5.png
diff --git a/sc2/content/base/ships/slylandro/slycap.6.png b/sc2/content/base/ships/slylandro/probe-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.6.png
rename to sc2/content/base/ships/slylandro/probe-cap.6.png
diff --git a/sc2/content/base/ships/slylandro/slycap.7.png b/sc2/content/base/ships/slylandro/probe-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.7.png
rename to sc2/content/base/ships/slylandro/probe-cap.7.png
diff --git a/sc2/content/base/ships/slylandro/slycap.8.png b/sc2/content/base/ships/slylandro/probe-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.8.png
rename to sc2/content/base/ships/slylandro/probe-cap.8.png
diff --git a/sc2/content/base/ships/slylandro/slycap.9.png b/sc2/content/base/ships/slylandro/probe-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slycap.9.png
rename to sc2/content/base/ships/slylandro/probe-cap.9.png
diff --git a/sc2/content/base/ships/slylandro/probe-cap.ani b/sc2/content/base/ships/slylandro/probe-cap.ani
new file mode 100644
index 000000000..4fb109743
--- /dev/null
+++ b/sc2/content/base/ships/slylandro/probe-cap.ani
@@ -0,0 +1,15 @@
+probe-cap.0.png -1 1 0 0
+probe-cap.1.png 1 1 -4 0
+probe-cap.2.png 1 1 -4 0
+probe-cap.3.png 1 1 -4 0
+probe-cap.4.png 1 1 -43 0
+probe-cap.5.png 1 1 -43 0
+probe-cap.6.png 0 1 -14 -14
+probe-cap.7.png 0 1 -14 -14
+probe-cap.8.png 0 1 -14 -14
+probe-cap.9.png 0 1 -10 -8
+probe-cap.10.png 0 1 -10 -8
+probe-cap.11.png 0 1 -10 -8
+probe-cap.12.png 0 1 -6 -16
+probe-cap.13.png 0 1 -6 -16
+probe-cap.14.png 0 1 -6 -16
diff --git a/sc2/content/base/ships/slylandro/slyicons.0.png b/sc2/content/base/ships/slylandro/probe-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slyicons.0.png
rename to sc2/content/base/ships/slylandro/probe-icons.0.png
diff --git a/sc2/content/base/ships/slylandro/slyicons.1.png b/sc2/content/base/ships/slylandro/probe-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slyicons.1.png
rename to sc2/content/base/ships/slylandro/probe-icons.1.png
diff --git a/sc2/content/base/ships/slylandro/probe-icons.ani b/sc2/content/base/ships/slylandro/probe-icons.ani
new file mode 100644
index 000000000..7c8abb858
--- /dev/null
+++ b/sc2/content/base/ships/slylandro/probe-icons.ani
@@ -0,0 +1,2 @@
+probe-icons.0.png 0 1 0 0
+probe-icons.1.png 0 1 18 22
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.0.png b/sc2/content/base/ships/slylandro/probe-med.0.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.0.png
rename to sc2/content/base/ships/slylandro/probe-med.0.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.1.png b/sc2/content/base/ships/slylandro/probe-med.1.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.1.png
rename to sc2/content/base/ships/slylandro/probe-med.1.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.10.png b/sc2/content/base/ships/slylandro/probe-med.10.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.10.png
rename to sc2/content/base/ships/slylandro/probe-med.10.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.11.png b/sc2/content/base/ships/slylandro/probe-med.11.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.11.png
rename to sc2/content/base/ships/slylandro/probe-med.11.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.12.png b/sc2/content/base/ships/slylandro/probe-med.12.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.12.png
rename to sc2/content/base/ships/slylandro/probe-med.12.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.13.png b/sc2/content/base/ships/slylandro/probe-med.13.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.13.png
rename to sc2/content/base/ships/slylandro/probe-med.13.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.14.png b/sc2/content/base/ships/slylandro/probe-med.14.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.14.png
rename to sc2/content/base/ships/slylandro/probe-med.14.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.15.png b/sc2/content/base/ships/slylandro/probe-med.15.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.15.png
rename to sc2/content/base/ships/slylandro/probe-med.15.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.2.png b/sc2/content/base/ships/slylandro/probe-med.2.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.2.png
rename to sc2/content/base/ships/slylandro/probe-med.2.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.3.png b/sc2/content/base/ships/slylandro/probe-med.3.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.3.png
rename to sc2/content/base/ships/slylandro/probe-med.3.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.4.png b/sc2/content/base/ships/slylandro/probe-med.4.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.4.png
rename to sc2/content/base/ships/slylandro/probe-med.4.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.5.png b/sc2/content/base/ships/slylandro/probe-med.5.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.5.png
rename to sc2/content/base/ships/slylandro/probe-med.5.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.6.png b/sc2/content/base/ships/slylandro/probe-med.6.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.6.png
rename to sc2/content/base/ships/slylandro/probe-med.6.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.7.png b/sc2/content/base/ships/slylandro/probe-med.7.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.7.png
rename to sc2/content/base/ships/slylandro/probe-med.7.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.8.png b/sc2/content/base/ships/slylandro/probe-med.8.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.8.png
rename to sc2/content/base/ships/slylandro/probe-med.8.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.med.9.png b/sc2/content/base/ships/slylandro/probe-med.9.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.med.9.png
rename to sc2/content/base/ships/slylandro/probe-med.9.png
diff --git a/sc2/content/base/ships/slylandro/probe-med.ani b/sc2/content/base/ships/slylandro/probe-med.ani
new file mode 100644
index 000000000..c285fc6ff
--- /dev/null
+++ b/sc2/content/base/ships/slylandro/probe-med.ani
@@ -0,0 +1,16 @@
+probe-med.0.png 0 1 6 10
+probe-med.1.png 0 1 6 10
+probe-med.2.png 0 1 8 9
+probe-med.3.png 0 1 9 9
+probe-med.4.png 0 1 10 8
+probe-med.5.png 0 1 11 7
+probe-med.6.png 0 1 11 6
+probe-med.7.png 0 1 12 5
+probe-med.8.png 0 1 12 5
+probe-med.9.png 0 1 12 5
+probe-med.10.png 0 1 11 6
+probe-med.11.png 0 1 11 7
+probe-med.12.png 0 1 10 8
+probe-med.13.png 0 1 9 9
+probe-med.14.png 0 1 8 9
+probe-med.15.png 0 1 7 10
diff --git a/sc2/content/base/ships/slylandro/slymicon.0.png b/sc2/content/base/ships/slylandro/probe-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slymicon.0.png
rename to sc2/content/base/ships/slylandro/probe-meleeicons.0.png
diff --git a/sc2/content/base/ships/slylandro/slymicon.1.png b/sc2/content/base/ships/slylandro/probe-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slymicon.1.png
rename to sc2/content/base/ships/slylandro/probe-meleeicons.1.png
diff --git a/sc2/content/base/ships/slylandro/probe-meleeicons.ani b/sc2/content/base/ships/slylandro/probe-meleeicons.ani
new file mode 100644
index 000000000..be4fe9aff
--- /dev/null
+++ b/sc2/content/base/ships/slylandro/probe-meleeicons.ani
@@ -0,0 +1,2 @@
+probe-meleeicons.0.png 0 1 16 16
+probe-meleeicons.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.0.png b/sc2/content/base/ships/slylandro/probe-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.0.png
rename to sc2/content/base/ships/slylandro/probe-sml.0.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.1.png b/sc2/content/base/ships/slylandro/probe-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.1.png
rename to sc2/content/base/ships/slylandro/probe-sml.1.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.10.png b/sc2/content/base/ships/slylandro/probe-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.10.png
rename to sc2/content/base/ships/slylandro/probe-sml.10.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.11.png b/sc2/content/base/ships/slylandro/probe-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.11.png
rename to sc2/content/base/ships/slylandro/probe-sml.11.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.12.png b/sc2/content/base/ships/slylandro/probe-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.12.png
rename to sc2/content/base/ships/slylandro/probe-sml.12.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.13.png b/sc2/content/base/ships/slylandro/probe-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.13.png
rename to sc2/content/base/ships/slylandro/probe-sml.13.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.14.png b/sc2/content/base/ships/slylandro/probe-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.14.png
rename to sc2/content/base/ships/slylandro/probe-sml.14.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.15.png b/sc2/content/base/ships/slylandro/probe-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.15.png
rename to sc2/content/base/ships/slylandro/probe-sml.15.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.2.png b/sc2/content/base/ships/slylandro/probe-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.2.png
rename to sc2/content/base/ships/slylandro/probe-sml.2.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.3.png b/sc2/content/base/ships/slylandro/probe-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.3.png
rename to sc2/content/base/ships/slylandro/probe-sml.3.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.4.png b/sc2/content/base/ships/slylandro/probe-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.4.png
rename to sc2/content/base/ships/slylandro/probe-sml.4.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.5.png b/sc2/content/base/ships/slylandro/probe-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.5.png
rename to sc2/content/base/ships/slylandro/probe-sml.5.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.6.png b/sc2/content/base/ships/slylandro/probe-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.6.png
rename to sc2/content/base/ships/slylandro/probe-sml.6.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.7.png b/sc2/content/base/ships/slylandro/probe-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.7.png
rename to sc2/content/base/ships/slylandro/probe-sml.7.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.8.png b/sc2/content/base/ships/slylandro/probe-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.8.png
rename to sc2/content/base/ships/slylandro/probe-sml.8.png
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml.9.png b/sc2/content/base/ships/slylandro/probe-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/slylandro/slylandr.sml.9.png
rename to sc2/content/base/ships/slylandro/probe-sml.9.png
diff --git a/sc2/content/base/ships/slylandro/probe-sml.ani b/sc2/content/base/ships/slylandro/probe-sml.ani
new file mode 100644
index 000000000..93617cc31
--- /dev/null
+++ b/sc2/content/base/ships/slylandro/probe-sml.ani
@@ -0,0 +1,16 @@
+probe-sml.0.png 0 1 3 5
+probe-sml.1.png 0 1 2 5
+probe-sml.2.png 0 1 3 4
+probe-sml.3.png 0 1 4 4
+probe-sml.4.png 0 1 4 4
+probe-sml.5.png 0 1 5 3
+probe-sml.6.png 0 1 5 3
+probe-sml.7.png 0 1 5 3
+probe-sml.8.png 0 1 5 3
+probe-sml.9.png 0 1 5 3
+probe-sml.10.png 0 1 5 3
+probe-sml.11.png 0 1 5 3
+probe-sml.12.png 0 1 4 4
+probe-sml.13.png 0 1 4 4
+probe-sml.14.png 0 1 3 4
+probe-sml.15.png 0 1 3 5
diff --git a/sc2/content/base/ships/slylandro/slyditty.mod b/sc2/content/base/ships/slylandro/probe.mod
similarity index 100%
rename from sc2/content/base/ships/slylandro/slyditty.mod
rename to sc2/content/base/ships/slylandro/probe.mod
diff --git a/sc2/content/base/ships/slylandro/slysound.snd b/sc2/content/base/ships/slylandro/probe.snd
similarity index 100%
rename from sc2/content/base/ships/slylandro/slysound.snd
rename to sc2/content/base/ships/slylandro/probe.snd
diff --git a/sc2/content/base/ships/slylandro/slytext.txt b/sc2/content/base/ships/slylandro/probe.txt
similarity index 100%
rename from sc2/content/base/ships/slylandro/slytext.txt
rename to sc2/content/base/ships/slylandro/probe.txt
diff --git a/sc2/content/base/ships/slylandro/slycap.ani b/sc2/content/base/ships/slylandro/slycap.ani
deleted file mode 100644
index 36aa9353e..000000000
--- a/sc2/content/base/ships/slylandro/slycap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-slycap.0.png -1 1 0 0
-slycap.1.png 1 1 -4 0
-slycap.2.png 1 1 -4 0
-slycap.3.png 1 1 -4 0
-slycap.4.png 1 1 -43 0
-slycap.5.png 1 1 -43 0
-slycap.6.png 0 1 -14 -14
-slycap.7.png 0 1 -14 -14
-slycap.8.png 0 1 -14 -14
-slycap.9.png 0 1 -10 -8
-slycap.10.png 0 1 -10 -8
-slycap.11.png 0 1 -10 -8
-slycap.12.png 0 1 -6 -16
-slycap.13.png 0 1 -6 -16
-slycap.14.png 0 1 -6 -16
diff --git a/sc2/content/base/ships/slylandro/slyicons.ani b/sc2/content/base/ships/slylandro/slyicons.ani
deleted file mode 100644
index 8a08d79d7..000000000
--- a/sc2/content/base/ships/slylandro/slyicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-slyicons.0.png 0 1 0 0
-slyicons.1.png 0 1 18 22
diff --git a/sc2/content/base/ships/slylandro/slylandr.big b/sc2/content/base/ships/slylandro/slylandr.big
deleted file mode 100644
index 21c8ce410..000000000
--- a/sc2/content/base/ships/slylandro/slylandr.big
+++ /dev/null
@@ -1,16 +0,0 @@
-slylandr.big.0.png 0 1 13 22
-slylandr.big.1.png 0 1 14 22
-slylandr.big.2.png 0 1 17 21
-slylandr.big.3.png 0 1 19 20
-slylandr.big.4.png 0 1 21 18
-slylandr.big.5.png 0 1 23 16
-slylandr.big.6.png 0 1 24 14
-slylandr.big.7.png 0 1 25 12
-slylandr.big.8.png 0 1 25 11
-slylandr.big.9.png 0 1 25 12
-slylandr.big.10.png 0 1 24 14
-slylandr.big.11.png 0 1 23 16
-slylandr.big.12.png 0 1 21 18
-slylandr.big.13.png 0 1 19 20
-slylandr.big.14.png 0 1 17 21
-slylandr.big.15.png 0 1 14 22
diff --git a/sc2/content/base/ships/slylandro/slylandr.med b/sc2/content/base/ships/slylandro/slylandr.med
deleted file mode 100644
index 9bdacd61d..000000000
--- a/sc2/content/base/ships/slylandro/slylandr.med
+++ /dev/null
@@ -1,16 +0,0 @@
-slylandr.med.0.png 0 1 6 10
-slylandr.med.1.png 0 1 6 10
-slylandr.med.2.png 0 1 8 9
-slylandr.med.3.png 0 1 9 9
-slylandr.med.4.png 0 1 10 8
-slylandr.med.5.png 0 1 11 7
-slylandr.med.6.png 0 1 11 6
-slylandr.med.7.png 0 1 12 5
-slylandr.med.8.png 0 1 12 5
-slylandr.med.9.png 0 1 12 5
-slylandr.med.10.png 0 1 11 6
-slylandr.med.11.png 0 1 11 7
-slylandr.med.12.png 0 1 10 8
-slylandr.med.13.png 0 1 9 9
-slylandr.med.14.png 0 1 8 9
-slylandr.med.15.png 0 1 7 10
diff --git a/sc2/content/base/ships/slylandro/slylandr.sml b/sc2/content/base/ships/slylandro/slylandr.sml
deleted file mode 100644
index 40bbee87c..000000000
--- a/sc2/content/base/ships/slylandro/slylandr.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-slylandr.sml.0.png 0 1 3 5
-slylandr.sml.1.png 0 1 2 5
-slylandr.sml.2.png 0 1 3 4
-slylandr.sml.3.png 0 1 4 4
-slylandr.sml.4.png 0 1 4 4
-slylandr.sml.5.png 0 1 5 3
-slylandr.sml.6.png 0 1 5 3
-slylandr.sml.7.png 0 1 5 3
-slylandr.sml.8.png 0 1 5 3
-slylandr.sml.9.png 0 1 5 3
-slylandr.sml.10.png 0 1 5 3
-slylandr.sml.11.png 0 1 5 3
-slylandr.sml.12.png 0 1 4 4
-slylandr.sml.13.png 0 1 4 4
-slylandr.sml.14.png 0 1 3 4
-slylandr.sml.15.png 0 1 3 5
diff --git a/sc2/content/base/ships/slylandro/slymicon.ani b/sc2/content/base/ships/slylandro/slymicon.ani
deleted file mode 100644
index e4edbcacf..000000000
--- a/sc2/content/base/ships/slylandro/slymicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-slymicon.0.png 0 1 16 16
-slymicon.1.png 0 1 3 4