diff --git a/sc2/content/base/ships/flagship/blasbig.ani b/sc2/content/base/ships/flagship/blasbig.ani
deleted file mode 100644
index de64937bf..000000000
--- a/sc2/content/base/ships/flagship/blasbig.ani
+++ /dev/null
@@ -1,27 +0,0 @@
-blasbig.0.png 0 1 2 2
-blasbig.1.png 0 1 4 4
-blasbig.2.png 0 1 5 5
-blasbig.3.png 0 1 6 6
-blasbig.4.png -1 1 1 1
-blasbig.5.png -1 1 1 1
-blasbig.6.png -1 1 1 1
-blasbig.7.png -1 1 1 1
-blasbig.8.png -1 1 1 1
-blasbig.9.png 0 1 3 2
-blasbig.10.png 0 1 5 5
-blasbig.11.png 0 1 8 8
-blasbig.12.png 0 1 10 10
-blasbig.13.png 0 1 12 12
-blasbig.14.png 0 1 12 12
-blasbig.15.png 0 1 12 12
-blasbig.16.png 0 1 5 5
-blasbig.17.png 0 1 4 4
-blasbig.18.png 0 1 3 3
-blasbig.19.png 0 1 4 4
-blasbig.20.png 0 1 12 12
-blasbig.21.png 0 1 20 16
-blasbig.22.png 0 1 19 16
-blasbig.23.png 0 1 21 16
-blasbig.24.png 0 1 21 16
-blasbig.25.png 0 1 21 16
-blasbig.26.png 0 1 23 18
diff --git a/sc2/content/base/ships/flagship/blasmed.ani b/sc2/content/base/ships/flagship/blasmed.ani
deleted file mode 100644
index 1cde514b5..000000000
--- a/sc2/content/base/ships/flagship/blasmed.ani
+++ /dev/null
@@ -1,27 +0,0 @@
-blasmed.0.png -1 1 1 1
-blasmed.1.png 0 1 3 3
-blasmed.2.png 0 1 4 4
-blasmed.3.png 0 1 4 4
-blasmed.4.png -1 1 0 0
-blasmed.5.png -1 1 0 0
-blasmed.6.png -1 1 0 0
-blasmed.7.png -1 1 0 0
-blasmed.8.png -1 1 0 0
-blasmed.9.png 0 1 1 1
-blasmed.10.png 0 1 3 3
-blasmed.11.png 0 1 5 5
-blasmed.12.png 0 1 6 6
-blasmed.13.png 0 1 6 6
-blasmed.14.png 0 1 7 7
-blasmed.15.png 0 1 7 7
-blasmed.16.png 0 1 2 2
-blasmed.17.png 0 1 2 2
-blasmed.18.png -1 1 1 1
-blasmed.19.png 0 1 2 2
-blasmed.20.png 0 1 5 6
-blasmed.21.png 0 1 9 7
-blasmed.22.png 0 1 9 8
-blasmed.23.png 0 1 10 7
-blasmed.24.png 0 1 10 7
-blasmed.25.png 0 1 10 8
-blasmed.26.png 0 1 10 8
diff --git a/sc2/content/base/ships/flagship/blassml.ani b/sc2/content/base/ships/flagship/blassml.ani
deleted file mode 100644
index 2fa13ff01..000000000
--- a/sc2/content/base/ships/flagship/blassml.ani
+++ /dev/null
@@ -1,27 +0,0 @@
-blassml.0.png -1 1 0 0
-blassml.1.png -1 1 1 1
-blassml.2.png 0 1 2 2
-blassml.3.png 0 1 2 2
-blassml.4.png -1 1 0 0
-blassml.5.png -1 1 0 0
-blassml.6.png -1 1 0 0
-blassml.7.png -1 1 0 0
-blassml.8.png -1 1 0 0
-blassml.9.png -1 1 1 1
-blassml.10.png 0 1 1 1
-blassml.11.png 0 1 2 2
-blassml.12.png 0 1 3 3
-blassml.13.png 0 1 4 4
-blassml.14.png 0 1 4 4
-blassml.15.png 0 1 4 4
-blassml.16.png -1 1 1 1
-blassml.17.png -1 1 1 1
-blassml.18.png 0 1 1 1
-blassml.19.png -1 1 1 1
-blassml.20.png 0 1 3 3
-blassml.21.png 0 1 4 4
-blassml.22.png 0 1 4 4
-blassml.23.png 0 1 5 4
-blassml.24.png 0 1 5 4
-blassml.25.png 0 1 5 4
-blassml.26.png 0 1 5 4
diff --git a/sc2/content/base/ships/flagship/blasbig.0.png b/sc2/content/base/ships/flagship/blaster-big.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.0.png
rename to sc2/content/base/ships/flagship/blaster-big.0.png
diff --git a/sc2/content/base/ships/flagship/blasbig.1.png b/sc2/content/base/ships/flagship/blaster-big.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.1.png
rename to sc2/content/base/ships/flagship/blaster-big.1.png
diff --git a/sc2/content/base/ships/flagship/blasbig.10.png b/sc2/content/base/ships/flagship/blaster-big.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.10.png
rename to sc2/content/base/ships/flagship/blaster-big.10.png
diff --git a/sc2/content/base/ships/flagship/blasbig.11.png b/sc2/content/base/ships/flagship/blaster-big.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.11.png
rename to sc2/content/base/ships/flagship/blaster-big.11.png
diff --git a/sc2/content/base/ships/flagship/blasbig.12.png b/sc2/content/base/ships/flagship/blaster-big.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.12.png
rename to sc2/content/base/ships/flagship/blaster-big.12.png
diff --git a/sc2/content/base/ships/flagship/blasbig.13.png b/sc2/content/base/ships/flagship/blaster-big.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.13.png
rename to sc2/content/base/ships/flagship/blaster-big.13.png
diff --git a/sc2/content/base/ships/flagship/blasbig.14.png b/sc2/content/base/ships/flagship/blaster-big.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.14.png
rename to sc2/content/base/ships/flagship/blaster-big.14.png
diff --git a/sc2/content/base/ships/flagship/blasbig.15.png b/sc2/content/base/ships/flagship/blaster-big.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.15.png
rename to sc2/content/base/ships/flagship/blaster-big.15.png
diff --git a/sc2/content/base/ships/flagship/blasbig.16.png b/sc2/content/base/ships/flagship/blaster-big.16.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.16.png
rename to sc2/content/base/ships/flagship/blaster-big.16.png
diff --git a/sc2/content/base/ships/flagship/blasbig.17.png b/sc2/content/base/ships/flagship/blaster-big.17.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.17.png
rename to sc2/content/base/ships/flagship/blaster-big.17.png
diff --git a/sc2/content/base/ships/flagship/blasbig.18.png b/sc2/content/base/ships/flagship/blaster-big.18.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.18.png
rename to sc2/content/base/ships/flagship/blaster-big.18.png
diff --git a/sc2/content/base/ships/flagship/blasbig.19.png b/sc2/content/base/ships/flagship/blaster-big.19.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.19.png
rename to sc2/content/base/ships/flagship/blaster-big.19.png
diff --git a/sc2/content/base/ships/flagship/blasbig.2.png b/sc2/content/base/ships/flagship/blaster-big.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.2.png
rename to sc2/content/base/ships/flagship/blaster-big.2.png
diff --git a/sc2/content/base/ships/flagship/blasbig.20.png b/sc2/content/base/ships/flagship/blaster-big.20.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.20.png
rename to sc2/content/base/ships/flagship/blaster-big.20.png
diff --git a/sc2/content/base/ships/flagship/blasbig.21.png b/sc2/content/base/ships/flagship/blaster-big.21.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.21.png
rename to sc2/content/base/ships/flagship/blaster-big.21.png
diff --git a/sc2/content/base/ships/flagship/blasbig.22.png b/sc2/content/base/ships/flagship/blaster-big.22.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.22.png
rename to sc2/content/base/ships/flagship/blaster-big.22.png
diff --git a/sc2/content/base/ships/flagship/blasbig.23.png b/sc2/content/base/ships/flagship/blaster-big.23.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.23.png
rename to sc2/content/base/ships/flagship/blaster-big.23.png
diff --git a/sc2/content/base/ships/flagship/blasbig.24.png b/sc2/content/base/ships/flagship/blaster-big.24.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.24.png
rename to sc2/content/base/ships/flagship/blaster-big.24.png
diff --git a/sc2/content/base/ships/flagship/blasbig.25.png b/sc2/content/base/ships/flagship/blaster-big.25.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.25.png
rename to sc2/content/base/ships/flagship/blaster-big.25.png
diff --git a/sc2/content/base/ships/flagship/blasbig.26.png b/sc2/content/base/ships/flagship/blaster-big.26.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.26.png
rename to sc2/content/base/ships/flagship/blaster-big.26.png
diff --git a/sc2/content/base/ships/flagship/blasbig.3.png b/sc2/content/base/ships/flagship/blaster-big.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.3.png
rename to sc2/content/base/ships/flagship/blaster-big.3.png
diff --git a/sc2/content/base/ships/flagship/blasbig.4.png b/sc2/content/base/ships/flagship/blaster-big.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.4.png
rename to sc2/content/base/ships/flagship/blaster-big.4.png
diff --git a/sc2/content/base/ships/flagship/blasbig.5.png b/sc2/content/base/ships/flagship/blaster-big.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.5.png
rename to sc2/content/base/ships/flagship/blaster-big.5.png
diff --git a/sc2/content/base/ships/flagship/blasbig.6.png b/sc2/content/base/ships/flagship/blaster-big.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.6.png
rename to sc2/content/base/ships/flagship/blaster-big.6.png
diff --git a/sc2/content/base/ships/flagship/blasbig.7.png b/sc2/content/base/ships/flagship/blaster-big.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.7.png
rename to sc2/content/base/ships/flagship/blaster-big.7.png
diff --git a/sc2/content/base/ships/flagship/blasbig.8.png b/sc2/content/base/ships/flagship/blaster-big.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.8.png
rename to sc2/content/base/ships/flagship/blaster-big.8.png
diff --git a/sc2/content/base/ships/flagship/blasbig.9.png b/sc2/content/base/ships/flagship/blaster-big.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasbig.9.png
rename to sc2/content/base/ships/flagship/blaster-big.9.png
diff --git a/sc2/content/base/ships/flagship/blaster-big.ani b/sc2/content/base/ships/flagship/blaster-big.ani
new file mode 100644
index 000000000..2cb5693b2
--- /dev/null
+++ b/sc2/content/base/ships/flagship/blaster-big.ani
@@ -0,0 +1,27 @@
+blaster-big.0.png 0 1 2 2
+blaster-big.1.png 0 1 4 4
+blaster-big.2.png 0 1 5 5
+blaster-big.3.png 0 1 6 6
+blaster-big.4.png -1 1 1 1
+blaster-big.5.png -1 1 1 1
+blaster-big.6.png -1 1 1 1
+blaster-big.7.png -1 1 1 1
+blaster-big.8.png -1 1 1 1
+blaster-big.9.png 0 1 3 2
+blaster-big.10.png 0 1 5 5
+blaster-big.11.png 0 1 8 8
+blaster-big.12.png 0 1 10 10
+blaster-big.13.png 0 1 12 12
+blaster-big.14.png 0 1 12 12
+blaster-big.15.png 0 1 12 12
+blaster-big.16.png 0 1 5 5
+blaster-big.17.png 0 1 4 4
+blaster-big.18.png 0 1 3 3
+blaster-big.19.png 0 1 4 4
+blaster-big.20.png 0 1 12 12
+blaster-big.21.png 0 1 20 16
+blaster-big.22.png 0 1 19 16
+blaster-big.23.png 0 1 21 16
+blaster-big.24.png 0 1 21 16
+blaster-big.25.png 0 1 21 16
+blaster-big.26.png 0 1 23 18
diff --git a/sc2/content/base/ships/flagship/blasmed.0.png b/sc2/content/base/ships/flagship/blaster-med.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.0.png
rename to sc2/content/base/ships/flagship/blaster-med.0.png
diff --git a/sc2/content/base/ships/flagship/blasmed.1.png b/sc2/content/base/ships/flagship/blaster-med.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.1.png
rename to sc2/content/base/ships/flagship/blaster-med.1.png
diff --git a/sc2/content/base/ships/flagship/blasmed.10.png b/sc2/content/base/ships/flagship/blaster-med.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.10.png
rename to sc2/content/base/ships/flagship/blaster-med.10.png
diff --git a/sc2/content/base/ships/flagship/blasmed.11.png b/sc2/content/base/ships/flagship/blaster-med.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.11.png
rename to sc2/content/base/ships/flagship/blaster-med.11.png
diff --git a/sc2/content/base/ships/flagship/blasmed.12.png b/sc2/content/base/ships/flagship/blaster-med.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.12.png
rename to sc2/content/base/ships/flagship/blaster-med.12.png
diff --git a/sc2/content/base/ships/flagship/blasmed.13.png b/sc2/content/base/ships/flagship/blaster-med.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.13.png
rename to sc2/content/base/ships/flagship/blaster-med.13.png
diff --git a/sc2/content/base/ships/flagship/blasmed.14.png b/sc2/content/base/ships/flagship/blaster-med.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.14.png
rename to sc2/content/base/ships/flagship/blaster-med.14.png
diff --git a/sc2/content/base/ships/flagship/blasmed.15.png b/sc2/content/base/ships/flagship/blaster-med.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.15.png
rename to sc2/content/base/ships/flagship/blaster-med.15.png
diff --git a/sc2/content/base/ships/flagship/blasmed.16.png b/sc2/content/base/ships/flagship/blaster-med.16.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.16.png
rename to sc2/content/base/ships/flagship/blaster-med.16.png
diff --git a/sc2/content/base/ships/flagship/blasmed.17.png b/sc2/content/base/ships/flagship/blaster-med.17.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.17.png
rename to sc2/content/base/ships/flagship/blaster-med.17.png
diff --git a/sc2/content/base/ships/flagship/blasmed.18.png b/sc2/content/base/ships/flagship/blaster-med.18.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.18.png
rename to sc2/content/base/ships/flagship/blaster-med.18.png
diff --git a/sc2/content/base/ships/flagship/blasmed.19.png b/sc2/content/base/ships/flagship/blaster-med.19.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.19.png
rename to sc2/content/base/ships/flagship/blaster-med.19.png
diff --git a/sc2/content/base/ships/flagship/blasmed.2.png b/sc2/content/base/ships/flagship/blaster-med.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.2.png
rename to sc2/content/base/ships/flagship/blaster-med.2.png
diff --git a/sc2/content/base/ships/flagship/blasmed.20.png b/sc2/content/base/ships/flagship/blaster-med.20.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.20.png
rename to sc2/content/base/ships/flagship/blaster-med.20.png
diff --git a/sc2/content/base/ships/flagship/blasmed.21.png b/sc2/content/base/ships/flagship/blaster-med.21.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.21.png
rename to sc2/content/base/ships/flagship/blaster-med.21.png
diff --git a/sc2/content/base/ships/flagship/blasmed.22.png b/sc2/content/base/ships/flagship/blaster-med.22.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.22.png
rename to sc2/content/base/ships/flagship/blaster-med.22.png
diff --git a/sc2/content/base/ships/flagship/blasmed.23.png b/sc2/content/base/ships/flagship/blaster-med.23.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.23.png
rename to sc2/content/base/ships/flagship/blaster-med.23.png
diff --git a/sc2/content/base/ships/flagship/blasmed.24.png b/sc2/content/base/ships/flagship/blaster-med.24.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.24.png
rename to sc2/content/base/ships/flagship/blaster-med.24.png
diff --git a/sc2/content/base/ships/flagship/blasmed.25.png b/sc2/content/base/ships/flagship/blaster-med.25.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.25.png
rename to sc2/content/base/ships/flagship/blaster-med.25.png
diff --git a/sc2/content/base/ships/flagship/blasmed.26.png b/sc2/content/base/ships/flagship/blaster-med.26.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.26.png
rename to sc2/content/base/ships/flagship/blaster-med.26.png
diff --git a/sc2/content/base/ships/flagship/blasmed.3.png b/sc2/content/base/ships/flagship/blaster-med.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.3.png
rename to sc2/content/base/ships/flagship/blaster-med.3.png
diff --git a/sc2/content/base/ships/flagship/blasmed.4.png b/sc2/content/base/ships/flagship/blaster-med.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.4.png
rename to sc2/content/base/ships/flagship/blaster-med.4.png
diff --git a/sc2/content/base/ships/flagship/blasmed.5.png b/sc2/content/base/ships/flagship/blaster-med.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.5.png
rename to sc2/content/base/ships/flagship/blaster-med.5.png
diff --git a/sc2/content/base/ships/flagship/blasmed.6.png b/sc2/content/base/ships/flagship/blaster-med.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.6.png
rename to sc2/content/base/ships/flagship/blaster-med.6.png
diff --git a/sc2/content/base/ships/flagship/blasmed.7.png b/sc2/content/base/ships/flagship/blaster-med.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.7.png
rename to sc2/content/base/ships/flagship/blaster-med.7.png
diff --git a/sc2/content/base/ships/flagship/blasmed.8.png b/sc2/content/base/ships/flagship/blaster-med.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.8.png
rename to sc2/content/base/ships/flagship/blaster-med.8.png
diff --git a/sc2/content/base/ships/flagship/blasmed.9.png b/sc2/content/base/ships/flagship/blaster-med.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blasmed.9.png
rename to sc2/content/base/ships/flagship/blaster-med.9.png
diff --git a/sc2/content/base/ships/flagship/blaster-med.ani b/sc2/content/base/ships/flagship/blaster-med.ani
new file mode 100644
index 000000000..24ec2741f
--- /dev/null
+++ b/sc2/content/base/ships/flagship/blaster-med.ani
@@ -0,0 +1,27 @@
+blaster-med.0.png -1 1 1 1
+blaster-med.1.png 0 1 3 3
+blaster-med.2.png 0 1 4 4
+blaster-med.3.png 0 1 4 4
+blaster-med.4.png -1 1 0 0
+blaster-med.5.png -1 1 0 0
+blaster-med.6.png -1 1 0 0
+blaster-med.7.png -1 1 0 0
+blaster-med.8.png -1 1 0 0
+blaster-med.9.png 0 1 1 1
+blaster-med.10.png 0 1 3 3
+blaster-med.11.png 0 1 5 5
+blaster-med.12.png 0 1 6 6
+blaster-med.13.png 0 1 6 6
+blaster-med.14.png 0 1 7 7
+blaster-med.15.png 0 1 7 7
+blaster-med.16.png 0 1 2 2
+blaster-med.17.png 0 1 2 2
+blaster-med.18.png -1 1 1 1
+blaster-med.19.png 0 1 2 2
+blaster-med.20.png 0 1 5 6
+blaster-med.21.png 0 1 9 7
+blaster-med.22.png 0 1 9 8
+blaster-med.23.png 0 1 10 7
+blaster-med.24.png 0 1 10 7
+blaster-med.25.png 0 1 10 8
+blaster-med.26.png 0 1 10 8
diff --git a/sc2/content/base/ships/flagship/blassml.0.png b/sc2/content/base/ships/flagship/blaster-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.0.png
rename to sc2/content/base/ships/flagship/blaster-sml.0.png
diff --git a/sc2/content/base/ships/flagship/blassml.1.png b/sc2/content/base/ships/flagship/blaster-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.1.png
rename to sc2/content/base/ships/flagship/blaster-sml.1.png
diff --git a/sc2/content/base/ships/flagship/blassml.10.png b/sc2/content/base/ships/flagship/blaster-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.10.png
rename to sc2/content/base/ships/flagship/blaster-sml.10.png
diff --git a/sc2/content/base/ships/flagship/blassml.11.png b/sc2/content/base/ships/flagship/blaster-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.11.png
rename to sc2/content/base/ships/flagship/blaster-sml.11.png
diff --git a/sc2/content/base/ships/flagship/blassml.12.png b/sc2/content/base/ships/flagship/blaster-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.12.png
rename to sc2/content/base/ships/flagship/blaster-sml.12.png
diff --git a/sc2/content/base/ships/flagship/blassml.13.png b/sc2/content/base/ships/flagship/blaster-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.13.png
rename to sc2/content/base/ships/flagship/blaster-sml.13.png
diff --git a/sc2/content/base/ships/flagship/blassml.14.png b/sc2/content/base/ships/flagship/blaster-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.14.png
rename to sc2/content/base/ships/flagship/blaster-sml.14.png
diff --git a/sc2/content/base/ships/flagship/blassml.15.png b/sc2/content/base/ships/flagship/blaster-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.15.png
rename to sc2/content/base/ships/flagship/blaster-sml.15.png
diff --git a/sc2/content/base/ships/flagship/blassml.16.png b/sc2/content/base/ships/flagship/blaster-sml.16.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.16.png
rename to sc2/content/base/ships/flagship/blaster-sml.16.png
diff --git a/sc2/content/base/ships/flagship/blassml.17.png b/sc2/content/base/ships/flagship/blaster-sml.17.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.17.png
rename to sc2/content/base/ships/flagship/blaster-sml.17.png
diff --git a/sc2/content/base/ships/flagship/blassml.18.png b/sc2/content/base/ships/flagship/blaster-sml.18.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.18.png
rename to sc2/content/base/ships/flagship/blaster-sml.18.png
diff --git a/sc2/content/base/ships/flagship/blassml.19.png b/sc2/content/base/ships/flagship/blaster-sml.19.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.19.png
rename to sc2/content/base/ships/flagship/blaster-sml.19.png
diff --git a/sc2/content/base/ships/flagship/blassml.2.png b/sc2/content/base/ships/flagship/blaster-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.2.png
rename to sc2/content/base/ships/flagship/blaster-sml.2.png
diff --git a/sc2/content/base/ships/flagship/blassml.20.png b/sc2/content/base/ships/flagship/blaster-sml.20.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.20.png
rename to sc2/content/base/ships/flagship/blaster-sml.20.png
diff --git a/sc2/content/base/ships/flagship/blassml.21.png b/sc2/content/base/ships/flagship/blaster-sml.21.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.21.png
rename to sc2/content/base/ships/flagship/blaster-sml.21.png
diff --git a/sc2/content/base/ships/flagship/blassml.22.png b/sc2/content/base/ships/flagship/blaster-sml.22.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.22.png
rename to sc2/content/base/ships/flagship/blaster-sml.22.png
diff --git a/sc2/content/base/ships/flagship/blassml.23.png b/sc2/content/base/ships/flagship/blaster-sml.23.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.23.png
rename to sc2/content/base/ships/flagship/blaster-sml.23.png
diff --git a/sc2/content/base/ships/flagship/blassml.24.png b/sc2/content/base/ships/flagship/blaster-sml.24.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.24.png
rename to sc2/content/base/ships/flagship/blaster-sml.24.png
diff --git a/sc2/content/base/ships/flagship/blassml.25.png b/sc2/content/base/ships/flagship/blaster-sml.25.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.25.png
rename to sc2/content/base/ships/flagship/blaster-sml.25.png
diff --git a/sc2/content/base/ships/flagship/blassml.26.png b/sc2/content/base/ships/flagship/blaster-sml.26.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.26.png
rename to sc2/content/base/ships/flagship/blaster-sml.26.png
diff --git a/sc2/content/base/ships/flagship/blassml.3.png b/sc2/content/base/ships/flagship/blaster-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.3.png
rename to sc2/content/base/ships/flagship/blaster-sml.3.png
diff --git a/sc2/content/base/ships/flagship/blassml.4.png b/sc2/content/base/ships/flagship/blaster-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.4.png
rename to sc2/content/base/ships/flagship/blaster-sml.4.png
diff --git a/sc2/content/base/ships/flagship/blassml.5.png b/sc2/content/base/ships/flagship/blaster-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.5.png
rename to sc2/content/base/ships/flagship/blaster-sml.5.png
diff --git a/sc2/content/base/ships/flagship/blassml.6.png b/sc2/content/base/ships/flagship/blaster-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.6.png
rename to sc2/content/base/ships/flagship/blaster-sml.6.png
diff --git a/sc2/content/base/ships/flagship/blassml.7.png b/sc2/content/base/ships/flagship/blaster-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.7.png
rename to sc2/content/base/ships/flagship/blaster-sml.7.png
diff --git a/sc2/content/base/ships/flagship/blassml.8.png b/sc2/content/base/ships/flagship/blaster-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.8.png
rename to sc2/content/base/ships/flagship/blaster-sml.8.png
diff --git a/sc2/content/base/ships/flagship/blassml.9.png b/sc2/content/base/ships/flagship/blaster-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/blassml.9.png
rename to sc2/content/base/ships/flagship/blaster-sml.9.png
diff --git a/sc2/content/base/ships/flagship/blaster-sml.ani b/sc2/content/base/ships/flagship/blaster-sml.ani
new file mode 100644
index 000000000..374c35407
--- /dev/null
+++ b/sc2/content/base/ships/flagship/blaster-sml.ani
@@ -0,0 +1,27 @@
+blaster-sml.0.png -1 1 0 0
+blaster-sml.1.png -1 1 1 1
+blaster-sml.2.png 0 1 2 2
+blaster-sml.3.png 0 1 2 2
+blaster-sml.4.png -1 1 0 0
+blaster-sml.5.png -1 1 0 0
+blaster-sml.6.png -1 1 0 0
+blaster-sml.7.png -1 1 0 0
+blaster-sml.8.png -1 1 0 0
+blaster-sml.9.png -1 1 1 1
+blaster-sml.10.png 0 1 1 1
+blaster-sml.11.png 0 1 2 2
+blaster-sml.12.png 0 1 3 3
+blaster-sml.13.png 0 1 4 4
+blaster-sml.14.png 0 1 4 4
+blaster-sml.15.png 0 1 4 4
+blaster-sml.16.png -1 1 1 1
+blaster-sml.17.png -1 1 1 1
+blaster-sml.18.png 0 1 1 1
+blaster-sml.19.png -1 1 1 1
+blaster-sml.20.png 0 1 3 3
+blaster-sml.21.png 0 1 4 4
+blaster-sml.22.png 0 1 4 4
+blaster-sml.23.png 0 1 5 4
+blaster-sml.24.png 0 1 5 4
+blaster-sml.25.png 0 1 5 4
+blaster-sml.26.png 0 1 5 4
diff --git a/sc2/content/base/ships/flagship/sis.big.0.png b/sc2/content/base/ships/flagship/flagship-big.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.0.png
rename to sc2/content/base/ships/flagship/flagship-big.0.png
diff --git a/sc2/content/base/ships/flagship/sis.big.1.png b/sc2/content/base/ships/flagship/flagship-big.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.1.png
rename to sc2/content/base/ships/flagship/flagship-big.1.png
diff --git a/sc2/content/base/ships/flagship/sis.big.10.png b/sc2/content/base/ships/flagship/flagship-big.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.10.png
rename to sc2/content/base/ships/flagship/flagship-big.10.png
diff --git a/sc2/content/base/ships/flagship/sis.big.11.png b/sc2/content/base/ships/flagship/flagship-big.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.11.png
rename to sc2/content/base/ships/flagship/flagship-big.11.png
diff --git a/sc2/content/base/ships/flagship/sis.big.12.png b/sc2/content/base/ships/flagship/flagship-big.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.12.png
rename to sc2/content/base/ships/flagship/flagship-big.12.png
diff --git a/sc2/content/base/ships/flagship/sis.big.13.png b/sc2/content/base/ships/flagship/flagship-big.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.13.png
rename to sc2/content/base/ships/flagship/flagship-big.13.png
diff --git a/sc2/content/base/ships/flagship/sis.big.14.png b/sc2/content/base/ships/flagship/flagship-big.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.14.png
rename to sc2/content/base/ships/flagship/flagship-big.14.png
diff --git a/sc2/content/base/ships/flagship/sis.big.15.png b/sc2/content/base/ships/flagship/flagship-big.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.15.png
rename to sc2/content/base/ships/flagship/flagship-big.15.png
diff --git a/sc2/content/base/ships/flagship/sis.big.2.png b/sc2/content/base/ships/flagship/flagship-big.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.2.png
rename to sc2/content/base/ships/flagship/flagship-big.2.png
diff --git a/sc2/content/base/ships/flagship/sis.big.3.png b/sc2/content/base/ships/flagship/flagship-big.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.3.png
rename to sc2/content/base/ships/flagship/flagship-big.3.png
diff --git a/sc2/content/base/ships/flagship/sis.big.4.png b/sc2/content/base/ships/flagship/flagship-big.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.4.png
rename to sc2/content/base/ships/flagship/flagship-big.4.png
diff --git a/sc2/content/base/ships/flagship/sis.big.5.png b/sc2/content/base/ships/flagship/flagship-big.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.5.png
rename to sc2/content/base/ships/flagship/flagship-big.5.png
diff --git a/sc2/content/base/ships/flagship/sis.big.6.png b/sc2/content/base/ships/flagship/flagship-big.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.6.png
rename to sc2/content/base/ships/flagship/flagship-big.6.png
diff --git a/sc2/content/base/ships/flagship/sis.big.7.png b/sc2/content/base/ships/flagship/flagship-big.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.7.png
rename to sc2/content/base/ships/flagship/flagship-big.7.png
diff --git a/sc2/content/base/ships/flagship/sis.big.8.png b/sc2/content/base/ships/flagship/flagship-big.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.8.png
rename to sc2/content/base/ships/flagship/flagship-big.8.png
diff --git a/sc2/content/base/ships/flagship/sis.big.9.png b/sc2/content/base/ships/flagship/flagship-big.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.big.9.png
rename to sc2/content/base/ships/flagship/flagship-big.9.png
diff --git a/sc2/content/base/ships/flagship/flagship-big.ani b/sc2/content/base/ships/flagship/flagship-big.ani
new file mode 100644
index 000000000..898f71766
--- /dev/null
+++ b/sc2/content/base/ships/flagship/flagship-big.ani
@@ -0,0 +1,16 @@
+flagship-big.0.png 0 55 14 23
+flagship-big.1.png 0 55 16 22
+flagship-big.2.png 0 55 19 19
+flagship-big.3.png 0 55 23 15
+flagship-big.4.png 0 55 27 13
+flagship-big.5.png 0 55 23 15
+flagship-big.6.png 0 55 19 19
+flagship-big.7.png 0 55 16 22
+flagship-big.8.png 0 55 14 23
+flagship-big.9.png 0 55 16 22
+flagship-big.10.png 0 55 19 19
+flagship-big.11.png 0 55 23 15
+flagship-big.12.png 0 55 27 13
+flagship-big.13.png 0 55 23 15
+flagship-big.14.png 0 55 19 19
+flagship-big.15.png 0 55 16 22
diff --git a/sc2/content/base/ships/flagship/siscap.0.png b/sc2/content/base/ships/flagship/flagship-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.0.png
rename to sc2/content/base/ships/flagship/flagship-cap.0.png
diff --git a/sc2/content/base/ships/flagship/siscap.1.png b/sc2/content/base/ships/flagship/flagship-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.1.png
rename to sc2/content/base/ships/flagship/flagship-cap.1.png
diff --git a/sc2/content/base/ships/flagship/siscap.10.png b/sc2/content/base/ships/flagship/flagship-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.10.png
rename to sc2/content/base/ships/flagship/flagship-cap.10.png
diff --git a/sc2/content/base/ships/flagship/siscap.11.png b/sc2/content/base/ships/flagship/flagship-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.11.png
rename to sc2/content/base/ships/flagship/flagship-cap.11.png
diff --git a/sc2/content/base/ships/flagship/siscap.12.png b/sc2/content/base/ships/flagship/flagship-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.12.png
rename to sc2/content/base/ships/flagship/flagship-cap.12.png
diff --git a/sc2/content/base/ships/flagship/siscap.13.png b/sc2/content/base/ships/flagship/flagship-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.13.png
rename to sc2/content/base/ships/flagship/flagship-cap.13.png
diff --git a/sc2/content/base/ships/flagship/siscap.14.png b/sc2/content/base/ships/flagship/flagship-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.14.png
rename to sc2/content/base/ships/flagship/flagship-cap.14.png
diff --git a/sc2/content/base/ships/flagship/siscap.2.png b/sc2/content/base/ships/flagship/flagship-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.2.png
rename to sc2/content/base/ships/flagship/flagship-cap.2.png
diff --git a/sc2/content/base/ships/flagship/siscap.3.png b/sc2/content/base/ships/flagship/flagship-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.3.png
rename to sc2/content/base/ships/flagship/flagship-cap.3.png
diff --git a/sc2/content/base/ships/flagship/siscap.4.png b/sc2/content/base/ships/flagship/flagship-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.4.png
rename to sc2/content/base/ships/flagship/flagship-cap.4.png
diff --git a/sc2/content/base/ships/flagship/siscap.5.png b/sc2/content/base/ships/flagship/flagship-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.5.png
rename to sc2/content/base/ships/flagship/flagship-cap.5.png
diff --git a/sc2/content/base/ships/flagship/siscap.6.png b/sc2/content/base/ships/flagship/flagship-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.6.png
rename to sc2/content/base/ships/flagship/flagship-cap.6.png
diff --git a/sc2/content/base/ships/flagship/siscap.7.png b/sc2/content/base/ships/flagship/flagship-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.7.png
rename to sc2/content/base/ships/flagship/flagship-cap.7.png
diff --git a/sc2/content/base/ships/flagship/siscap.8.png b/sc2/content/base/ships/flagship/flagship-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.8.png
rename to sc2/content/base/ships/flagship/flagship-cap.8.png
diff --git a/sc2/content/base/ships/flagship/siscap.9.png b/sc2/content/base/ships/flagship/flagship-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/siscap.9.png
rename to sc2/content/base/ships/flagship/flagship-cap.9.png
diff --git a/sc2/content/base/ships/flagship/flagship-cap.ani b/sc2/content/base/ships/flagship/flagship-cap.ani
new file mode 100644
index 000000000..35e21c1df
--- /dev/null
+++ b/sc2/content/base/ships/flagship/flagship-cap.ani
@@ -0,0 +1,15 @@
+flagship-cap.0.png -1 1 1 1
+flagship-cap.1.png -1 1 -1 -24
+flagship-cap.2.png -1 1 -1 -24
+flagship-cap.3.png -1 1 -1 -24
+flagship-cap.4.png -1 1 -1 -24
+flagship-cap.5.png -1 1 -1 -24
+flagship-cap.6.png -1 1 -1 -8
+flagship-cap.7.png -1 1 -1 -8
+flagship-cap.8.png -1 1 -1 -8
+flagship-cap.9.png -1 1 -20 -11
+flagship-cap.10.png -1 1 -20 -11
+flagship-cap.11.png -1 1 -20 -11
+flagship-cap.12.png -1 1 -20 -18
+flagship-cap.13.png -1 1 -20 -18
+flagship-cap.14.png -1 1 -20 -18
diff --git a/sc2/content/base/ships/flagship/sisicons.0.png b/sc2/content/base/ships/flagship/flagship-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sisicons.0.png
rename to sc2/content/base/ships/flagship/flagship-icons.0.png
diff --git a/sc2/content/base/ships/flagship/flagship-icons.ani b/sc2/content/base/ships/flagship/flagship-icons.ani
new file mode 100644
index 000000000..8ffa00272
--- /dev/null
+++ b/sc2/content/base/ships/flagship/flagship-icons.ani
@@ -0,0 +1 @@
+flagship-icons.0.png 0 55 18 20
diff --git a/sc2/content/base/ships/flagship/sis.med.0.png b/sc2/content/base/ships/flagship/flagship-med.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.0.png
rename to sc2/content/base/ships/flagship/flagship-med.0.png
diff --git a/sc2/content/base/ships/flagship/sis.med.1.png b/sc2/content/base/ships/flagship/flagship-med.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.1.png
rename to sc2/content/base/ships/flagship/flagship-med.1.png
diff --git a/sc2/content/base/ships/flagship/sis.med.10.png b/sc2/content/base/ships/flagship/flagship-med.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.10.png
rename to sc2/content/base/ships/flagship/flagship-med.10.png
diff --git a/sc2/content/base/ships/flagship/sis.med.11.png b/sc2/content/base/ships/flagship/flagship-med.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.11.png
rename to sc2/content/base/ships/flagship/flagship-med.11.png
diff --git a/sc2/content/base/ships/flagship/sis.med.12.png b/sc2/content/base/ships/flagship/flagship-med.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.12.png
rename to sc2/content/base/ships/flagship/flagship-med.12.png
diff --git a/sc2/content/base/ships/flagship/sis.med.13.png b/sc2/content/base/ships/flagship/flagship-med.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.13.png
rename to sc2/content/base/ships/flagship/flagship-med.13.png
diff --git a/sc2/content/base/ships/flagship/sis.med.14.png b/sc2/content/base/ships/flagship/flagship-med.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.14.png
rename to sc2/content/base/ships/flagship/flagship-med.14.png
diff --git a/sc2/content/base/ships/flagship/sis.med.15.png b/sc2/content/base/ships/flagship/flagship-med.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.15.png
rename to sc2/content/base/ships/flagship/flagship-med.15.png
diff --git a/sc2/content/base/ships/flagship/sis.med.2.png b/sc2/content/base/ships/flagship/flagship-med.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.2.png
rename to sc2/content/base/ships/flagship/flagship-med.2.png
diff --git a/sc2/content/base/ships/flagship/sis.med.3.png b/sc2/content/base/ships/flagship/flagship-med.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.3.png
rename to sc2/content/base/ships/flagship/flagship-med.3.png
diff --git a/sc2/content/base/ships/flagship/sis.med.4.png b/sc2/content/base/ships/flagship/flagship-med.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.4.png
rename to sc2/content/base/ships/flagship/flagship-med.4.png
diff --git a/sc2/content/base/ships/flagship/sis.med.5.png b/sc2/content/base/ships/flagship/flagship-med.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.5.png
rename to sc2/content/base/ships/flagship/flagship-med.5.png
diff --git a/sc2/content/base/ships/flagship/sis.med.6.png b/sc2/content/base/ships/flagship/flagship-med.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.6.png
rename to sc2/content/base/ships/flagship/flagship-med.6.png
diff --git a/sc2/content/base/ships/flagship/sis.med.7.png b/sc2/content/base/ships/flagship/flagship-med.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.7.png
rename to sc2/content/base/ships/flagship/flagship-med.7.png
diff --git a/sc2/content/base/ships/flagship/sis.med.8.png b/sc2/content/base/ships/flagship/flagship-med.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.8.png
rename to sc2/content/base/ships/flagship/flagship-med.8.png
diff --git a/sc2/content/base/ships/flagship/sis.med.9.png b/sc2/content/base/ships/flagship/flagship-med.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.med.9.png
rename to sc2/content/base/ships/flagship/flagship-med.9.png
diff --git a/sc2/content/base/ships/flagship/flagship-med.ani b/sc2/content/base/ships/flagship/flagship-med.ani
new file mode 100644
index 000000000..c8e8a1c5a
--- /dev/null
+++ b/sc2/content/base/ships/flagship/flagship-med.ani
@@ -0,0 +1,16 @@
+flagship-med.0.png 0 55 6 11
+flagship-med.1.png 0 55 8 11
+flagship-med.2.png 0 55 9 9
+flagship-med.3.png 0 55 11 7
+flagship-med.4.png 0 55 13 6
+flagship-med.5.png 0 55 11 7
+flagship-med.6.png 0 55 9 9
+flagship-med.7.png 0 55 8 11
+flagship-med.8.png 0 55 6 11
+flagship-med.9.png 0 55 8 11
+flagship-med.10.png 0 55 9 9
+flagship-med.11.png 0 55 11 7
+flagship-med.12.png 0 55 13 6
+flagship-med.13.png 0 55 11 7
+flagship-med.14.png 0 55 9 9
+flagship-med.15.png 0 55 8 11
diff --git a/sc2/content/base/ships/flagship/sis.sml.0.png b/sc2/content/base/ships/flagship/flagship-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.0.png
rename to sc2/content/base/ships/flagship/flagship-sml.0.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.1.png b/sc2/content/base/ships/flagship/flagship-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.1.png
rename to sc2/content/base/ships/flagship/flagship-sml.1.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.10.png b/sc2/content/base/ships/flagship/flagship-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.10.png
rename to sc2/content/base/ships/flagship/flagship-sml.10.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.11.png b/sc2/content/base/ships/flagship/flagship-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.11.png
rename to sc2/content/base/ships/flagship/flagship-sml.11.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.12.png b/sc2/content/base/ships/flagship/flagship-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.12.png
rename to sc2/content/base/ships/flagship/flagship-sml.12.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.13.png b/sc2/content/base/ships/flagship/flagship-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.13.png
rename to sc2/content/base/ships/flagship/flagship-sml.13.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.14.png b/sc2/content/base/ships/flagship/flagship-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.14.png
rename to sc2/content/base/ships/flagship/flagship-sml.14.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.15.png b/sc2/content/base/ships/flagship/flagship-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.15.png
rename to sc2/content/base/ships/flagship/flagship-sml.15.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.2.png b/sc2/content/base/ships/flagship/flagship-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.2.png
rename to sc2/content/base/ships/flagship/flagship-sml.2.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.3.png b/sc2/content/base/ships/flagship/flagship-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.3.png
rename to sc2/content/base/ships/flagship/flagship-sml.3.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.4.png b/sc2/content/base/ships/flagship/flagship-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.4.png
rename to sc2/content/base/ships/flagship/flagship-sml.4.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.5.png b/sc2/content/base/ships/flagship/flagship-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.5.png
rename to sc2/content/base/ships/flagship/flagship-sml.5.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.6.png b/sc2/content/base/ships/flagship/flagship-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.6.png
rename to sc2/content/base/ships/flagship/flagship-sml.6.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.7.png b/sc2/content/base/ships/flagship/flagship-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.7.png
rename to sc2/content/base/ships/flagship/flagship-sml.7.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.8.png b/sc2/content/base/ships/flagship/flagship-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.8.png
rename to sc2/content/base/ships/flagship/flagship-sml.8.png
diff --git a/sc2/content/base/ships/flagship/sis.sml.9.png b/sc2/content/base/ships/flagship/flagship-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sis.sml.9.png
rename to sc2/content/base/ships/flagship/flagship-sml.9.png
diff --git a/sc2/content/base/ships/flagship/flagship-sml.ani b/sc2/content/base/ships/flagship/flagship-sml.ani
new file mode 100644
index 000000000..4e45d1bc3
--- /dev/null
+++ b/sc2/content/base/ships/flagship/flagship-sml.ani
@@ -0,0 +1,16 @@
+flagship-sml.0.png 0 55 3 6
+flagship-sml.1.png 0 55 4 6
+flagship-sml.2.png 0 55 5 5
+flagship-sml.3.png 0 55 6 3
+flagship-sml.4.png 0 55 6 3
+flagship-sml.5.png 0 55 6 4
+flagship-sml.6.png 0 55 5 5
+flagship-sml.7.png 0 55 4 6
+flagship-sml.8.png 0 55 3 6
+flagship-sml.9.png 0 55 3 6
+flagship-sml.10.png 0 55 5 5
+flagship-sml.11.png 0 55 7 4
+flagship-sml.12.png 0 55 8 3
+flagship-sml.13.png 0 55 7 3
+flagship-sml.14.png 0 55 5 5
+flagship-sml.15.png 0 55 3 6
diff --git a/sc2/content/base/ships/flagship/sisditty.mod b/sc2/content/base/ships/flagship/flagship.mod
similarity index 100%
rename from sc2/content/base/ships/flagship/sisditty.mod
rename to sc2/content/base/ships/flagship/flagship.mod
diff --git a/sc2/content/base/ships/flagship/sissound.snd b/sc2/content/base/ships/flagship/flagship.snd
similarity index 100%
rename from sc2/content/base/ships/flagship/sissound.snd
rename to sc2/content/base/ships/flagship/flagship.snd
diff --git a/sc2/content/base/ships/flagship/sishyper.0.png b/sc2/content/base/ships/flagship/hyperspace.0.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.0.png
rename to sc2/content/base/ships/flagship/hyperspace.0.png
diff --git a/sc2/content/base/ships/flagship/sishyper.1.png b/sc2/content/base/ships/flagship/hyperspace.1.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.1.png
rename to sc2/content/base/ships/flagship/hyperspace.1.png
diff --git a/sc2/content/base/ships/flagship/sishyper.10.png b/sc2/content/base/ships/flagship/hyperspace.10.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.10.png
rename to sc2/content/base/ships/flagship/hyperspace.10.png
diff --git a/sc2/content/base/ships/flagship/sishyper.11.png b/sc2/content/base/ships/flagship/hyperspace.11.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.11.png
rename to sc2/content/base/ships/flagship/hyperspace.11.png
diff --git a/sc2/content/base/ships/flagship/sishyper.12.png b/sc2/content/base/ships/flagship/hyperspace.12.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.12.png
rename to sc2/content/base/ships/flagship/hyperspace.12.png
diff --git a/sc2/content/base/ships/flagship/sishyper.13.png b/sc2/content/base/ships/flagship/hyperspace.13.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.13.png
rename to sc2/content/base/ships/flagship/hyperspace.13.png
diff --git a/sc2/content/base/ships/flagship/sishyper.14.png b/sc2/content/base/ships/flagship/hyperspace.14.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.14.png
rename to sc2/content/base/ships/flagship/hyperspace.14.png
diff --git a/sc2/content/base/ships/flagship/sishyper.15.png b/sc2/content/base/ships/flagship/hyperspace.15.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.15.png
rename to sc2/content/base/ships/flagship/hyperspace.15.png
diff --git a/sc2/content/base/ships/flagship/sishyper.16.png b/sc2/content/base/ships/flagship/hyperspace.16.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.16.png
rename to sc2/content/base/ships/flagship/hyperspace.16.png
diff --git a/sc2/content/base/ships/flagship/sishyper.17.png b/sc2/content/base/ships/flagship/hyperspace.17.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.17.png
rename to sc2/content/base/ships/flagship/hyperspace.17.png
diff --git a/sc2/content/base/ships/flagship/sishyper.18.png b/sc2/content/base/ships/flagship/hyperspace.18.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.18.png
rename to sc2/content/base/ships/flagship/hyperspace.18.png
diff --git a/sc2/content/base/ships/flagship/sishyper.19.png b/sc2/content/base/ships/flagship/hyperspace.19.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.19.png
rename to sc2/content/base/ships/flagship/hyperspace.19.png
diff --git a/sc2/content/base/ships/flagship/sishyper.2.png b/sc2/content/base/ships/flagship/hyperspace.2.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.2.png
rename to sc2/content/base/ships/flagship/hyperspace.2.png
diff --git a/sc2/content/base/ships/flagship/sishyper.20.png b/sc2/content/base/ships/flagship/hyperspace.20.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.20.png
rename to sc2/content/base/ships/flagship/hyperspace.20.png
diff --git a/sc2/content/base/ships/flagship/sishyper.21.png b/sc2/content/base/ships/flagship/hyperspace.21.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.21.png
rename to sc2/content/base/ships/flagship/hyperspace.21.png
diff --git a/sc2/content/base/ships/flagship/sishyper.22.png b/sc2/content/base/ships/flagship/hyperspace.22.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.22.png
rename to sc2/content/base/ships/flagship/hyperspace.22.png
diff --git a/sc2/content/base/ships/flagship/sishyper.23.png b/sc2/content/base/ships/flagship/hyperspace.23.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.23.png
rename to sc2/content/base/ships/flagship/hyperspace.23.png
diff --git a/sc2/content/base/ships/flagship/sishyper.24.png b/sc2/content/base/ships/flagship/hyperspace.24.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.24.png
rename to sc2/content/base/ships/flagship/hyperspace.24.png
diff --git a/sc2/content/base/ships/flagship/sishyper.25.png b/sc2/content/base/ships/flagship/hyperspace.25.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.25.png
rename to sc2/content/base/ships/flagship/hyperspace.25.png
diff --git a/sc2/content/base/ships/flagship/sishyper.26.png b/sc2/content/base/ships/flagship/hyperspace.26.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.26.png
rename to sc2/content/base/ships/flagship/hyperspace.26.png
diff --git a/sc2/content/base/ships/flagship/sishyper.27.png b/sc2/content/base/ships/flagship/hyperspace.27.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.27.png
rename to sc2/content/base/ships/flagship/hyperspace.27.png
diff --git a/sc2/content/base/ships/flagship/sishyper.28.png b/sc2/content/base/ships/flagship/hyperspace.28.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.28.png
rename to sc2/content/base/ships/flagship/hyperspace.28.png
diff --git a/sc2/content/base/ships/flagship/sishyper.29.png b/sc2/content/base/ships/flagship/hyperspace.29.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.29.png
rename to sc2/content/base/ships/flagship/hyperspace.29.png
diff --git a/sc2/content/base/ships/flagship/sishyper.3.png b/sc2/content/base/ships/flagship/hyperspace.3.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.3.png
rename to sc2/content/base/ships/flagship/hyperspace.3.png
diff --git a/sc2/content/base/ships/flagship/sishyper.30.png b/sc2/content/base/ships/flagship/hyperspace.30.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.30.png
rename to sc2/content/base/ships/flagship/hyperspace.30.png
diff --git a/sc2/content/base/ships/flagship/sishyper.31.png b/sc2/content/base/ships/flagship/hyperspace.31.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.31.png
rename to sc2/content/base/ships/flagship/hyperspace.31.png
diff --git a/sc2/content/base/ships/flagship/sishyper.32.png b/sc2/content/base/ships/flagship/hyperspace.32.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.32.png
rename to sc2/content/base/ships/flagship/hyperspace.32.png
diff --git a/sc2/content/base/ships/flagship/sishyper.33.png b/sc2/content/base/ships/flagship/hyperspace.33.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.33.png
rename to sc2/content/base/ships/flagship/hyperspace.33.png
diff --git a/sc2/content/base/ships/flagship/sishyper.4.png b/sc2/content/base/ships/flagship/hyperspace.4.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.4.png
rename to sc2/content/base/ships/flagship/hyperspace.4.png
diff --git a/sc2/content/base/ships/flagship/sishyper.5.png b/sc2/content/base/ships/flagship/hyperspace.5.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.5.png
rename to sc2/content/base/ships/flagship/hyperspace.5.png
diff --git a/sc2/content/base/ships/flagship/sishyper.6.png b/sc2/content/base/ships/flagship/hyperspace.6.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.6.png
rename to sc2/content/base/ships/flagship/hyperspace.6.png
diff --git a/sc2/content/base/ships/flagship/sishyper.7.png b/sc2/content/base/ships/flagship/hyperspace.7.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.7.png
rename to sc2/content/base/ships/flagship/hyperspace.7.png
diff --git a/sc2/content/base/ships/flagship/sishyper.8.png b/sc2/content/base/ships/flagship/hyperspace.8.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.8.png
rename to sc2/content/base/ships/flagship/hyperspace.8.png
diff --git a/sc2/content/base/ships/flagship/sishyper.9.png b/sc2/content/base/ships/flagship/hyperspace.9.png
similarity index 100%
rename from sc2/content/base/ships/flagship/sishyper.9.png
rename to sc2/content/base/ships/flagship/hyperspace.9.png
diff --git a/sc2/content/base/ships/flagship/hyperspace.ani b/sc2/content/base/ships/flagship/hyperspace.ani
new file mode 100644
index 000000000..4983be9c3
--- /dev/null
+++ b/sc2/content/base/ships/flagship/hyperspace.ani
@@ -0,0 +1,34 @@
+hyperspace.0.png 0 53 14 23
+hyperspace.1.png 0 53 16 22
+hyperspace.2.png 0 53 19 19
+hyperspace.3.png 0 53 23 15
+hyperspace.4.png 0 53 27 13
+hyperspace.5.png 0 53 23 15
+hyperspace.6.png 0 53 19 19
+hyperspace.7.png 0 53 16 22
+hyperspace.8.png 0 53 14 23
+hyperspace.9.png 0 53 16 22
+hyperspace.10.png 0 53 19 19
+hyperspace.11.png 0 53 23 15
+hyperspace.12.png 0 53 27 13
+hyperspace.13.png 0 53 23 15
+hyperspace.14.png 0 53 19 19
+hyperspace.15.png 0 53 16 22
+hyperspace.16.png 0 53 15 25
+hyperspace.17.png 0 53 17 19
+hyperspace.18.png 0 53 14 12
+hyperspace.19.png 0 53 15 8
+hyperspace.20.png 0 53 10 9
+hyperspace.21.png 0 53 7 8
+hyperspace.22.png 0 53 5 8
+hyperspace.23.png 0 53 4 6
+hyperspace.24.png 0 53 3 5
+hyperspace.25.png 0 53 4 3
+hyperspace.26.png 0 53 4 3
+hyperspace.27.png 0 53 3 1
+hyperspace.28.png 0 53 2 1
+hyperspace.29.png 0 53 1 1
+hyperspace.30.png 0 53 0 1
+hyperspace.31.png 0 53 0 0
+hyperspace.32.png 0 53 0 0
+hyperspace.33.png 0 53 0 0
diff --git a/sc2/content/base/ships/flagship/sis.big b/sc2/content/base/ships/flagship/sis.big
deleted file mode 100644
index 4ca28713e..000000000
--- a/sc2/content/base/ships/flagship/sis.big
+++ /dev/null
@@ -1,16 +0,0 @@
-sis.big.0.png 0 55 14 23
-sis.big.1.png 0 55 16 22
-sis.big.2.png 0 55 19 19
-sis.big.3.png 0 55 23 15
-sis.big.4.png 0 55 27 13
-sis.big.5.png 0 55 23 15
-sis.big.6.png 0 55 19 19
-sis.big.7.png 0 55 16 22
-sis.big.8.png 0 55 14 23
-sis.big.9.png 0 55 16 22
-sis.big.10.png 0 55 19 19
-sis.big.11.png 0 55 23 15
-sis.big.12.png 0 55 27 13
-sis.big.13.png 0 55 23 15
-sis.big.14.png 0 55 19 19
-sis.big.15.png 0 55 16 22
diff --git a/sc2/content/base/ships/flagship/sis.med b/sc2/content/base/ships/flagship/sis.med
deleted file mode 100644
index ef5bc83ae..000000000
--- a/sc2/content/base/ships/flagship/sis.med
+++ /dev/null
@@ -1,16 +0,0 @@
-sis.med.0.png 0 55 6 11
-sis.med.1.png 0 55 8 11
-sis.med.2.png 0 55 9 9
-sis.med.3.png 0 55 11 7
-sis.med.4.png 0 55 13 6
-sis.med.5.png 0 55 11 7
-sis.med.6.png 0 55 9 9
-sis.med.7.png 0 55 8 11
-sis.med.8.png 0 55 6 11
-sis.med.9.png 0 55 8 11
-sis.med.10.png 0 55 9 9
-sis.med.11.png 0 55 11 7
-sis.med.12.png 0 55 13 6
-sis.med.13.png 0 55 11 7
-sis.med.14.png 0 55 9 9
-sis.med.15.png 0 55 8 11
diff --git a/sc2/content/base/ships/flagship/sis.sml b/sc2/content/base/ships/flagship/sis.sml
deleted file mode 100644
index f6396f4d9..000000000
--- a/sc2/content/base/ships/flagship/sis.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-sis.sml.0.png 0 55 3 6
-sis.sml.1.png 0 55 4 6
-sis.sml.2.png 0 55 5 5
-sis.sml.3.png 0 55 6 3
-sis.sml.4.png 0 55 6 3
-sis.sml.5.png 0 55 6 4
-sis.sml.6.png 0 55 5 5
-sis.sml.7.png 0 55 4 6
-sis.sml.8.png 0 55 3 6
-sis.sml.9.png 0 55 3 6
-sis.sml.10.png 0 55 5 5
-sis.sml.11.png 0 55 7 4
-sis.sml.12.png 0 55 8 3
-sis.sml.13.png 0 55 7 3
-sis.sml.14.png 0 55 5 5
-sis.sml.15.png 0 55 3 6
diff --git a/sc2/content/base/ships/flagship/siscap.ani b/sc2/content/base/ships/flagship/siscap.ani
deleted file mode 100644
index 0cac0e1d5..000000000
--- a/sc2/content/base/ships/flagship/siscap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-siscap.0.png -1 1 1 1
-siscap.1.png -1 1 -1 -24
-siscap.2.png -1 1 -1 -24
-siscap.3.png -1 1 -1 -24
-siscap.4.png -1 1 -1 -24
-siscap.5.png -1 1 -1 -24
-siscap.6.png -1 1 -1 -8
-siscap.7.png -1 1 -1 -8
-siscap.8.png -1 1 -1 -8
-siscap.9.png -1 1 -20 -11
-siscap.10.png -1 1 -20 -11
-siscap.11.png -1 1 -20 -11
-siscap.12.png -1 1 -20 -18
-siscap.13.png -1 1 -20 -18
-siscap.14.png -1 1 -20 -18
diff --git a/sc2/content/base/ships/flagship/sishyper.ani b/sc2/content/base/ships/flagship/sishyper.ani
deleted file mode 100644
index 525b278b1..000000000
--- a/sc2/content/base/ships/flagship/sishyper.ani
+++ /dev/null
@@ -1,34 +0,0 @@
-sishyper.0.png 0 53 14 23
-sishyper.1.png 0 53 16 22
-sishyper.2.png 0 53 19 19
-sishyper.3.png 0 53 23 15
-sishyper.4.png 0 53 27 13
-sishyper.5.png 0 53 23 15
-sishyper.6.png 0 53 19 19
-sishyper.7.png 0 53 16 22
-sishyper.8.png 0 53 14 23
-sishyper.9.png 0 53 16 22
-sishyper.10.png 0 53 19 19
-sishyper.11.png 0 53 23 15
-sishyper.12.png 0 53 27 13
-sishyper.13.png 0 53 23 15
-sishyper.14.png 0 53 19 19
-sishyper.15.png 0 53 16 22
-sishyper.16.png 0 53 15 25
-sishyper.17.png 0 53 17 19
-sishyper.18.png 0 53 14 12
-sishyper.19.png 0 53 15 8
-sishyper.20.png 0 53 10 9
-sishyper.21.png 0 53 7 8
-sishyper.22.png 0 53 5 8
-sishyper.23.png 0 53 4 6
-sishyper.24.png 0 53 3 5
-sishyper.25.png 0 53 4 3
-sishyper.26.png 0 53 4 3
-sishyper.27.png 0 53 3 1
-sishyper.28.png 0 53 2 1
-sishyper.29.png 0 53 1 1
-sishyper.30.png 0 53 0 1
-sishyper.31.png 0 53 0 0
-sishyper.32.png 0 53 0 0
-sishyper.33.png 0 53 0 0
diff --git a/sc2/content/base/ships/flagship/sisicons.ani b/sc2/content/base/ships/flagship/sisicons.ani
deleted file mode 100644
index 79c74946c..000000000
--- a/sc2/content/base/ships/flagship/sisicons.ani
+++ /dev/null
@@ -1 +0,0 @@
-sisicons.0.png 0 55 18 20
diff --git a/sc2/content/base/ships/human/human.big.0.png b/sc2/content/base/ships/human/cruiser-big.0.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.0.png
rename to sc2/content/base/ships/human/cruiser-big.0.png
diff --git a/sc2/content/base/ships/human/human.big.1.png b/sc2/content/base/ships/human/cruiser-big.1.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.1.png
rename to sc2/content/base/ships/human/cruiser-big.1.png
diff --git a/sc2/content/base/ships/human/human.big.10.png b/sc2/content/base/ships/human/cruiser-big.10.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.10.png
rename to sc2/content/base/ships/human/cruiser-big.10.png
diff --git a/sc2/content/base/ships/human/human.big.11.png b/sc2/content/base/ships/human/cruiser-big.11.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.11.png
rename to sc2/content/base/ships/human/cruiser-big.11.png
diff --git a/sc2/content/base/ships/human/human.big.12.png b/sc2/content/base/ships/human/cruiser-big.12.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.12.png
rename to sc2/content/base/ships/human/cruiser-big.12.png
diff --git a/sc2/content/base/ships/human/human.big.13.png b/sc2/content/base/ships/human/cruiser-big.13.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.13.png
rename to sc2/content/base/ships/human/cruiser-big.13.png
diff --git a/sc2/content/base/ships/human/human.big.14.png b/sc2/content/base/ships/human/cruiser-big.14.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.14.png
rename to sc2/content/base/ships/human/cruiser-big.14.png
diff --git a/sc2/content/base/ships/human/human.big.15.png b/sc2/content/base/ships/human/cruiser-big.15.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.15.png
rename to sc2/content/base/ships/human/cruiser-big.15.png
diff --git a/sc2/content/base/ships/human/human.big.2.png b/sc2/content/base/ships/human/cruiser-big.2.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.2.png
rename to sc2/content/base/ships/human/cruiser-big.2.png
diff --git a/sc2/content/base/ships/human/human.big.3.png b/sc2/content/base/ships/human/cruiser-big.3.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.3.png
rename to sc2/content/base/ships/human/cruiser-big.3.png
diff --git a/sc2/content/base/ships/human/human.big.4.png b/sc2/content/base/ships/human/cruiser-big.4.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.4.png
rename to sc2/content/base/ships/human/cruiser-big.4.png
diff --git a/sc2/content/base/ships/human/human.big.5.png b/sc2/content/base/ships/human/cruiser-big.5.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.5.png
rename to sc2/content/base/ships/human/cruiser-big.5.png
diff --git a/sc2/content/base/ships/human/human.big.6.png b/sc2/content/base/ships/human/cruiser-big.6.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.6.png
rename to sc2/content/base/ships/human/cruiser-big.6.png
diff --git a/sc2/content/base/ships/human/human.big.7.png b/sc2/content/base/ships/human/cruiser-big.7.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.7.png
rename to sc2/content/base/ships/human/cruiser-big.7.png
diff --git a/sc2/content/base/ships/human/human.big.8.png b/sc2/content/base/ships/human/cruiser-big.8.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.8.png
rename to sc2/content/base/ships/human/cruiser-big.8.png
diff --git a/sc2/content/base/ships/human/human.big.9.png b/sc2/content/base/ships/human/cruiser-big.9.png
similarity index 100%
rename from sc2/content/base/ships/human/human.big.9.png
rename to sc2/content/base/ships/human/cruiser-big.9.png
diff --git a/sc2/content/base/ships/human/cruiser-big.ani b/sc2/content/base/ships/human/cruiser-big.ani
new file mode 100644
index 000000000..27f792bac
--- /dev/null
+++ b/sc2/content/base/ships/human/cruiser-big.ani
@@ -0,0 +1,16 @@
+cruiser-big.0.png 0 1 7 19
+cruiser-big.1.png 0 1 12 19
+cruiser-big.2.png 0 1 16 15
+cruiser-big.3.png 0 1 21 12
+cruiser-big.4.png 0 1 20 6
+cruiser-big.5.png 0 1 20 13
+cruiser-big.6.png 0 1 16 15
+cruiser-big.7.png 0 1 13 17
+cruiser-big.8.png 0 1 7 17
+cruiser-big.9.png 0 1 13 17
+cruiser-big.10.png 0 1 17 15
+cruiser-big.11.png 0 1 20 13
+cruiser-big.12.png 0 1 23 6
+cruiser-big.13.png 0 1 19 11
+cruiser-big.14.png 0 1 17 16
+cruiser-big.15.png 0 1 13 19
diff --git a/sc2/content/base/ships/human/humcap.0.png b/sc2/content/base/ships/human/cruiser-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.0.png
rename to sc2/content/base/ships/human/cruiser-cap.0.png
diff --git a/sc2/content/base/ships/human/humcap.1.png b/sc2/content/base/ships/human/cruiser-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.1.png
rename to sc2/content/base/ships/human/cruiser-cap.1.png
diff --git a/sc2/content/base/ships/human/humcap.10.png b/sc2/content/base/ships/human/cruiser-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.10.png
rename to sc2/content/base/ships/human/cruiser-cap.10.png
diff --git a/sc2/content/base/ships/human/humcap.11.png b/sc2/content/base/ships/human/cruiser-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.11.png
rename to sc2/content/base/ships/human/cruiser-cap.11.png
diff --git a/sc2/content/base/ships/human/humcap.12.png b/sc2/content/base/ships/human/cruiser-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.12.png
rename to sc2/content/base/ships/human/cruiser-cap.12.png
diff --git a/sc2/content/base/ships/human/humcap.13.png b/sc2/content/base/ships/human/cruiser-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.13.png
rename to sc2/content/base/ships/human/cruiser-cap.13.png
diff --git a/sc2/content/base/ships/human/humcap.14.png b/sc2/content/base/ships/human/cruiser-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.14.png
rename to sc2/content/base/ships/human/cruiser-cap.14.png
diff --git a/sc2/content/base/ships/human/humcap.2.png b/sc2/content/base/ships/human/cruiser-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.2.png
rename to sc2/content/base/ships/human/cruiser-cap.2.png
diff --git a/sc2/content/base/ships/human/humcap.3.png b/sc2/content/base/ships/human/cruiser-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.3.png
rename to sc2/content/base/ships/human/cruiser-cap.3.png
diff --git a/sc2/content/base/ships/human/humcap.4.png b/sc2/content/base/ships/human/cruiser-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.4.png
rename to sc2/content/base/ships/human/cruiser-cap.4.png
diff --git a/sc2/content/base/ships/human/humcap.5.png b/sc2/content/base/ships/human/cruiser-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.5.png
rename to sc2/content/base/ships/human/cruiser-cap.5.png
diff --git a/sc2/content/base/ships/human/humcap.6.png b/sc2/content/base/ships/human/cruiser-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.6.png
rename to sc2/content/base/ships/human/cruiser-cap.6.png
diff --git a/sc2/content/base/ships/human/humcap.7.png b/sc2/content/base/ships/human/cruiser-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.7.png
rename to sc2/content/base/ships/human/cruiser-cap.7.png
diff --git a/sc2/content/base/ships/human/humcap.8.png b/sc2/content/base/ships/human/cruiser-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.8.png
rename to sc2/content/base/ships/human/cruiser-cap.8.png
diff --git a/sc2/content/base/ships/human/humcap.9.png b/sc2/content/base/ships/human/cruiser-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/human/humcap.9.png
rename to sc2/content/base/ships/human/cruiser-cap.9.png
diff --git a/sc2/content/base/ships/human/cruiser-cap.ani b/sc2/content/base/ships/human/cruiser-cap.ani
new file mode 100644
index 000000000..9fd8265c5
--- /dev/null
+++ b/sc2/content/base/ships/human/cruiser-cap.ani
@@ -0,0 +1,15 @@
+cruiser-cap.0.png -1 1 0 0
+cruiser-cap.1.png 1 1 -33 -9
+cruiser-cap.2.png 1 1 -33 -9
+cruiser-cap.3.png 1 1 -33 -9
+cruiser-cap.4.png 1 1 -33 -9
+cruiser-cap.5.png 1 1 -33 -9
+cruiser-cap.6.png -1 1 -44 -7
+cruiser-cap.7.png -1 1 -44 -7
+cruiser-cap.8.png -1 1 -44 -7
+cruiser-cap.9.png -1 1 0 -5
+cruiser-cap.10.png -1 1 0 -5
+cruiser-cap.11.png -1 1 0 -5
+cruiser-cap.12.png 1 1 -19 -2
+cruiser-cap.13.png 1 1 -19 -2
+cruiser-cap.14.png 1 1 -19 -2
diff --git a/sc2/content/base/ships/human/humicons.0.png b/sc2/content/base/ships/human/cruiser-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/human/humicons.0.png
rename to sc2/content/base/ships/human/cruiser-icons.0.png
diff --git a/sc2/content/base/ships/human/humicons.1.png b/sc2/content/base/ships/human/cruiser-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/human/humicons.1.png
rename to sc2/content/base/ships/human/cruiser-icons.1.png
diff --git a/sc2/content/base/ships/human/cruiser-icons.ani b/sc2/content/base/ships/human/cruiser-icons.ani
new file mode 100644
index 000000000..4bc4b41ef
--- /dev/null
+++ b/sc2/content/base/ships/human/cruiser-icons.ani
@@ -0,0 +1,2 @@
+cruiser-icons.0.png 0 1 0 0
+cruiser-icons.1.png 0 1 11 18
diff --git a/sc2/content/base/ships/human/human.med.0.png b/sc2/content/base/ships/human/cruiser-med.0.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.0.png
rename to sc2/content/base/ships/human/cruiser-med.0.png
diff --git a/sc2/content/base/ships/human/human.med.1.png b/sc2/content/base/ships/human/cruiser-med.1.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.1.png
rename to sc2/content/base/ships/human/cruiser-med.1.png
diff --git a/sc2/content/base/ships/human/human.med.10.png b/sc2/content/base/ships/human/cruiser-med.10.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.10.png
rename to sc2/content/base/ships/human/cruiser-med.10.png
diff --git a/sc2/content/base/ships/human/human.med.11.png b/sc2/content/base/ships/human/cruiser-med.11.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.11.png
rename to sc2/content/base/ships/human/cruiser-med.11.png
diff --git a/sc2/content/base/ships/human/human.med.12.png b/sc2/content/base/ships/human/cruiser-med.12.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.12.png
rename to sc2/content/base/ships/human/cruiser-med.12.png
diff --git a/sc2/content/base/ships/human/human.med.13.png b/sc2/content/base/ships/human/cruiser-med.13.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.13.png
rename to sc2/content/base/ships/human/cruiser-med.13.png
diff --git a/sc2/content/base/ships/human/human.med.14.png b/sc2/content/base/ships/human/cruiser-med.14.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.14.png
rename to sc2/content/base/ships/human/cruiser-med.14.png
diff --git a/sc2/content/base/ships/human/human.med.15.png b/sc2/content/base/ships/human/cruiser-med.15.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.15.png
rename to sc2/content/base/ships/human/cruiser-med.15.png
diff --git a/sc2/content/base/ships/human/human.med.2.png b/sc2/content/base/ships/human/cruiser-med.2.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.2.png
rename to sc2/content/base/ships/human/cruiser-med.2.png
diff --git a/sc2/content/base/ships/human/human.med.3.png b/sc2/content/base/ships/human/cruiser-med.3.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.3.png
rename to sc2/content/base/ships/human/cruiser-med.3.png
diff --git a/sc2/content/base/ships/human/human.med.4.png b/sc2/content/base/ships/human/cruiser-med.4.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.4.png
rename to sc2/content/base/ships/human/cruiser-med.4.png
diff --git a/sc2/content/base/ships/human/human.med.5.png b/sc2/content/base/ships/human/cruiser-med.5.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.5.png
rename to sc2/content/base/ships/human/cruiser-med.5.png
diff --git a/sc2/content/base/ships/human/human.med.6.png b/sc2/content/base/ships/human/cruiser-med.6.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.6.png
rename to sc2/content/base/ships/human/cruiser-med.6.png
diff --git a/sc2/content/base/ships/human/human.med.7.png b/sc2/content/base/ships/human/cruiser-med.7.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.7.png
rename to sc2/content/base/ships/human/cruiser-med.7.png
diff --git a/sc2/content/base/ships/human/human.med.8.png b/sc2/content/base/ships/human/cruiser-med.8.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.8.png
rename to sc2/content/base/ships/human/cruiser-med.8.png
diff --git a/sc2/content/base/ships/human/human.med.9.png b/sc2/content/base/ships/human/cruiser-med.9.png
similarity index 100%
rename from sc2/content/base/ships/human/human.med.9.png
rename to sc2/content/base/ships/human/cruiser-med.9.png
diff --git a/sc2/content/base/ships/human/cruiser-med.ani b/sc2/content/base/ships/human/cruiser-med.ani
new file mode 100644
index 000000000..b209c2331
--- /dev/null
+++ b/sc2/content/base/ships/human/cruiser-med.ani
@@ -0,0 +1,16 @@
+cruiser-med.0.png 0 1 2 9
+cruiser-med.1.png 0 1 6 8
+cruiser-med.2.png 0 1 9 7
+cruiser-med.3.png 0 1 12 5
+cruiser-med.4.png 0 1 10 2
+cruiser-med.5.png 0 1 12 7
+cruiser-med.6.png 0 1 9 9
+cruiser-med.7.png 0 1 7 10
+cruiser-med.8.png 0 1 3 9
+cruiser-med.9.png 0 1 6 10
+cruiser-med.10.png 0 1 7 9
+cruiser-med.11.png 0 1 9 7
+cruiser-med.12.png 0 1 10 3
+cruiser-med.13.png 0 1 8 5
+cruiser-med.14.png 0 1 7 7
+cruiser-med.15.png 0 1 6 8
diff --git a/sc2/content/base/ships/human/hummicon.0.png b/sc2/content/base/ships/human/cruiser-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/human/hummicon.0.png
rename to sc2/content/base/ships/human/cruiser-meleeicons.0.png
diff --git a/sc2/content/base/ships/human/hummicon.1.png b/sc2/content/base/ships/human/cruiser-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/human/hummicon.1.png
rename to sc2/content/base/ships/human/cruiser-meleeicons.1.png
diff --git a/sc2/content/base/ships/human/cruiser-meleeicons.ani b/sc2/content/base/ships/human/cruiser-meleeicons.ani
new file mode 100644
index 000000000..dec82b567
--- /dev/null
+++ b/sc2/content/base/ships/human/cruiser-meleeicons.ani
@@ -0,0 +1,2 @@
+cruiser-meleeicons.0.png 0 1 7 16
+cruiser-meleeicons.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/human/human.sml.0.png b/sc2/content/base/ships/human/cruiser-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.0.png
rename to sc2/content/base/ships/human/cruiser-sml.0.png
diff --git a/sc2/content/base/ships/human/human.sml.1.png b/sc2/content/base/ships/human/cruiser-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.1.png
rename to sc2/content/base/ships/human/cruiser-sml.1.png
diff --git a/sc2/content/base/ships/human/human.sml.10.png b/sc2/content/base/ships/human/cruiser-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.10.png
rename to sc2/content/base/ships/human/cruiser-sml.10.png
diff --git a/sc2/content/base/ships/human/human.sml.11.png b/sc2/content/base/ships/human/cruiser-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.11.png
rename to sc2/content/base/ships/human/cruiser-sml.11.png
diff --git a/sc2/content/base/ships/human/human.sml.12.png b/sc2/content/base/ships/human/cruiser-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.12.png
rename to sc2/content/base/ships/human/cruiser-sml.12.png
diff --git a/sc2/content/base/ships/human/human.sml.13.png b/sc2/content/base/ships/human/cruiser-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.13.png
rename to sc2/content/base/ships/human/cruiser-sml.13.png
diff --git a/sc2/content/base/ships/human/human.sml.14.png b/sc2/content/base/ships/human/cruiser-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.14.png
rename to sc2/content/base/ships/human/cruiser-sml.14.png
diff --git a/sc2/content/base/ships/human/human.sml.15.png b/sc2/content/base/ships/human/cruiser-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.15.png
rename to sc2/content/base/ships/human/cruiser-sml.15.png
diff --git a/sc2/content/base/ships/human/human.sml.2.png b/sc2/content/base/ships/human/cruiser-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.2.png
rename to sc2/content/base/ships/human/cruiser-sml.2.png
diff --git a/sc2/content/base/ships/human/human.sml.3.png b/sc2/content/base/ships/human/cruiser-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.3.png
rename to sc2/content/base/ships/human/cruiser-sml.3.png
diff --git a/sc2/content/base/ships/human/human.sml.4.png b/sc2/content/base/ships/human/cruiser-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.4.png
rename to sc2/content/base/ships/human/cruiser-sml.4.png
diff --git a/sc2/content/base/ships/human/human.sml.5.png b/sc2/content/base/ships/human/cruiser-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.5.png
rename to sc2/content/base/ships/human/cruiser-sml.5.png
diff --git a/sc2/content/base/ships/human/human.sml.6.png b/sc2/content/base/ships/human/cruiser-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.6.png
rename to sc2/content/base/ships/human/cruiser-sml.6.png
diff --git a/sc2/content/base/ships/human/human.sml.7.png b/sc2/content/base/ships/human/cruiser-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.7.png
rename to sc2/content/base/ships/human/cruiser-sml.7.png
diff --git a/sc2/content/base/ships/human/human.sml.8.png b/sc2/content/base/ships/human/cruiser-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.8.png
rename to sc2/content/base/ships/human/cruiser-sml.8.png
diff --git a/sc2/content/base/ships/human/human.sml.9.png b/sc2/content/base/ships/human/cruiser-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/human/human.sml.9.png
rename to sc2/content/base/ships/human/cruiser-sml.9.png
diff --git a/sc2/content/base/ships/human/cruiser-sml.ani b/sc2/content/base/ships/human/cruiser-sml.ani
new file mode 100644
index 000000000..e32b37dd8
--- /dev/null
+++ b/sc2/content/base/ships/human/cruiser-sml.ani
@@ -0,0 +1,16 @@
+cruiser-sml.0.png 0 1 1 4
+cruiser-sml.1.png 0 1 3 4
+cruiser-sml.2.png 0 1 4 4
+cruiser-sml.3.png 0 1 5 2
+cruiser-sml.4.png 0 1 6 1
+cruiser-sml.5.png 0 1 5 3
+cruiser-sml.6.png 0 1 4 4
+cruiser-sml.7.png 0 1 3 5
+cruiser-sml.8.png 0 1 1 5
+cruiser-sml.9.png 0 1 2 5
+cruiser-sml.10.png 0 1 4 4
+cruiser-sml.11.png 0 1 4 3
+cruiser-sml.12.png 0 1 5 1
+cruiser-sml.13.png 0 1 4 2
+cruiser-sml.14.png 0 1 4 4
+cruiser-sml.15.png 0 1 2 4
diff --git a/sc2/content/base/ships/human/humditty.mod b/sc2/content/base/ships/human/cruiser.mod
similarity index 100%
rename from sc2/content/base/ships/human/humditty.mod
rename to sc2/content/base/ships/human/cruiser.mod
diff --git a/sc2/content/base/ships/human/humsound.snd b/sc2/content/base/ships/human/cruiser.snd
similarity index 100%
rename from sc2/content/base/ships/human/humsound.snd
rename to sc2/content/base/ships/human/cruiser.snd
diff --git a/sc2/content/base/ships/human/humtext.txt b/sc2/content/base/ships/human/cruiser.txt
similarity index 100%
rename from sc2/content/base/ships/human/humtext.txt
rename to sc2/content/base/ships/human/cruiser.txt
diff --git a/sc2/content/base/ships/human/human.big b/sc2/content/base/ships/human/human.big
deleted file mode 100644
index 1ae045af8..000000000
--- a/sc2/content/base/ships/human/human.big
+++ /dev/null
@@ -1,16 +0,0 @@
-human.big.0.png 0 1 7 19
-human.big.1.png 0 1 12 19
-human.big.2.png 0 1 16 15
-human.big.3.png 0 1 21 12
-human.big.4.png 0 1 20 6
-human.big.5.png 0 1 20 13
-human.big.6.png 0 1 16 15
-human.big.7.png 0 1 13 17
-human.big.8.png 0 1 7 17
-human.big.9.png 0 1 13 17
-human.big.10.png 0 1 17 15
-human.big.11.png 0 1 20 13
-human.big.12.png 0 1 23 6
-human.big.13.png 0 1 19 11
-human.big.14.png 0 1 17 16
-human.big.15.png 0 1 13 19
diff --git a/sc2/content/base/ships/human/human.med b/sc2/content/base/ships/human/human.med
deleted file mode 100644
index 7838eac1c..000000000
--- a/sc2/content/base/ships/human/human.med
+++ /dev/null
@@ -1,16 +0,0 @@
-human.med.0.png 0 1 2 9
-human.med.1.png 0 1 6 8
-human.med.2.png 0 1 9 7
-human.med.3.png 0 1 12 5
-human.med.4.png 0 1 10 2
-human.med.5.png 0 1 12 7
-human.med.6.png 0 1 9 9
-human.med.7.png 0 1 7 10
-human.med.8.png 0 1 3 9
-human.med.9.png 0 1 6 10
-human.med.10.png 0 1 7 9
-human.med.11.png 0 1 9 7
-human.med.12.png 0 1 10 3
-human.med.13.png 0 1 8 5
-human.med.14.png 0 1 7 7
-human.med.15.png 0 1 6 8
diff --git a/sc2/content/base/ships/human/human.sml b/sc2/content/base/ships/human/human.sml
deleted file mode 100644
index a72e7a719..000000000
--- a/sc2/content/base/ships/human/human.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-human.sml.0.png 0 1 1 4
-human.sml.1.png 0 1 3 4
-human.sml.2.png 0 1 4 4
-human.sml.3.png 0 1 5 2
-human.sml.4.png 0 1 6 1
-human.sml.5.png 0 1 5 3
-human.sml.6.png 0 1 4 4
-human.sml.7.png 0 1 3 5
-human.sml.8.png 0 1 1 5
-human.sml.9.png 0 1 2 5
-human.sml.10.png 0 1 4 4
-human.sml.11.png 0 1 4 3
-human.sml.12.png 0 1 5 1
-human.sml.13.png 0 1 4 2
-human.sml.14.png 0 1 4 4
-human.sml.15.png 0 1 2 4
diff --git a/sc2/content/base/ships/human/humcap.ani b/sc2/content/base/ships/human/humcap.ani
deleted file mode 100644
index c76b4415a..000000000
--- a/sc2/content/base/ships/human/humcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-humcap.0.png -1 1 0 0
-humcap.1.png 1 1 -33 -9
-humcap.2.png 1 1 -33 -9
-humcap.3.png 1 1 -33 -9
-humcap.4.png 1 1 -33 -9
-humcap.5.png 1 1 -33 -9
-humcap.6.png -1 1 -44 -7
-humcap.7.png -1 1 -44 -7
-humcap.8.png -1 1 -44 -7
-humcap.9.png -1 1 0 -5
-humcap.10.png -1 1 0 -5
-humcap.11.png -1 1 0 -5
-humcap.12.png 1 1 -19 -2
-humcap.13.png 1 1 -19 -2
-humcap.14.png 1 1 -19 -2
diff --git a/sc2/content/base/ships/human/humicons.ani b/sc2/content/base/ships/human/humicons.ani
deleted file mode 100644
index f03d6ff2d..000000000
--- a/sc2/content/base/ships/human/humicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-humicons.0.png 0 1 0 0
-humicons.1.png 0 1 11 18
diff --git a/sc2/content/base/ships/human/hummicon.ani b/sc2/content/base/ships/human/hummicon.ani
deleted file mode 100644
index 4708b6156..000000000
--- a/sc2/content/base/ships/human/hummicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-hummicon.0.png 0 1 7 16
-hummicon.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.0.png b/sc2/content/base/ships/ilwrath/avenger-big.0.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.0.png
rename to sc2/content/base/ships/ilwrath/avenger-big.0.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.1.png b/sc2/content/base/ships/ilwrath/avenger-big.1.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.1.png
rename to sc2/content/base/ships/ilwrath/avenger-big.1.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.10.png b/sc2/content/base/ships/ilwrath/avenger-big.10.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.10.png
rename to sc2/content/base/ships/ilwrath/avenger-big.10.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.11.png b/sc2/content/base/ships/ilwrath/avenger-big.11.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.11.png
rename to sc2/content/base/ships/ilwrath/avenger-big.11.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.12.png b/sc2/content/base/ships/ilwrath/avenger-big.12.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.12.png
rename to sc2/content/base/ships/ilwrath/avenger-big.12.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.13.png b/sc2/content/base/ships/ilwrath/avenger-big.13.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.13.png
rename to sc2/content/base/ships/ilwrath/avenger-big.13.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.14.png b/sc2/content/base/ships/ilwrath/avenger-big.14.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.14.png
rename to sc2/content/base/ships/ilwrath/avenger-big.14.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.15.png b/sc2/content/base/ships/ilwrath/avenger-big.15.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.15.png
rename to sc2/content/base/ships/ilwrath/avenger-big.15.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.2.png b/sc2/content/base/ships/ilwrath/avenger-big.2.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.2.png
rename to sc2/content/base/ships/ilwrath/avenger-big.2.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.3.png b/sc2/content/base/ships/ilwrath/avenger-big.3.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.3.png
rename to sc2/content/base/ships/ilwrath/avenger-big.3.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.4.png b/sc2/content/base/ships/ilwrath/avenger-big.4.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.4.png
rename to sc2/content/base/ships/ilwrath/avenger-big.4.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.5.png b/sc2/content/base/ships/ilwrath/avenger-big.5.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.5.png
rename to sc2/content/base/ships/ilwrath/avenger-big.5.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.6.png b/sc2/content/base/ships/ilwrath/avenger-big.6.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.6.png
rename to sc2/content/base/ships/ilwrath/avenger-big.6.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.7.png b/sc2/content/base/ships/ilwrath/avenger-big.7.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.7.png
rename to sc2/content/base/ships/ilwrath/avenger-big.7.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.8.png b/sc2/content/base/ships/ilwrath/avenger-big.8.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.8.png
rename to sc2/content/base/ships/ilwrath/avenger-big.8.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big.9.png b/sc2/content/base/ships/ilwrath/avenger-big.9.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.big.9.png
rename to sc2/content/base/ships/ilwrath/avenger-big.9.png
diff --git a/sc2/content/base/ships/ilwrath/avenger-big.ani b/sc2/content/base/ships/ilwrath/avenger-big.ani
new file mode 100644
index 000000000..e0c492c02
--- /dev/null
+++ b/sc2/content/base/ships/ilwrath/avenger-big.ani
@@ -0,0 +1,16 @@
+avenger-big.0.png 0 1 18 22
+avenger-big.1.png 0 1 14 20
+avenger-big.2.png 0 1 11 16
+avenger-big.3.png 0 1 11 17
+avenger-big.4.png 0 1 8 17
+avenger-big.5.png 0 1 11 12
+avenger-big.6.png 0 1 11 11
+avenger-big.7.png 0 1 14 9
+avenger-big.8.png 0 1 18 8
+avenger-big.9.png 0 1 19 9
+avenger-big.10.png 0 1 17 11
+avenger-big.11.png 0 1 20 12
+avenger-big.12.png 0 1 24 17
+avenger-big.13.png 0 1 20 17
+avenger-big.14.png 0 1 17 16
+avenger-big.15.png 0 1 19 20
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.0.png b/sc2/content/base/ships/ilwrath/avenger-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.0.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.0.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.1.png b/sc2/content/base/ships/ilwrath/avenger-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.1.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.1.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.10.png b/sc2/content/base/ships/ilwrath/avenger-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.10.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.10.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.11.png b/sc2/content/base/ships/ilwrath/avenger-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.11.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.11.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.12.png b/sc2/content/base/ships/ilwrath/avenger-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.12.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.12.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.13.png b/sc2/content/base/ships/ilwrath/avenger-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.13.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.13.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.14.png b/sc2/content/base/ships/ilwrath/avenger-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.14.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.14.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.2.png b/sc2/content/base/ships/ilwrath/avenger-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.2.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.2.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.3.png b/sc2/content/base/ships/ilwrath/avenger-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.3.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.3.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.4.png b/sc2/content/base/ships/ilwrath/avenger-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.4.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.4.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.5.png b/sc2/content/base/ships/ilwrath/avenger-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.5.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.5.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.6.png b/sc2/content/base/ships/ilwrath/avenger-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.6.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.6.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.7.png b/sc2/content/base/ships/ilwrath/avenger-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.7.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.7.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.8.png b/sc2/content/base/ships/ilwrath/avenger-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.8.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.8.png
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.9.png b/sc2/content/base/ships/ilwrath/avenger-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwcap.9.png
rename to sc2/content/base/ships/ilwrath/avenger-cap.9.png
diff --git a/sc2/content/base/ships/ilwrath/avenger-cap.ani b/sc2/content/base/ships/ilwrath/avenger-cap.ani
new file mode 100644
index 000000000..be5d0e56c
--- /dev/null
+++ b/sc2/content/base/ships/ilwrath/avenger-cap.ani
@@ -0,0 +1,15 @@
+avenger-cap.0.png 7 1 0 0
+avenger-cap.1.png -1 1 0 -17
+avenger-cap.2.png -1 1 0 -17
+avenger-cap.3.png -1 1 0 -17
+avenger-cap.4.png -1 1 0 -17
+avenger-cap.5.png -1 1 0 -17
+avenger-cap.6.png -1 1 -4 0
+avenger-cap.7.png -1 1 -4 0
+avenger-cap.8.png -1 1 -4 0
+avenger-cap.9.png -1 1 -21 -17
+avenger-cap.10.png -1 1 -21 -17
+avenger-cap.11.png -1 1 -21 -17
+avenger-cap.12.png -1 1 -31 -17
+avenger-cap.13.png -1 1 -31 -17
+avenger-cap.14.png -1 1 -31 -17
diff --git a/sc2/content/base/ships/ilwrath/ilwicons.0.png b/sc2/content/base/ships/ilwrath/avenger-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwicons.0.png
rename to sc2/content/base/ships/ilwrath/avenger-icons.0.png
diff --git a/sc2/content/base/ships/ilwrath/ilwicons.1.png b/sc2/content/base/ships/ilwrath/avenger-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwicons.1.png
rename to sc2/content/base/ships/ilwrath/avenger-icons.1.png
diff --git a/sc2/content/base/ships/ilwrath/avenger-icons.ani b/sc2/content/base/ships/ilwrath/avenger-icons.ani
new file mode 100644
index 000000000..ef7b539fa
--- /dev/null
+++ b/sc2/content/base/ships/ilwrath/avenger-icons.ani
@@ -0,0 +1,2 @@
+avenger-icons.0.png 0 1 0 0
+avenger-icons.1.png 0 1 19 15
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.0.png b/sc2/content/base/ships/ilwrath/avenger-med.0.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.0.png
rename to sc2/content/base/ships/ilwrath/avenger-med.0.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.1.png b/sc2/content/base/ships/ilwrath/avenger-med.1.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.1.png
rename to sc2/content/base/ships/ilwrath/avenger-med.1.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.10.png b/sc2/content/base/ships/ilwrath/avenger-med.10.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.10.png
rename to sc2/content/base/ships/ilwrath/avenger-med.10.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.11.png b/sc2/content/base/ships/ilwrath/avenger-med.11.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.11.png
rename to sc2/content/base/ships/ilwrath/avenger-med.11.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.12.png b/sc2/content/base/ships/ilwrath/avenger-med.12.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.12.png
rename to sc2/content/base/ships/ilwrath/avenger-med.12.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.13.png b/sc2/content/base/ships/ilwrath/avenger-med.13.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.13.png
rename to sc2/content/base/ships/ilwrath/avenger-med.13.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.14.png b/sc2/content/base/ships/ilwrath/avenger-med.14.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.14.png
rename to sc2/content/base/ships/ilwrath/avenger-med.14.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.15.png b/sc2/content/base/ships/ilwrath/avenger-med.15.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.15.png
rename to sc2/content/base/ships/ilwrath/avenger-med.15.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.2.png b/sc2/content/base/ships/ilwrath/avenger-med.2.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.2.png
rename to sc2/content/base/ships/ilwrath/avenger-med.2.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.3.png b/sc2/content/base/ships/ilwrath/avenger-med.3.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.3.png
rename to sc2/content/base/ships/ilwrath/avenger-med.3.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.4.png b/sc2/content/base/ships/ilwrath/avenger-med.4.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.4.png
rename to sc2/content/base/ships/ilwrath/avenger-med.4.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.5.png b/sc2/content/base/ships/ilwrath/avenger-med.5.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.5.png
rename to sc2/content/base/ships/ilwrath/avenger-med.5.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.6.png b/sc2/content/base/ships/ilwrath/avenger-med.6.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.6.png
rename to sc2/content/base/ships/ilwrath/avenger-med.6.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.7.png b/sc2/content/base/ships/ilwrath/avenger-med.7.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.7.png
rename to sc2/content/base/ships/ilwrath/avenger-med.7.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.8.png b/sc2/content/base/ships/ilwrath/avenger-med.8.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.8.png
rename to sc2/content/base/ships/ilwrath/avenger-med.8.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med.9.png b/sc2/content/base/ships/ilwrath/avenger-med.9.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.med.9.png
rename to sc2/content/base/ships/ilwrath/avenger-med.9.png
diff --git a/sc2/content/base/ships/ilwrath/avenger-med.ani b/sc2/content/base/ships/ilwrath/avenger-med.ani
new file mode 100644
index 000000000..0c44b9e20
--- /dev/null
+++ b/sc2/content/base/ships/ilwrath/avenger-med.ani
@@ -0,0 +1,16 @@
+avenger-med.0.png 1 1 8 11
+avenger-med.1.png 1 1 6 9
+avenger-med.2.png 1 1 6 8
+avenger-med.3.png 1 1 4 7
+avenger-med.4.png 1 1 3 7
+avenger-med.5.png 1 1 4 6
+avenger-med.6.png 1 1 6 6
+avenger-med.7.png 1 1 6 4
+avenger-med.8.png 1 1 8 3
+avenger-med.9.png 1 1 9 4
+avenger-med.10.png 1 1 8 6
+avenger-med.11.png 1 1 11 6
+avenger-med.12.png 1 1 12 7
+avenger-med.13.png 1 1 11 7
+avenger-med.14.png 1 1 8 8
+avenger-med.15.png 1 1 9 9
diff --git a/sc2/content/base/ships/ilwrath/ilwmicon.0.png b/sc2/content/base/ships/ilwrath/avenger-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwmicon.0.png
rename to sc2/content/base/ships/ilwrath/avenger-meleeicons.0.png
diff --git a/sc2/content/base/ships/ilwrath/ilwmicon.1.png b/sc2/content/base/ships/ilwrath/avenger-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwmicon.1.png
rename to sc2/content/base/ships/ilwrath/avenger-meleeicons.1.png
diff --git a/sc2/content/base/ships/ilwrath/avenger-meleeicons.ani b/sc2/content/base/ships/ilwrath/avenger-meleeicons.ani
new file mode 100644
index 000000000..33f49e055
--- /dev/null
+++ b/sc2/content/base/ships/ilwrath/avenger-meleeicons.ani
@@ -0,0 +1,2 @@
+avenger-meleeicons.0.png 0 1 16 15
+avenger-meleeicons.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.0.png b/sc2/content/base/ships/ilwrath/avenger-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.0.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.0.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.1.png b/sc2/content/base/ships/ilwrath/avenger-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.1.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.1.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.10.png b/sc2/content/base/ships/ilwrath/avenger-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.10.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.10.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.11.png b/sc2/content/base/ships/ilwrath/avenger-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.11.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.11.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.12.png b/sc2/content/base/ships/ilwrath/avenger-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.12.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.12.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.13.png b/sc2/content/base/ships/ilwrath/avenger-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.13.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.13.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.14.png b/sc2/content/base/ships/ilwrath/avenger-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.14.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.14.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.15.png b/sc2/content/base/ships/ilwrath/avenger-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.15.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.15.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.2.png b/sc2/content/base/ships/ilwrath/avenger-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.2.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.2.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.3.png b/sc2/content/base/ships/ilwrath/avenger-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.3.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.3.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.4.png b/sc2/content/base/ships/ilwrath/avenger-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.4.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.4.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.5.png b/sc2/content/base/ships/ilwrath/avenger-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.5.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.5.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.6.png b/sc2/content/base/ships/ilwrath/avenger-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.6.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.6.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.7.png b/sc2/content/base/ships/ilwrath/avenger-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.7.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.7.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.8.png b/sc2/content/base/ships/ilwrath/avenger-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.8.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.8.png
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml.9.png b/sc2/content/base/ships/ilwrath/avenger-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwrath.sml.9.png
rename to sc2/content/base/ships/ilwrath/avenger-sml.9.png
diff --git a/sc2/content/base/ships/ilwrath/avenger-sml.ani b/sc2/content/base/ships/ilwrath/avenger-sml.ani
new file mode 100644
index 000000000..f2779ac16
--- /dev/null
+++ b/sc2/content/base/ships/ilwrath/avenger-sml.ani
@@ -0,0 +1,16 @@
+avenger-sml.0.png 1 1 5 6
+avenger-sml.1.png 1 1 4 6
+avenger-sml.2.png 1 1 3 5
+avenger-sml.3.png 1 1 3 5
+avenger-sml.4.png 1 1 2 5
+avenger-sml.5.png 1 1 3 4
+avenger-sml.6.png 1 1 3 3
+avenger-sml.7.png 1 1 4 2
+avenger-sml.8.png 1 1 5 2
+avenger-sml.9.png 1 1 6 2
+avenger-sml.10.png 1 1 6 3
+avenger-sml.11.png 1 1 6 4
+avenger-sml.12.png 1 1 7 5
+avenger-sml.13.png 1 1 6 5
+avenger-sml.14.png 1 1 6 5
+avenger-sml.15.png 1 1 6 6
diff --git a/sc2/content/base/ships/ilwrath/ilwditty.mod b/sc2/content/base/ships/ilwrath/avenger.mod
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwditty.mod
rename to sc2/content/base/ships/ilwrath/avenger.mod
diff --git a/sc2/content/base/ships/ilwrath/ilwsound.snd b/sc2/content/base/ships/ilwrath/avenger.snd
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwsound.snd
rename to sc2/content/base/ships/ilwrath/avenger.snd
diff --git a/sc2/content/base/ships/ilwrath/ilwtext.txt b/sc2/content/base/ships/ilwrath/avenger.txt
similarity index 100%
rename from sc2/content/base/ships/ilwrath/ilwtext.txt
rename to sc2/content/base/ships/ilwrath/avenger.txt
diff --git a/sc2/content/base/ships/ilwrath/ilwcap.ani b/sc2/content/base/ships/ilwrath/ilwcap.ani
deleted file mode 100644
index 9b8dc2db6..000000000
--- a/sc2/content/base/ships/ilwrath/ilwcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-ilwcap.0.png 7 1 0 0
-ilwcap.1.png -1 1 0 -17
-ilwcap.2.png -1 1 0 -17
-ilwcap.3.png -1 1 0 -17
-ilwcap.4.png -1 1 0 -17
-ilwcap.5.png -1 1 0 -17
-ilwcap.6.png -1 1 -4 0
-ilwcap.7.png -1 1 -4 0
-ilwcap.8.png -1 1 -4 0
-ilwcap.9.png -1 1 -21 -17
-ilwcap.10.png -1 1 -21 -17
-ilwcap.11.png -1 1 -21 -17
-ilwcap.12.png -1 1 -31 -17
-ilwcap.13.png -1 1 -31 -17
-ilwcap.14.png -1 1 -31 -17
diff --git a/sc2/content/base/ships/ilwrath/ilwicons.ani b/sc2/content/base/ships/ilwrath/ilwicons.ani
deleted file mode 100644
index b203d0b1c..000000000
--- a/sc2/content/base/ships/ilwrath/ilwicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-ilwicons.0.png 0 1 0 0
-ilwicons.1.png 0 1 19 15
diff --git a/sc2/content/base/ships/ilwrath/ilwmicon.ani b/sc2/content/base/ships/ilwrath/ilwmicon.ani
deleted file mode 100644
index 7d7a685ee..000000000
--- a/sc2/content/base/ships/ilwrath/ilwmicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-ilwmicon.0.png 0 1 16 15
-ilwmicon.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.big b/sc2/content/base/ships/ilwrath/ilwrath.big
deleted file mode 100644
index d2ace344d..000000000
--- a/sc2/content/base/ships/ilwrath/ilwrath.big
+++ /dev/null
@@ -1,16 +0,0 @@
-ilwrath.big.0.png 0 1 18 22
-ilwrath.big.1.png 0 1 14 20
-ilwrath.big.2.png 0 1 11 16
-ilwrath.big.3.png 0 1 11 17
-ilwrath.big.4.png 0 1 8 17
-ilwrath.big.5.png 0 1 11 12
-ilwrath.big.6.png 0 1 11 11
-ilwrath.big.7.png 0 1 14 9
-ilwrath.big.8.png 0 1 18 8
-ilwrath.big.9.png 0 1 19 9
-ilwrath.big.10.png 0 1 17 11
-ilwrath.big.11.png 0 1 20 12
-ilwrath.big.12.png 0 1 24 17
-ilwrath.big.13.png 0 1 20 17
-ilwrath.big.14.png 0 1 17 16
-ilwrath.big.15.png 0 1 19 20
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.med b/sc2/content/base/ships/ilwrath/ilwrath.med
deleted file mode 100644
index 9485bc732..000000000
--- a/sc2/content/base/ships/ilwrath/ilwrath.med
+++ /dev/null
@@ -1,16 +0,0 @@
-ilwrath.med.0.png 1 1 8 11
-ilwrath.med.1.png 1 1 6 9
-ilwrath.med.2.png 1 1 6 8
-ilwrath.med.3.png 1 1 4 7
-ilwrath.med.4.png 1 1 3 7
-ilwrath.med.5.png 1 1 4 6
-ilwrath.med.6.png 1 1 6 6
-ilwrath.med.7.png 1 1 6 4
-ilwrath.med.8.png 1 1 8 3
-ilwrath.med.9.png 1 1 9 4
-ilwrath.med.10.png 1 1 8 6
-ilwrath.med.11.png 1 1 11 6
-ilwrath.med.12.png 1 1 12 7
-ilwrath.med.13.png 1 1 11 7
-ilwrath.med.14.png 1 1 8 8
-ilwrath.med.15.png 1 1 9 9
diff --git a/sc2/content/base/ships/ilwrath/ilwrath.sml b/sc2/content/base/ships/ilwrath/ilwrath.sml
deleted file mode 100644
index 731dc5c7e..000000000
--- a/sc2/content/base/ships/ilwrath/ilwrath.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-ilwrath.sml.0.png 1 1 5 6
-ilwrath.sml.1.png 1 1 4 6
-ilwrath.sml.2.png 1 1 3 5
-ilwrath.sml.3.png 1 1 3 5
-ilwrath.sml.4.png 1 1 2 5
-ilwrath.sml.5.png 1 1 3 4
-ilwrath.sml.6.png 1 1 3 3
-ilwrath.sml.7.png 1 1 4 2
-ilwrath.sml.8.png 1 1 5 2
-ilwrath.sml.9.png 1 1 6 2
-ilwrath.sml.10.png 1 1 6 3
-ilwrath.sml.11.png 1 1 6 4
-ilwrath.sml.12.png 1 1 7 5
-ilwrath.sml.13.png 1 1 6 5
-ilwrath.sml.14.png 1 1 6 5
-ilwrath.sml.15.png 1 1 6 6