diff --git a/sc2/content/base/ships/androsynth/andcap.ani b/sc2/content/base/ships/androsynth/andcap.ani
deleted file mode 100644
index 4e68dc5dc..000000000
--- a/sc2/content/base/ships/androsynth/andcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-andcap.0.png -1 1 0 0
-andcap.1.png -1 1 -12 -11
-andcap.2.png -1 1 -12 -11
-andcap.3.png -1 1 -12 -11
-andcap.4.png -1 1 -12 -11
-andcap.5.png -1 1 -12 -11
-andcap.6.png -1 1 -8 -3
-andcap.7.png -1 1 -8 -3
-andcap.8.png -1 1 -8 -3
-andcap.9.png -1 1 -35 -6
-andcap.10.png -1 1 -35 -6
-andcap.11.png -1 1 -35 -6
-andcap.12.png -1 1 -50 -6
-andcap.13.png -1 1 -50 -6
-andcap.14.png -1 1 -50 -6
diff --git a/sc2/content/base/ships/androsynth/andicons.ani b/sc2/content/base/ships/androsynth/andicons.ani
deleted file mode 100644
index 634dd69a6..000000000
--- a/sc2/content/base/ships/androsynth/andicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-andicons.0.png 0 1 -4 -3
-andicons.1.png 0 1 20 20
diff --git a/sc2/content/base/ships/androsynth/andmicon.ani b/sc2/content/base/ships/androsynth/andmicon.ani
deleted file mode 100644
index 8e3b6dd26..000000000
--- a/sc2/content/base/ships/androsynth/andmicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-andmicon.0.png 0 1 8 10
-andmicon.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/androsynth/androsyn.big b/sc2/content/base/ships/androsynth/androsyn.big
deleted file mode 100644
index 1fa075214..000000000
--- a/sc2/content/base/ships/androsynth/androsyn.big
+++ /dev/null
@@ -1,16 +0,0 @@
-androsyn.big.0.png 0 1 8 14
-androsyn.big.1.png 0 1 7 11
-androsyn.big.2.png 0 1 7 8
-androsyn.big.3.png 0 1 7 8
-androsyn.big.4.png 0 1 7 7
-androsyn.big.5.png 0 1 7 8
-androsyn.big.6.png 0 1 6 7
-androsyn.big.7.png 0 1 7 6
-androsyn.big.8.png 0 1 8 6
-androsyn.big.9.png 0 1 12 6
-androsyn.big.10.png 0 1 14 6
-androsyn.big.11.png 0 1 16 7
-androsyn.big.12.png 0 1 16 7
-androsyn.big.13.png 0 1 12 11
-androsyn.big.14.png 0 1 10 13
-androsyn.big.15.png 0 1 9 15
diff --git a/sc2/content/base/ships/androsynth/androsyn.med b/sc2/content/base/ships/androsynth/androsyn.med
deleted file mode 100644
index 74a87c270..000000000
--- a/sc2/content/base/ships/androsynth/androsyn.med
+++ /dev/null
@@ -1,16 +0,0 @@
-androsyn.med.0.png 0 1 4 5
-androsyn.med.1.png 0 1 5 4
-androsyn.med.2.png 0 1 5 3
-androsyn.med.3.png 0 1 5 3
-androsyn.med.4.png 0 1 5 4
-androsyn.med.5.png 0 1 4 4
-androsyn.med.6.png 0 1 4 4
-androsyn.med.7.png 0 1 4 5
-androsyn.med.8.png 0 1 4 5
-androsyn.med.9.png 0 1 5 4
-androsyn.med.10.png 0 1 5 3
-androsyn.med.11.png 0 1 5 3
-androsyn.med.12.png 0 1 5 4
-androsyn.med.13.png 0 1 4 4
-androsyn.med.14.png 0 1 4 4
-androsyn.med.15.png 0 1 4 5
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml b/sc2/content/base/ships/androsynth/androsyn.sml
deleted file mode 100644
index 4dc3b76c0..000000000
--- a/sc2/content/base/ships/androsynth/androsyn.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-androsyn.sml.0.png 0 1 2 3
-androsyn.sml.1.png 0 1 3 3
-androsyn.sml.2.png 0 1 3 2
-androsyn.sml.3.png 0 1 3 2
-androsyn.sml.4.png 0 1 3 2
-androsyn.sml.5.png 0 1 3 2
-androsyn.sml.6.png 0 1 2 3
-androsyn.sml.7.png 0 1 2 3
-androsyn.sml.8.png 0 1 2 3
-androsyn.sml.9.png 0 1 2 3
-androsyn.sml.10.png 0 1 3 2
-androsyn.sml.11.png 0 1 3 2
-androsyn.sml.12.png 0 1 3 2
-androsyn.sml.13.png 0 1 2 3
-androsyn.sml.14.png 0 1 2 3
-androsyn.sml.15.png 0 1 2 3
diff --git a/sc2/content/base/ships/androsynth/andmicon.0.png b/sc2/content/base/ships/androsynth/guardian-big.0.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andmicon.0.png
rename to sc2/content/base/ships/androsynth/guardian-big.0.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.1.png b/sc2/content/base/ships/androsynth/guardian-big.1.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.1.png
rename to sc2/content/base/ships/androsynth/guardian-big.1.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.10.png b/sc2/content/base/ships/androsynth/guardian-big.10.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.10.png
rename to sc2/content/base/ships/androsynth/guardian-big.10.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.11.png b/sc2/content/base/ships/androsynth/guardian-big.11.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.11.png
rename to sc2/content/base/ships/androsynth/guardian-big.11.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.12.png b/sc2/content/base/ships/androsynth/guardian-big.12.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.12.png
rename to sc2/content/base/ships/androsynth/guardian-big.12.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.13.png b/sc2/content/base/ships/androsynth/guardian-big.13.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.13.png
rename to sc2/content/base/ships/androsynth/guardian-big.13.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.14.png b/sc2/content/base/ships/androsynth/guardian-big.14.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.14.png
rename to sc2/content/base/ships/androsynth/guardian-big.14.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.15.png b/sc2/content/base/ships/androsynth/guardian-big.15.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.15.png
rename to sc2/content/base/ships/androsynth/guardian-big.15.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.2.png b/sc2/content/base/ships/androsynth/guardian-big.2.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.2.png
rename to sc2/content/base/ships/androsynth/guardian-big.2.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.3.png b/sc2/content/base/ships/androsynth/guardian-big.3.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.3.png
rename to sc2/content/base/ships/androsynth/guardian-big.3.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.4.png b/sc2/content/base/ships/androsynth/guardian-big.4.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.4.png
rename to sc2/content/base/ships/androsynth/guardian-big.4.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.5.png b/sc2/content/base/ships/androsynth/guardian-big.5.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.5.png
rename to sc2/content/base/ships/androsynth/guardian-big.5.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.6.png b/sc2/content/base/ships/androsynth/guardian-big.6.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.6.png
rename to sc2/content/base/ships/androsynth/guardian-big.6.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.7.png b/sc2/content/base/ships/androsynth/guardian-big.7.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.7.png
rename to sc2/content/base/ships/androsynth/guardian-big.7.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.8.png b/sc2/content/base/ships/androsynth/guardian-big.8.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.8.png
rename to sc2/content/base/ships/androsynth/guardian-big.8.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.9.png b/sc2/content/base/ships/androsynth/guardian-big.9.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.9.png
rename to sc2/content/base/ships/androsynth/guardian-big.9.png
diff --git a/sc2/content/base/ships/androsynth/guardian-big.ani b/sc2/content/base/ships/androsynth/guardian-big.ani
new file mode 100644
index 000000000..5a0935186
--- /dev/null
+++ b/sc2/content/base/ships/androsynth/guardian-big.ani
@@ -0,0 +1,16 @@
+guardian-big.0.png 0 1 8 14
+guardian-big.1.png 0 1 7 11
+guardian-big.2.png 0 1 7 8
+guardian-big.3.png 0 1 7 8
+guardian-big.4.png 0 1 7 7
+guardian-big.5.png 0 1 7 8
+guardian-big.6.png 0 1 6 7
+guardian-big.7.png 0 1 7 6
+guardian-big.8.png 0 1 8 6
+guardian-big.9.png 0 1 12 6
+guardian-big.10.png 0 1 14 6
+guardian-big.11.png 0 1 16 7
+guardian-big.12.png 0 1 16 7
+guardian-big.13.png 0 1 12 11
+guardian-big.14.png 0 1 10 13
+guardian-big.15.png 0 1 9 15
diff --git a/sc2/content/base/ships/androsynth/andcap.0.png b/sc2/content/base/ships/androsynth/guardian-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.0.png
rename to sc2/content/base/ships/androsynth/guardian-cap.0.png
diff --git a/sc2/content/base/ships/androsynth/andcap.1.png b/sc2/content/base/ships/androsynth/guardian-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.1.png
rename to sc2/content/base/ships/androsynth/guardian-cap.1.png
diff --git a/sc2/content/base/ships/androsynth/andcap.10.png b/sc2/content/base/ships/androsynth/guardian-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.10.png
rename to sc2/content/base/ships/androsynth/guardian-cap.10.png
diff --git a/sc2/content/base/ships/androsynth/andcap.11.png b/sc2/content/base/ships/androsynth/guardian-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.11.png
rename to sc2/content/base/ships/androsynth/guardian-cap.11.png
diff --git a/sc2/content/base/ships/androsynth/andcap.12.png b/sc2/content/base/ships/androsynth/guardian-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.12.png
rename to sc2/content/base/ships/androsynth/guardian-cap.12.png
diff --git a/sc2/content/base/ships/androsynth/andcap.13.png b/sc2/content/base/ships/androsynth/guardian-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.13.png
rename to sc2/content/base/ships/androsynth/guardian-cap.13.png
diff --git a/sc2/content/base/ships/androsynth/andcap.14.png b/sc2/content/base/ships/androsynth/guardian-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.14.png
rename to sc2/content/base/ships/androsynth/guardian-cap.14.png
diff --git a/sc2/content/base/ships/androsynth/andcap.2.png b/sc2/content/base/ships/androsynth/guardian-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.2.png
rename to sc2/content/base/ships/androsynth/guardian-cap.2.png
diff --git a/sc2/content/base/ships/androsynth/andcap.3.png b/sc2/content/base/ships/androsynth/guardian-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.3.png
rename to sc2/content/base/ships/androsynth/guardian-cap.3.png
diff --git a/sc2/content/base/ships/androsynth/andcap.4.png b/sc2/content/base/ships/androsynth/guardian-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.4.png
rename to sc2/content/base/ships/androsynth/guardian-cap.4.png
diff --git a/sc2/content/base/ships/androsynth/andcap.5.png b/sc2/content/base/ships/androsynth/guardian-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.5.png
rename to sc2/content/base/ships/androsynth/guardian-cap.5.png
diff --git a/sc2/content/base/ships/androsynth/andcap.6.png b/sc2/content/base/ships/androsynth/guardian-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.6.png
rename to sc2/content/base/ships/androsynth/guardian-cap.6.png
diff --git a/sc2/content/base/ships/androsynth/andcap.7.png b/sc2/content/base/ships/androsynth/guardian-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.7.png
rename to sc2/content/base/ships/androsynth/guardian-cap.7.png
diff --git a/sc2/content/base/ships/androsynth/andcap.8.png b/sc2/content/base/ships/androsynth/guardian-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.8.png
rename to sc2/content/base/ships/androsynth/guardian-cap.8.png
diff --git a/sc2/content/base/ships/androsynth/andcap.9.png b/sc2/content/base/ships/androsynth/guardian-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andcap.9.png
rename to sc2/content/base/ships/androsynth/guardian-cap.9.png
diff --git a/sc2/content/base/ships/androsynth/guardian-cap.ani b/sc2/content/base/ships/androsynth/guardian-cap.ani
new file mode 100644
index 000000000..6475bf7dc
--- /dev/null
+++ b/sc2/content/base/ships/androsynth/guardian-cap.ani
@@ -0,0 +1,15 @@
+guardian-cap.0.png -1 1 0 0
+guardian-cap.1.png -1 1 -12 -11
+guardian-cap.2.png -1 1 -12 -11
+guardian-cap.3.png -1 1 -12 -11
+guardian-cap.4.png -1 1 -12 -11
+guardian-cap.5.png -1 1 -12 -11
+guardian-cap.6.png -1 1 -8 -3
+guardian-cap.7.png -1 1 -8 -3
+guardian-cap.8.png -1 1 -8 -3
+guardian-cap.9.png -1 1 -35 -6
+guardian-cap.10.png -1 1 -35 -6
+guardian-cap.11.png -1 1 -35 -6
+guardian-cap.12.png -1 1 -50 -6
+guardian-cap.13.png -1 1 -50 -6
+guardian-cap.14.png -1 1 -50 -6
diff --git a/sc2/content/base/ships/androsynth/andicons.0.png b/sc2/content/base/ships/androsynth/guardian-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andicons.0.png
rename to sc2/content/base/ships/androsynth/guardian-icons.0.png
diff --git a/sc2/content/base/ships/androsynth/andicons.1.png b/sc2/content/base/ships/androsynth/guardian-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andicons.1.png
rename to sc2/content/base/ships/androsynth/guardian-icons.1.png
diff --git a/sc2/content/base/ships/androsynth/guardian-icons.ani b/sc2/content/base/ships/androsynth/guardian-icons.ani
new file mode 100644
index 000000000..10f6eaed8
--- /dev/null
+++ b/sc2/content/base/ships/androsynth/guardian-icons.ani
@@ -0,0 +1,2 @@
+guardian-icons.0.png 0 1 -4 -3
+guardian-icons.1.png 0 1 20 20
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.0.png b/sc2/content/base/ships/androsynth/guardian-med.0.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.0.png
rename to sc2/content/base/ships/androsynth/guardian-med.0.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.1.png b/sc2/content/base/ships/androsynth/guardian-med.1.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.1.png
rename to sc2/content/base/ships/androsynth/guardian-med.1.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.10.png b/sc2/content/base/ships/androsynth/guardian-med.10.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.10.png
rename to sc2/content/base/ships/androsynth/guardian-med.10.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.11.png b/sc2/content/base/ships/androsynth/guardian-med.11.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.11.png
rename to sc2/content/base/ships/androsynth/guardian-med.11.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.12.png b/sc2/content/base/ships/androsynth/guardian-med.12.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.12.png
rename to sc2/content/base/ships/androsynth/guardian-med.12.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.13.png b/sc2/content/base/ships/androsynth/guardian-med.13.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.13.png
rename to sc2/content/base/ships/androsynth/guardian-med.13.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.14.png b/sc2/content/base/ships/androsynth/guardian-med.14.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.14.png
rename to sc2/content/base/ships/androsynth/guardian-med.14.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.15.png b/sc2/content/base/ships/androsynth/guardian-med.15.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.15.png
rename to sc2/content/base/ships/androsynth/guardian-med.15.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.2.png b/sc2/content/base/ships/androsynth/guardian-med.2.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.2.png
rename to sc2/content/base/ships/androsynth/guardian-med.2.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.3.png b/sc2/content/base/ships/androsynth/guardian-med.3.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.3.png
rename to sc2/content/base/ships/androsynth/guardian-med.3.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.4.png b/sc2/content/base/ships/androsynth/guardian-med.4.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.4.png
rename to sc2/content/base/ships/androsynth/guardian-med.4.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.5.png b/sc2/content/base/ships/androsynth/guardian-med.5.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.5.png
rename to sc2/content/base/ships/androsynth/guardian-med.5.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.6.png b/sc2/content/base/ships/androsynth/guardian-med.6.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.6.png
rename to sc2/content/base/ships/androsynth/guardian-med.6.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.7.png b/sc2/content/base/ships/androsynth/guardian-med.7.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.7.png
rename to sc2/content/base/ships/androsynth/guardian-med.7.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.8.png b/sc2/content/base/ships/androsynth/guardian-med.8.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.8.png
rename to sc2/content/base/ships/androsynth/guardian-med.8.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.med.9.png b/sc2/content/base/ships/androsynth/guardian-med.9.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.med.9.png
rename to sc2/content/base/ships/androsynth/guardian-med.9.png
diff --git a/sc2/content/base/ships/androsynth/guardian-med.ani b/sc2/content/base/ships/androsynth/guardian-med.ani
new file mode 100644
index 000000000..abc158727
--- /dev/null
+++ b/sc2/content/base/ships/androsynth/guardian-med.ani
@@ -0,0 +1,16 @@
+guardian-med.0.png 0 1 4 5
+guardian-med.1.png 0 1 5 4
+guardian-med.2.png 0 1 5 3
+guardian-med.3.png 0 1 5 3
+guardian-med.4.png 0 1 5 4
+guardian-med.5.png 0 1 4 4
+guardian-med.6.png 0 1 4 4
+guardian-med.7.png 0 1 4 5
+guardian-med.8.png 0 1 4 5
+guardian-med.9.png 0 1 5 4
+guardian-med.10.png 0 1 5 3
+guardian-med.11.png 0 1 5 3
+guardian-med.12.png 0 1 5 4
+guardian-med.13.png 0 1 4 4
+guardian-med.14.png 0 1 4 4
+guardian-med.15.png 0 1 4 5
diff --git a/sc2/content/base/ships/androsynth/androsyn.big.0.png b/sc2/content/base/ships/androsynth/guardian-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.big.0.png
rename to sc2/content/base/ships/androsynth/guardian-meleeicons.0.png
diff --git a/sc2/content/base/ships/androsynth/andmicon.1.png b/sc2/content/base/ships/androsynth/guardian-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/andmicon.1.png
rename to sc2/content/base/ships/androsynth/guardian-meleeicons.1.png
diff --git a/sc2/content/base/ships/androsynth/guardian-meleeicons.ani b/sc2/content/base/ships/androsynth/guardian-meleeicons.ani
new file mode 100644
index 000000000..83f8351d6
--- /dev/null
+++ b/sc2/content/base/ships/androsynth/guardian-meleeicons.ani
@@ -0,0 +1,2 @@
+guardian-meleeicons.0.png 0 1 8 10
+guardian-meleeicons.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.0.png b/sc2/content/base/ships/androsynth/guardian-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.0.png
rename to sc2/content/base/ships/androsynth/guardian-sml.0.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.1.png b/sc2/content/base/ships/androsynth/guardian-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.1.png
rename to sc2/content/base/ships/androsynth/guardian-sml.1.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.10.png b/sc2/content/base/ships/androsynth/guardian-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.10.png
rename to sc2/content/base/ships/androsynth/guardian-sml.10.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.11.png b/sc2/content/base/ships/androsynth/guardian-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.11.png
rename to sc2/content/base/ships/androsynth/guardian-sml.11.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.12.png b/sc2/content/base/ships/androsynth/guardian-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.12.png
rename to sc2/content/base/ships/androsynth/guardian-sml.12.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.13.png b/sc2/content/base/ships/androsynth/guardian-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.13.png
rename to sc2/content/base/ships/androsynth/guardian-sml.13.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.14.png b/sc2/content/base/ships/androsynth/guardian-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.14.png
rename to sc2/content/base/ships/androsynth/guardian-sml.14.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.15.png b/sc2/content/base/ships/androsynth/guardian-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.15.png
rename to sc2/content/base/ships/androsynth/guardian-sml.15.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.2.png b/sc2/content/base/ships/androsynth/guardian-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.2.png
rename to sc2/content/base/ships/androsynth/guardian-sml.2.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.3.png b/sc2/content/base/ships/androsynth/guardian-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.3.png
rename to sc2/content/base/ships/androsynth/guardian-sml.3.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.4.png b/sc2/content/base/ships/androsynth/guardian-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.4.png
rename to sc2/content/base/ships/androsynth/guardian-sml.4.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.5.png b/sc2/content/base/ships/androsynth/guardian-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.5.png
rename to sc2/content/base/ships/androsynth/guardian-sml.5.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.6.png b/sc2/content/base/ships/androsynth/guardian-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.6.png
rename to sc2/content/base/ships/androsynth/guardian-sml.6.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.7.png b/sc2/content/base/ships/androsynth/guardian-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.7.png
rename to sc2/content/base/ships/androsynth/guardian-sml.7.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.8.png b/sc2/content/base/ships/androsynth/guardian-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.8.png
rename to sc2/content/base/ships/androsynth/guardian-sml.8.png
diff --git a/sc2/content/base/ships/androsynth/androsyn.sml.9.png b/sc2/content/base/ships/androsynth/guardian-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/androsynth/androsyn.sml.9.png
rename to sc2/content/base/ships/androsynth/guardian-sml.9.png
diff --git a/sc2/content/base/ships/androsynth/guardian-sml.ani b/sc2/content/base/ships/androsynth/guardian-sml.ani
new file mode 100644
index 000000000..87f4f4589
--- /dev/null
+++ b/sc2/content/base/ships/androsynth/guardian-sml.ani
@@ -0,0 +1,16 @@
+guardian-sml.0.png 0 1 2 3
+guardian-sml.1.png 0 1 3 3
+guardian-sml.2.png 0 1 3 2
+guardian-sml.3.png 0 1 3 2
+guardian-sml.4.png 0 1 3 2
+guardian-sml.5.png 0 1 3 2
+guardian-sml.6.png 0 1 2 3
+guardian-sml.7.png 0 1 2 3
+guardian-sml.8.png 0 1 2 3
+guardian-sml.9.png 0 1 2 3
+guardian-sml.10.png 0 1 3 2
+guardian-sml.11.png 0 1 3 2
+guardian-sml.12.png 0 1 3 2
+guardian-sml.13.png 0 1 2 3
+guardian-sml.14.png 0 1 2 3
+guardian-sml.15.png 0 1 2 3
diff --git a/sc2/content/base/ships/androsynth/andditty.mod b/sc2/content/base/ships/androsynth/guardian.mod
similarity index 100%
rename from sc2/content/base/ships/androsynth/andditty.mod
rename to sc2/content/base/ships/androsynth/guardian.mod
diff --git a/sc2/content/base/ships/androsynth/andsound.snd b/sc2/content/base/ships/androsynth/guardian.snd
similarity index 100%
rename from sc2/content/base/ships/androsynth/andsound.snd
rename to sc2/content/base/ships/androsynth/guardian.snd
diff --git a/sc2/content/base/ships/androsynth/andtext.txt b/sc2/content/base/ships/androsynth/guardian.txt
similarity index 100%
rename from sc2/content/base/ships/androsynth/andtext.txt
rename to sc2/content/base/ships/androsynth/guardian.txt
diff --git a/sc2/content/base/ships/arilou/aricap.ani b/sc2/content/base/ships/arilou/aricap.ani
deleted file mode 100644
index 625867d29..000000000
--- a/sc2/content/base/ships/arilou/aricap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-aricap.0.png -1 1 0 0
-aricap.1.png -1 1 -15 -21
-aricap.2.png -1 1 -15 -21
-aricap.3.png -1 1 -15 -21
-aricap.4.png -1 1 -15 -21
-aricap.5.png -1 1 -15 -21
-aricap.6.png -1 1 -28 -10
-aricap.7.png -1 1 -28 -10
-aricap.8.png -1 1 -28 -10
-aricap.9.png -1 1 -8 -10
-aricap.10.png -1 1 -8 -10
-aricap.11.png -1 1 -8 -10
-aricap.12.png -1 1 -16 -1
-aricap.13.png -1 1 -16 -1
-aricap.14.png -1 1 -16 -1
diff --git a/sc2/content/base/ships/arilou/ariicons.ani b/sc2/content/base/ships/arilou/ariicons.ani
deleted file mode 100644
index c45800635..000000000
--- a/sc2/content/base/ships/arilou/ariicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-ariicons.0.png 0 1 -4 -4
-ariicons.1.png 0 1 19 10
diff --git a/sc2/content/base/ships/arilou/arilou.big b/sc2/content/base/ships/arilou/arilou.big
deleted file mode 100644
index 79b8468e3..000000000
--- a/sc2/content/base/ships/arilou/arilou.big
+++ /dev/null
@@ -1,16 +0,0 @@
-arilou.big.0.png 0 1 9 7
-arilou.big.1.png 0 1 9 7
-arilou.big.2.png 0 1 9 7
-arilou.big.3.png 0 1 9 7
-arilou.big.4.png 0 1 11 7
-arilou.big.5.png 0 1 9 7
-arilou.big.6.png 0 1 9 7
-arilou.big.7.png 0 1 9 7
-arilou.big.8.png 0 1 9 8
-arilou.big.9.png 0 1 9 7
-arilou.big.10.png 0 1 9 7
-arilou.big.11.png 0 1 9 7
-arilou.big.12.png 0 1 9 7
-arilou.big.13.png 0 1 9 7
-arilou.big.14.png 0 1 9 7
-arilou.big.15.png 0 1 9 7
diff --git a/sc2/content/base/ships/arilou/arilou.med b/sc2/content/base/ships/arilou/arilou.med
deleted file mode 100644
index 9b6ed00a4..000000000
--- a/sc2/content/base/ships/arilou/arilou.med
+++ /dev/null
@@ -1,16 +0,0 @@
-arilou.med.0.png 0 1 4 3
-arilou.med.1.png 0 1 4 3
-arilou.med.2.png 0 1 4 3
-arilou.med.3.png 0 1 4 3
-arilou.med.4.png 0 1 5 3
-arilou.med.5.png 0 1 4 3
-arilou.med.6.png 0 1 4 3
-arilou.med.7.png 0 1 4 3
-arilou.med.8.png 0 1 4 3
-arilou.med.9.png 0 1 4 3
-arilou.med.10.png 0 1 4 3
-arilou.med.11.png 0 1 4 3
-arilou.med.12.png 0 1 4 3
-arilou.med.13.png 0 1 4 3
-arilou.med.14.png 0 1 4 3
-arilou.med.15.png 0 1 4 3
diff --git a/sc2/content/base/ships/arilou/arilou.sml b/sc2/content/base/ships/arilou/arilou.sml
deleted file mode 100644
index ce22b28f2..000000000
--- a/sc2/content/base/ships/arilou/arilou.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-arilou.sml.0.png 0 1 2 2
-arilou.sml.1.png 0 1 2 2
-arilou.sml.2.png 0 1 2 2
-arilou.sml.3.png 0 1 2 2
-arilou.sml.4.png 0 1 2 2
-arilou.sml.5.png 0 1 2 2
-arilou.sml.6.png 0 1 2 2
-arilou.sml.7.png 0 1 2 2
-arilou.sml.8.png 0 1 2 2
-arilou.sml.9.png 0 1 2 2
-arilou.sml.10.png 0 1 2 2
-arilou.sml.11.png 0 1 2 2
-arilou.sml.12.png 0 1 2 2
-arilou.sml.13.png 0 1 2 2
-arilou.sml.14.png 0 1 2 2
-arilou.sml.15.png 0 1 2 2
diff --git a/sc2/content/base/ships/arilou/arimicon.ani b/sc2/content/base/ships/arilou/arimicon.ani
deleted file mode 100644
index 5bbea1184..000000000
--- a/sc2/content/base/ships/arilou/arimicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-arimicon.0.png 0 1 9 6
-arimicon.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/arilou/arilou.big.0.png b/sc2/content/base/ships/arilou/skiff-big.0.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.0.png
rename to sc2/content/base/ships/arilou/skiff-big.0.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.1.png b/sc2/content/base/ships/arilou/skiff-big.1.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.1.png
rename to sc2/content/base/ships/arilou/skiff-big.1.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.10.png b/sc2/content/base/ships/arilou/skiff-big.10.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.10.png
rename to sc2/content/base/ships/arilou/skiff-big.10.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.11.png b/sc2/content/base/ships/arilou/skiff-big.11.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.11.png
rename to sc2/content/base/ships/arilou/skiff-big.11.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.12.png b/sc2/content/base/ships/arilou/skiff-big.12.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.12.png
rename to sc2/content/base/ships/arilou/skiff-big.12.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.13.png b/sc2/content/base/ships/arilou/skiff-big.13.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.13.png
rename to sc2/content/base/ships/arilou/skiff-big.13.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.14.png b/sc2/content/base/ships/arilou/skiff-big.14.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.14.png
rename to sc2/content/base/ships/arilou/skiff-big.14.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.15.png b/sc2/content/base/ships/arilou/skiff-big.15.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.15.png
rename to sc2/content/base/ships/arilou/skiff-big.15.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.2.png b/sc2/content/base/ships/arilou/skiff-big.2.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.2.png
rename to sc2/content/base/ships/arilou/skiff-big.2.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.3.png b/sc2/content/base/ships/arilou/skiff-big.3.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.3.png
rename to sc2/content/base/ships/arilou/skiff-big.3.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.4.png b/sc2/content/base/ships/arilou/skiff-big.4.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.4.png
rename to sc2/content/base/ships/arilou/skiff-big.4.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.5.png b/sc2/content/base/ships/arilou/skiff-big.5.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.5.png
rename to sc2/content/base/ships/arilou/skiff-big.5.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.6.png b/sc2/content/base/ships/arilou/skiff-big.6.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.6.png
rename to sc2/content/base/ships/arilou/skiff-big.6.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.7.png b/sc2/content/base/ships/arilou/skiff-big.7.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.7.png
rename to sc2/content/base/ships/arilou/skiff-big.7.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.8.png b/sc2/content/base/ships/arilou/skiff-big.8.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.8.png
rename to sc2/content/base/ships/arilou/skiff-big.8.png
diff --git a/sc2/content/base/ships/arilou/arilou.big.9.png b/sc2/content/base/ships/arilou/skiff-big.9.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.big.9.png
rename to sc2/content/base/ships/arilou/skiff-big.9.png
diff --git a/sc2/content/base/ships/arilou/skiff-big.ani b/sc2/content/base/ships/arilou/skiff-big.ani
new file mode 100644
index 000000000..322283b13
--- /dev/null
+++ b/sc2/content/base/ships/arilou/skiff-big.ani
@@ -0,0 +1,16 @@
+skiff-big.0.png 0 1 9 7
+skiff-big.1.png 0 1 9 7
+skiff-big.2.png 0 1 9 7
+skiff-big.3.png 0 1 9 7
+skiff-big.4.png 0 1 11 7
+skiff-big.5.png 0 1 9 7
+skiff-big.6.png 0 1 9 7
+skiff-big.7.png 0 1 9 7
+skiff-big.8.png 0 1 9 8
+skiff-big.9.png 0 1 9 7
+skiff-big.10.png 0 1 9 7
+skiff-big.11.png 0 1 9 7
+skiff-big.12.png 0 1 9 7
+skiff-big.13.png 0 1 9 7
+skiff-big.14.png 0 1 9 7
+skiff-big.15.png 0 1 9 7
diff --git a/sc2/content/base/ships/arilou/aricap.0.png b/sc2/content/base/ships/arilou/skiff-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.0.png
rename to sc2/content/base/ships/arilou/skiff-cap.0.png
diff --git a/sc2/content/base/ships/arilou/aricap.1.png b/sc2/content/base/ships/arilou/skiff-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.1.png
rename to sc2/content/base/ships/arilou/skiff-cap.1.png
diff --git a/sc2/content/base/ships/arilou/aricap.10.png b/sc2/content/base/ships/arilou/skiff-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.10.png
rename to sc2/content/base/ships/arilou/skiff-cap.10.png
diff --git a/sc2/content/base/ships/arilou/aricap.11.png b/sc2/content/base/ships/arilou/skiff-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.11.png
rename to sc2/content/base/ships/arilou/skiff-cap.11.png
diff --git a/sc2/content/base/ships/arilou/aricap.12.png b/sc2/content/base/ships/arilou/skiff-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.12.png
rename to sc2/content/base/ships/arilou/skiff-cap.12.png
diff --git a/sc2/content/base/ships/arilou/aricap.13.png b/sc2/content/base/ships/arilou/skiff-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.13.png
rename to sc2/content/base/ships/arilou/skiff-cap.13.png
diff --git a/sc2/content/base/ships/arilou/aricap.14.png b/sc2/content/base/ships/arilou/skiff-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.14.png
rename to sc2/content/base/ships/arilou/skiff-cap.14.png
diff --git a/sc2/content/base/ships/arilou/aricap.2.png b/sc2/content/base/ships/arilou/skiff-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.2.png
rename to sc2/content/base/ships/arilou/skiff-cap.2.png
diff --git a/sc2/content/base/ships/arilou/aricap.3.png b/sc2/content/base/ships/arilou/skiff-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.3.png
rename to sc2/content/base/ships/arilou/skiff-cap.3.png
diff --git a/sc2/content/base/ships/arilou/aricap.4.png b/sc2/content/base/ships/arilou/skiff-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.4.png
rename to sc2/content/base/ships/arilou/skiff-cap.4.png
diff --git a/sc2/content/base/ships/arilou/aricap.5.png b/sc2/content/base/ships/arilou/skiff-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.5.png
rename to sc2/content/base/ships/arilou/skiff-cap.5.png
diff --git a/sc2/content/base/ships/arilou/aricap.6.png b/sc2/content/base/ships/arilou/skiff-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.6.png
rename to sc2/content/base/ships/arilou/skiff-cap.6.png
diff --git a/sc2/content/base/ships/arilou/aricap.7.png b/sc2/content/base/ships/arilou/skiff-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.7.png
rename to sc2/content/base/ships/arilou/skiff-cap.7.png
diff --git a/sc2/content/base/ships/arilou/aricap.8.png b/sc2/content/base/ships/arilou/skiff-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.8.png
rename to sc2/content/base/ships/arilou/skiff-cap.8.png
diff --git a/sc2/content/base/ships/arilou/aricap.9.png b/sc2/content/base/ships/arilou/skiff-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/arilou/aricap.9.png
rename to sc2/content/base/ships/arilou/skiff-cap.9.png
diff --git a/sc2/content/base/ships/arilou/skiff-cap.ani b/sc2/content/base/ships/arilou/skiff-cap.ani
new file mode 100644
index 000000000..2dcd99e59
--- /dev/null
+++ b/sc2/content/base/ships/arilou/skiff-cap.ani
@@ -0,0 +1,15 @@
+skiff-cap.0.png -1 1 0 0
+skiff-cap.1.png -1 1 -15 -21
+skiff-cap.2.png -1 1 -15 -21
+skiff-cap.3.png -1 1 -15 -21
+skiff-cap.4.png -1 1 -15 -21
+skiff-cap.5.png -1 1 -15 -21
+skiff-cap.6.png -1 1 -28 -10
+skiff-cap.7.png -1 1 -28 -10
+skiff-cap.8.png -1 1 -28 -10
+skiff-cap.9.png -1 1 -8 -10
+skiff-cap.10.png -1 1 -8 -10
+skiff-cap.11.png -1 1 -8 -10
+skiff-cap.12.png -1 1 -16 -1
+skiff-cap.13.png -1 1 -16 -1
+skiff-cap.14.png -1 1 -16 -1
diff --git a/sc2/content/base/ships/arilou/ariicons.0.png b/sc2/content/base/ships/arilou/skiff-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/arilou/ariicons.0.png
rename to sc2/content/base/ships/arilou/skiff-icons.0.png
diff --git a/sc2/content/base/ships/arilou/ariicons.1.png b/sc2/content/base/ships/arilou/skiff-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/arilou/ariicons.1.png
rename to sc2/content/base/ships/arilou/skiff-icons.1.png
diff --git a/sc2/content/base/ships/arilou/skiff-icons.ani b/sc2/content/base/ships/arilou/skiff-icons.ani
new file mode 100644
index 000000000..05f3b6aaa
--- /dev/null
+++ b/sc2/content/base/ships/arilou/skiff-icons.ani
@@ -0,0 +1,2 @@
+skiff-icons.0.png 0 1 -4 -4
+skiff-icons.1.png 0 1 19 10
diff --git a/sc2/content/base/ships/arilou/arilou.med.0.png b/sc2/content/base/ships/arilou/skiff-med.0.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.0.png
rename to sc2/content/base/ships/arilou/skiff-med.0.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.1.png b/sc2/content/base/ships/arilou/skiff-med.1.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.1.png
rename to sc2/content/base/ships/arilou/skiff-med.1.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.10.png b/sc2/content/base/ships/arilou/skiff-med.10.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.10.png
rename to sc2/content/base/ships/arilou/skiff-med.10.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.11.png b/sc2/content/base/ships/arilou/skiff-med.11.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.11.png
rename to sc2/content/base/ships/arilou/skiff-med.11.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.12.png b/sc2/content/base/ships/arilou/skiff-med.12.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.12.png
rename to sc2/content/base/ships/arilou/skiff-med.12.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.13.png b/sc2/content/base/ships/arilou/skiff-med.13.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.13.png
rename to sc2/content/base/ships/arilou/skiff-med.13.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.14.png b/sc2/content/base/ships/arilou/skiff-med.14.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.14.png
rename to sc2/content/base/ships/arilou/skiff-med.14.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.15.png b/sc2/content/base/ships/arilou/skiff-med.15.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.15.png
rename to sc2/content/base/ships/arilou/skiff-med.15.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.2.png b/sc2/content/base/ships/arilou/skiff-med.2.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.2.png
rename to sc2/content/base/ships/arilou/skiff-med.2.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.3.png b/sc2/content/base/ships/arilou/skiff-med.3.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.3.png
rename to sc2/content/base/ships/arilou/skiff-med.3.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.4.png b/sc2/content/base/ships/arilou/skiff-med.4.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.4.png
rename to sc2/content/base/ships/arilou/skiff-med.4.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.5.png b/sc2/content/base/ships/arilou/skiff-med.5.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.5.png
rename to sc2/content/base/ships/arilou/skiff-med.5.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.6.png b/sc2/content/base/ships/arilou/skiff-med.6.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.6.png
rename to sc2/content/base/ships/arilou/skiff-med.6.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.7.png b/sc2/content/base/ships/arilou/skiff-med.7.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.7.png
rename to sc2/content/base/ships/arilou/skiff-med.7.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.8.png b/sc2/content/base/ships/arilou/skiff-med.8.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.8.png
rename to sc2/content/base/ships/arilou/skiff-med.8.png
diff --git a/sc2/content/base/ships/arilou/arilou.med.9.png b/sc2/content/base/ships/arilou/skiff-med.9.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.med.9.png
rename to sc2/content/base/ships/arilou/skiff-med.9.png
diff --git a/sc2/content/base/ships/arilou/skiff-med.ani b/sc2/content/base/ships/arilou/skiff-med.ani
new file mode 100644
index 000000000..8e0288899
--- /dev/null
+++ b/sc2/content/base/ships/arilou/skiff-med.ani
@@ -0,0 +1,16 @@
+skiff-med.0.png 0 1 4 3
+skiff-med.1.png 0 1 4 3
+skiff-med.2.png 0 1 4 3
+skiff-med.3.png 0 1 4 3
+skiff-med.4.png 0 1 5 3
+skiff-med.5.png 0 1 4 3
+skiff-med.6.png 0 1 4 3
+skiff-med.7.png 0 1 4 3
+skiff-med.8.png 0 1 4 3
+skiff-med.9.png 0 1 4 3
+skiff-med.10.png 0 1 4 3
+skiff-med.11.png 0 1 4 3
+skiff-med.12.png 0 1 4 3
+skiff-med.13.png 0 1 4 3
+skiff-med.14.png 0 1 4 3
+skiff-med.15.png 0 1 4 3
diff --git a/sc2/content/base/ships/arilou/arimicon.0.png b/sc2/content/base/ships/arilou/skiff-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arimicon.0.png
rename to sc2/content/base/ships/arilou/skiff-meleeicons.0.png
diff --git a/sc2/content/base/ships/arilou/arimicon.1.png b/sc2/content/base/ships/arilou/skiff-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arimicon.1.png
rename to sc2/content/base/ships/arilou/skiff-meleeicons.1.png
diff --git a/sc2/content/base/ships/arilou/skiff-meleeicons.ani b/sc2/content/base/ships/arilou/skiff-meleeicons.ani
new file mode 100644
index 000000000..b334b79b7
--- /dev/null
+++ b/sc2/content/base/ships/arilou/skiff-meleeicons.ani
@@ -0,0 +1,2 @@
+skiff-meleeicons.0.png 0 1 9 6
+skiff-meleeicons.1.png 0 1 3 4
diff --git a/sc2/content/base/ships/arilou/arilou.sml.0.png b/sc2/content/base/ships/arilou/skiff-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.0.png
rename to sc2/content/base/ships/arilou/skiff-sml.0.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.1.png b/sc2/content/base/ships/arilou/skiff-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.1.png
rename to sc2/content/base/ships/arilou/skiff-sml.1.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.10.png b/sc2/content/base/ships/arilou/skiff-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.10.png
rename to sc2/content/base/ships/arilou/skiff-sml.10.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.11.png b/sc2/content/base/ships/arilou/skiff-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.11.png
rename to sc2/content/base/ships/arilou/skiff-sml.11.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.12.png b/sc2/content/base/ships/arilou/skiff-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.12.png
rename to sc2/content/base/ships/arilou/skiff-sml.12.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.13.png b/sc2/content/base/ships/arilou/skiff-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.13.png
rename to sc2/content/base/ships/arilou/skiff-sml.13.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.14.png b/sc2/content/base/ships/arilou/skiff-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.14.png
rename to sc2/content/base/ships/arilou/skiff-sml.14.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.15.png b/sc2/content/base/ships/arilou/skiff-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.15.png
rename to sc2/content/base/ships/arilou/skiff-sml.15.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.2.png b/sc2/content/base/ships/arilou/skiff-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.2.png
rename to sc2/content/base/ships/arilou/skiff-sml.2.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.3.png b/sc2/content/base/ships/arilou/skiff-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.3.png
rename to sc2/content/base/ships/arilou/skiff-sml.3.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.4.png b/sc2/content/base/ships/arilou/skiff-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.4.png
rename to sc2/content/base/ships/arilou/skiff-sml.4.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.5.png b/sc2/content/base/ships/arilou/skiff-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.5.png
rename to sc2/content/base/ships/arilou/skiff-sml.5.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.6.png b/sc2/content/base/ships/arilou/skiff-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.6.png
rename to sc2/content/base/ships/arilou/skiff-sml.6.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.7.png b/sc2/content/base/ships/arilou/skiff-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.7.png
rename to sc2/content/base/ships/arilou/skiff-sml.7.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.8.png b/sc2/content/base/ships/arilou/skiff-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.8.png
rename to sc2/content/base/ships/arilou/skiff-sml.8.png
diff --git a/sc2/content/base/ships/arilou/arilou.sml.9.png b/sc2/content/base/ships/arilou/skiff-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/arilou/arilou.sml.9.png
rename to sc2/content/base/ships/arilou/skiff-sml.9.png
diff --git a/sc2/content/base/ships/arilou/skiff-sml.ani b/sc2/content/base/ships/arilou/skiff-sml.ani
new file mode 100644
index 000000000..46e7c614e
--- /dev/null
+++ b/sc2/content/base/ships/arilou/skiff-sml.ani
@@ -0,0 +1,16 @@
+skiff-sml.0.png 0 1 2 2
+skiff-sml.1.png 0 1 2 2
+skiff-sml.2.png 0 1 2 2
+skiff-sml.3.png 0 1 2 2
+skiff-sml.4.png 0 1 2 2
+skiff-sml.5.png 0 1 2 2
+skiff-sml.6.png 0 1 2 2
+skiff-sml.7.png 0 1 2 2
+skiff-sml.8.png 0 1 2 2
+skiff-sml.9.png 0 1 2 2
+skiff-sml.10.png 0 1 2 2
+skiff-sml.11.png 0 1 2 2
+skiff-sml.12.png 0 1 2 2
+skiff-sml.13.png 0 1 2 2
+skiff-sml.14.png 0 1 2 2
+skiff-sml.15.png 0 1 2 2
diff --git a/sc2/content/base/ships/arilou/ariditty.mod b/sc2/content/base/ships/arilou/skiff.mod
similarity index 100%
rename from sc2/content/base/ships/arilou/ariditty.mod
rename to sc2/content/base/ships/arilou/skiff.mod
diff --git a/sc2/content/base/ships/arilou/arisound.snd b/sc2/content/base/ships/arilou/skiff.snd
similarity index 100%
rename from sc2/content/base/ships/arilou/arisound.snd
rename to sc2/content/base/ships/arilou/skiff.snd
diff --git a/sc2/content/base/ships/arilou/aritext.txt b/sc2/content/base/ships/arilou/skiff.txt
similarity index 100%
rename from sc2/content/base/ships/arilou/aritext.txt
rename to sc2/content/base/ships/arilou/skiff.txt
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.0.png b/sc2/content/base/ships/chenjesu/broodhome-big.0.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.0.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.0.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.1.png b/sc2/content/base/ships/chenjesu/broodhome-big.1.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.1.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.1.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.10.png b/sc2/content/base/ships/chenjesu/broodhome-big.10.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.10.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.10.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.11.png b/sc2/content/base/ships/chenjesu/broodhome-big.11.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.11.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.11.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.12.png b/sc2/content/base/ships/chenjesu/broodhome-big.12.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.12.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.12.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.13.png b/sc2/content/base/ships/chenjesu/broodhome-big.13.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.13.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.13.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.14.png b/sc2/content/base/ships/chenjesu/broodhome-big.14.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.14.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.14.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.15.png b/sc2/content/base/ships/chenjesu/broodhome-big.15.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.15.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.15.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.2.png b/sc2/content/base/ships/chenjesu/broodhome-big.2.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.2.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.2.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.3.png b/sc2/content/base/ships/chenjesu/broodhome-big.3.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.3.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.3.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.4.png b/sc2/content/base/ships/chenjesu/broodhome-big.4.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.4.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.4.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.5.png b/sc2/content/base/ships/chenjesu/broodhome-big.5.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.5.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.5.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.6.png b/sc2/content/base/ships/chenjesu/broodhome-big.6.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.6.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.6.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.7.png b/sc2/content/base/ships/chenjesu/broodhome-big.7.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.7.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.7.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.8.png b/sc2/content/base/ships/chenjesu/broodhome-big.8.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.8.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.8.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big.9.png b/sc2/content/base/ships/chenjesu/broodhome-big.9.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.big.9.png
rename to sc2/content/base/ships/chenjesu/broodhome-big.9.png
diff --git a/sc2/content/base/ships/chenjesu/broodhome-big.ani b/sc2/content/base/ships/chenjesu/broodhome-big.ani
new file mode 100644
index 000000000..420dacd0d
--- /dev/null
+++ b/sc2/content/base/ships/chenjesu/broodhome-big.ani
@@ -0,0 +1,16 @@
+broodhome-big.0.png 0 1 16 13
+broodhome-big.1.png 0 1 17 15
+broodhome-big.2.png 0 1 16 17
+broodhome-big.3.png 0 1 20 16
+broodhome-big.4.png 0 1 21 15
+broodhome-big.5.png 0 1 20 15
+broodhome-big.6.png 0 1 16 15
+broodhome-big.7.png 0 1 17 18
+broodhome-big.8.png 0 1 16 19
+broodhome-big.9.png 0 1 18 18
+broodhome-big.10.png 0 1 20 15
+broodhome-big.11.png 0 1 18 15
+broodhome-big.12.png 0 1 16 15
+broodhome-big.13.png 0 1 18 16
+broodhome-big.14.png 0 1 20 17
+broodhome-big.15.png 0 1 18 15
diff --git a/sc2/content/base/ships/chenjesu/checap.0.png b/sc2/content/base/ships/chenjesu/broodhome-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.0.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.0.png
diff --git a/sc2/content/base/ships/chenjesu/checap.1.png b/sc2/content/base/ships/chenjesu/broodhome-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.1.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.1.png
diff --git a/sc2/content/base/ships/chenjesu/checap.10.png b/sc2/content/base/ships/chenjesu/broodhome-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.10.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.10.png
diff --git a/sc2/content/base/ships/chenjesu/checap.11.png b/sc2/content/base/ships/chenjesu/broodhome-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.11.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.11.png
diff --git a/sc2/content/base/ships/chenjesu/checap.12.png b/sc2/content/base/ships/chenjesu/broodhome-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.12.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.12.png
diff --git a/sc2/content/base/ships/chenjesu/checap.13.png b/sc2/content/base/ships/chenjesu/broodhome-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.13.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.13.png
diff --git a/sc2/content/base/ships/chenjesu/checap.14.png b/sc2/content/base/ships/chenjesu/broodhome-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.14.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.14.png
diff --git a/sc2/content/base/ships/chenjesu/checap.2.png b/sc2/content/base/ships/chenjesu/broodhome-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.2.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.2.png
diff --git a/sc2/content/base/ships/chenjesu/checap.3.png b/sc2/content/base/ships/chenjesu/broodhome-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.3.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.3.png
diff --git a/sc2/content/base/ships/chenjesu/checap.4.png b/sc2/content/base/ships/chenjesu/broodhome-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.4.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.4.png
diff --git a/sc2/content/base/ships/chenjesu/checap.5.png b/sc2/content/base/ships/chenjesu/broodhome-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.5.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.5.png
diff --git a/sc2/content/base/ships/chenjesu/checap.6.png b/sc2/content/base/ships/chenjesu/broodhome-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.6.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.6.png
diff --git a/sc2/content/base/ships/chenjesu/checap.7.png b/sc2/content/base/ships/chenjesu/broodhome-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.7.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.7.png
diff --git a/sc2/content/base/ships/chenjesu/checap.8.png b/sc2/content/base/ships/chenjesu/broodhome-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.8.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.8.png
diff --git a/sc2/content/base/ships/chenjesu/checap.9.png b/sc2/content/base/ships/chenjesu/broodhome-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/checap.9.png
rename to sc2/content/base/ships/chenjesu/broodhome-cap.9.png
diff --git a/sc2/content/base/ships/chenjesu/broodhome-cap.ani b/sc2/content/base/ships/chenjesu/broodhome-cap.ani
new file mode 100644
index 000000000..b7dd97d7e
--- /dev/null
+++ b/sc2/content/base/ships/chenjesu/broodhome-cap.ani
@@ -0,0 +1,15 @@
+broodhome-cap.0.png -1 1 0 0
+broodhome-cap.1.png 1 1 -18 0
+broodhome-cap.2.png 1 1 -18 0
+broodhome-cap.3.png -1 1 -18 0
+broodhome-cap.4.png 1 1 -18 0
+broodhome-cap.5.png 1 1 -18 0
+broodhome-cap.6.png 1 1 -19 -13
+broodhome-cap.7.png 1 1 -15 -3
+broodhome-cap.8.png 1 1 -15 -3
+broodhome-cap.9.png 1 1 -20 -18
+broodhome-cap.10.png 1 1 -20 -13
+broodhome-cap.11.png 1 1 -20 -13
+broodhome-cap.12.png -1 1 0 -3
+broodhome-cap.13.png -1 1 0 -3
+broodhome-cap.14.png -1 1 0 -3
diff --git a/sc2/content/base/ships/chenjesu/cheicons.0.png b/sc2/content/base/ships/chenjesu/broodhome-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/cheicons.0.png
rename to sc2/content/base/ships/chenjesu/broodhome-icons.0.png
diff --git a/sc2/content/base/ships/chenjesu/cheicons.1.png b/sc2/content/base/ships/chenjesu/broodhome-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/cheicons.1.png
rename to sc2/content/base/ships/chenjesu/broodhome-icons.1.png
diff --git a/sc2/content/base/ships/chenjesu/broodhome-icons.ani b/sc2/content/base/ships/chenjesu/broodhome-icons.ani
new file mode 100644
index 000000000..6c8e0f3c9
--- /dev/null
+++ b/sc2/content/base/ships/chenjesu/broodhome-icons.ani
@@ -0,0 +1,2 @@
+broodhome-icons.0.png 0 1 0 0
+broodhome-icons.1.png 0 1 20 16
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.0.png b/sc2/content/base/ships/chenjesu/broodhome-med.0.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.0.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.0.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.1.png b/sc2/content/base/ships/chenjesu/broodhome-med.1.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.1.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.1.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.10.png b/sc2/content/base/ships/chenjesu/broodhome-med.10.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.10.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.10.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.11.png b/sc2/content/base/ships/chenjesu/broodhome-med.11.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.11.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.11.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.12.png b/sc2/content/base/ships/chenjesu/broodhome-med.12.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.12.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.12.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.13.png b/sc2/content/base/ships/chenjesu/broodhome-med.13.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.13.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.13.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.14.png b/sc2/content/base/ships/chenjesu/broodhome-med.14.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.14.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.14.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.15.png b/sc2/content/base/ships/chenjesu/broodhome-med.15.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.15.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.15.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.2.png b/sc2/content/base/ships/chenjesu/broodhome-med.2.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.2.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.2.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.3.png b/sc2/content/base/ships/chenjesu/broodhome-med.3.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.3.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.3.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.4.png b/sc2/content/base/ships/chenjesu/broodhome-med.4.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.4.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.4.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.5.png b/sc2/content/base/ships/chenjesu/broodhome-med.5.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.5.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.5.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.6.png b/sc2/content/base/ships/chenjesu/broodhome-med.6.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.6.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.6.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.7.png b/sc2/content/base/ships/chenjesu/broodhome-med.7.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.7.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.7.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.8.png b/sc2/content/base/ships/chenjesu/broodhome-med.8.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.8.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.8.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med.9.png b/sc2/content/base/ships/chenjesu/broodhome-med.9.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.med.9.png
rename to sc2/content/base/ships/chenjesu/broodhome-med.9.png
diff --git a/sc2/content/base/ships/chenjesu/broodhome-med.ani b/sc2/content/base/ships/chenjesu/broodhome-med.ani
new file mode 100644
index 000000000..d4211578e
--- /dev/null
+++ b/sc2/content/base/ships/chenjesu/broodhome-med.ani
@@ -0,0 +1,16 @@
+broodhome-med.0.png 0 1 9 8
+broodhome-med.1.png 0 1 8 8
+broodhome-med.2.png 0 1 8 8
+broodhome-med.3.png 0 1 10 7
+broodhome-med.4.png 0 1 11 8
+broodhome-med.5.png 0 1 10 8
+broodhome-med.6.png 0 1 8 8
+broodhome-med.7.png 0 1 8 9
+broodhome-med.8.png 0 1 9 10
+broodhome-med.9.png 0 1 9 9
+broodhome-med.10.png 0 1 8 8
+broodhome-med.11.png 0 1 10 8
+broodhome-med.12.png 0 1 10 8
+broodhome-med.13.png 0 1 10 7
+broodhome-med.14.png 0 1 8 8
+broodhome-med.15.png 0 1 9 8
diff --git a/sc2/content/base/ships/chenjesu/chemicon.0.png b/sc2/content/base/ships/chenjesu/broodhome-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chemicon.0.png
rename to sc2/content/base/ships/chenjesu/broodhome-meleeicons.0.png
diff --git a/sc2/content/base/ships/chenjesu/chemicon.1.png b/sc2/content/base/ships/chenjesu/broodhome-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chemicon.1.png
rename to sc2/content/base/ships/chenjesu/broodhome-meleeicons.1.png
diff --git a/sc2/content/base/ships/chenjesu/broodhome-meleeicons.ani b/sc2/content/base/ships/chenjesu/broodhome-meleeicons.ani
new file mode 100644
index 000000000..1ea0bbd63
--- /dev/null
+++ b/sc2/content/base/ships/chenjesu/broodhome-meleeicons.ani
@@ -0,0 +1,2 @@
+broodhome-meleeicons.0.png 0 1 16 16
+broodhome-meleeicons.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.0.png b/sc2/content/base/ships/chenjesu/broodhome-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.0.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.0.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.1.png b/sc2/content/base/ships/chenjesu/broodhome-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.1.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.1.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.10.png b/sc2/content/base/ships/chenjesu/broodhome-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.10.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.10.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.11.png b/sc2/content/base/ships/chenjesu/broodhome-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.11.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.11.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.12.png b/sc2/content/base/ships/chenjesu/broodhome-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.12.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.12.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.13.png b/sc2/content/base/ships/chenjesu/broodhome-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.13.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.13.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.14.png b/sc2/content/base/ships/chenjesu/broodhome-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.14.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.14.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.15.png b/sc2/content/base/ships/chenjesu/broodhome-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.15.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.15.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.2.png b/sc2/content/base/ships/chenjesu/broodhome-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.2.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.2.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.3.png b/sc2/content/base/ships/chenjesu/broodhome-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.3.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.3.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.4.png b/sc2/content/base/ships/chenjesu/broodhome-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.4.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.4.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.5.png b/sc2/content/base/ships/chenjesu/broodhome-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.5.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.5.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.6.png b/sc2/content/base/ships/chenjesu/broodhome-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.6.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.6.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.7.png b/sc2/content/base/ships/chenjesu/broodhome-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.7.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.7.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.8.png b/sc2/content/base/ships/chenjesu/broodhome-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.8.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.8.png
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml.9.png b/sc2/content/base/ships/chenjesu/broodhome-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chenjesu.sml.9.png
rename to sc2/content/base/ships/chenjesu/broodhome-sml.9.png
diff --git a/sc2/content/base/ships/chenjesu/broodhome-sml.ani b/sc2/content/base/ships/chenjesu/broodhome-sml.ani
new file mode 100644
index 000000000..092fecb26
--- /dev/null
+++ b/sc2/content/base/ships/chenjesu/broodhome-sml.ani
@@ -0,0 +1,16 @@
+broodhome-sml.0.png 0 1 4 4
+broodhome-sml.1.png 0 1 4 4
+broodhome-sml.2.png 0 1 4 4
+broodhome-sml.3.png 0 1 3 3
+broodhome-sml.4.png 0 1 5 4
+broodhome-sml.5.png 0 1 3 4
+broodhome-sml.6.png 0 1 4 4
+broodhome-sml.7.png 0 1 4 3
+broodhome-sml.8.png 0 1 4 4
+broodhome-sml.9.png 0 1 4 3
+broodhome-sml.10.png 0 1 4 4
+broodhome-sml.11.png 0 1 4 4
+broodhome-sml.12.png 0 1 4 4
+broodhome-sml.13.png 0 1 4 3
+broodhome-sml.14.png 0 1 4 4
+broodhome-sml.15.png 0 1 4 4
diff --git a/sc2/content/base/ships/chenjesu/cheditty.mod b/sc2/content/base/ships/chenjesu/broodhome.mod
similarity index 100%
rename from sc2/content/base/ships/chenjesu/cheditty.mod
rename to sc2/content/base/ships/chenjesu/broodhome.mod
diff --git a/sc2/content/base/ships/chenjesu/chesound.snd b/sc2/content/base/ships/chenjesu/broodhome.snd
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chesound.snd
rename to sc2/content/base/ships/chenjesu/broodhome.snd
diff --git a/sc2/content/base/ships/chenjesu/chetext.txt b/sc2/content/base/ships/chenjesu/broodhome.txt
similarity index 100%
rename from sc2/content/base/ships/chenjesu/chetext.txt
rename to sc2/content/base/ships/chenjesu/broodhome.txt
diff --git a/sc2/content/base/ships/chenjesu/checap.ani b/sc2/content/base/ships/chenjesu/checap.ani
deleted file mode 100644
index 6066ec625..000000000
--- a/sc2/content/base/ships/chenjesu/checap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-checap.0.png -1 1 0 0
-checap.1.png 1 1 -18 0
-checap.2.png 1 1 -18 0
-checap.3.png -1 1 -18 0
-checap.4.png 1 1 -18 0
-checap.5.png 1 1 -18 0
-checap.6.png 1 1 -19 -13
-checap.7.png 1 1 -15 -3
-checap.8.png 1 1 -15 -3
-checap.9.png 1 1 -20 -18
-checap.10.png 1 1 -20 -13
-checap.11.png 1 1 -20 -13
-checap.12.png -1 1 0 -3
-checap.13.png -1 1 0 -3
-checap.14.png -1 1 0 -3
diff --git a/sc2/content/base/ships/chenjesu/cheicons.ani b/sc2/content/base/ships/chenjesu/cheicons.ani
deleted file mode 100644
index a66383774..000000000
--- a/sc2/content/base/ships/chenjesu/cheicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-cheicons.0.png 0 1 0 0
-cheicons.1.png 0 1 20 16
diff --git a/sc2/content/base/ships/chenjesu/chemicon.ani b/sc2/content/base/ships/chenjesu/chemicon.ani
deleted file mode 100644
index af40ffaff..000000000
--- a/sc2/content/base/ships/chenjesu/chemicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-chemicon.0.png 0 1 16 16
-chemicon.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.big b/sc2/content/base/ships/chenjesu/chenjesu.big
deleted file mode 100644
index e2a0bac72..000000000
--- a/sc2/content/base/ships/chenjesu/chenjesu.big
+++ /dev/null
@@ -1,16 +0,0 @@
-chenjesu.big.0.png 0 1 16 13
-chenjesu.big.1.png 0 1 17 15
-chenjesu.big.2.png 0 1 16 17
-chenjesu.big.3.png 0 1 20 16
-chenjesu.big.4.png 0 1 21 15
-chenjesu.big.5.png 0 1 20 15
-chenjesu.big.6.png 0 1 16 15
-chenjesu.big.7.png 0 1 17 18
-chenjesu.big.8.png 0 1 16 19
-chenjesu.big.9.png 0 1 18 18
-chenjesu.big.10.png 0 1 20 15
-chenjesu.big.11.png 0 1 18 15
-chenjesu.big.12.png 0 1 16 15
-chenjesu.big.13.png 0 1 18 16
-chenjesu.big.14.png 0 1 20 17
-chenjesu.big.15.png 0 1 18 15
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.med b/sc2/content/base/ships/chenjesu/chenjesu.med
deleted file mode 100644
index 4d9641e8d..000000000
--- a/sc2/content/base/ships/chenjesu/chenjesu.med
+++ /dev/null
@@ -1,16 +0,0 @@
-chenjesu.med.0.png 0 1 9 8
-chenjesu.med.1.png 0 1 8 8
-chenjesu.med.2.png 0 1 8 8
-chenjesu.med.3.png 0 1 10 7
-chenjesu.med.4.png 0 1 11 8
-chenjesu.med.5.png 0 1 10 8
-chenjesu.med.6.png 0 1 8 8
-chenjesu.med.7.png 0 1 8 9
-chenjesu.med.8.png 0 1 9 10
-chenjesu.med.9.png 0 1 9 9
-chenjesu.med.10.png 0 1 8 8
-chenjesu.med.11.png 0 1 10 8
-chenjesu.med.12.png 0 1 10 8
-chenjesu.med.13.png 0 1 10 7
-chenjesu.med.14.png 0 1 8 8
-chenjesu.med.15.png 0 1 9 8
diff --git a/sc2/content/base/ships/chenjesu/chenjesu.sml b/sc2/content/base/ships/chenjesu/chenjesu.sml
deleted file mode 100644
index 04df5551e..000000000
--- a/sc2/content/base/ships/chenjesu/chenjesu.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-chenjesu.sml.0.png 0 1 4 4
-chenjesu.sml.1.png 0 1 4 4
-chenjesu.sml.2.png 0 1 4 4
-chenjesu.sml.3.png 0 1 3 3
-chenjesu.sml.4.png 0 1 5 4
-chenjesu.sml.5.png 0 1 3 4
-chenjesu.sml.6.png 0 1 4 4
-chenjesu.sml.7.png 0 1 4 3
-chenjesu.sml.8.png 0 1 4 4
-chenjesu.sml.9.png 0 1 4 3
-chenjesu.sml.10.png 0 1 4 4
-chenjesu.sml.11.png 0 1 4 4
-chenjesu.sml.12.png 0 1 4 4
-chenjesu.sml.13.png 0 1 4 3
-chenjesu.sml.14.png 0 1 4 4
-chenjesu.sml.15.png 0 1 4 4