diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 3efbcc2e..46f6e55e 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex
index 207a4bac..c4fba298 100644
Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ
diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl
index 6ed51429..4e423905 100644
Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ
diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt
index 7f531804..28abb5e8 100644
--- a/mpq/arr/portdata.txt
+++ b/mpq/arr/portdata.txt
@@ -305,8 +305,8 @@ Maverick (Golden)
 Auxine
 Boyeau
 Ferrum
-Extended Portrait #198
-Extended Portrait #199
+Prophet 1
+Prophet 2
 Extended Portrait #200
 Extended Portrait #201
 Extended Portrait #202
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index ab47a979..6c8ce8e9 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/portrait/askosi/advisor/fid00.smk b/mpq/portrait/a/advisor/fid00.smk
similarity index 100%
rename from mpq/portrait/askosi/advisor/fid00.smk
rename to mpq/portrait/a/advisor/fid00.smk
diff --git a/mpq/portrait/askosi/auxine/fid00.smk b/mpq/portrait/a/auxine/fid00.smk
similarity index 100%
rename from mpq/portrait/askosi/auxine/fid00.smk
rename to mpq/portrait/a/auxine/fid00.smk
diff --git a/mpq/portrait/askosi/auxine/tlk00.smk b/mpq/portrait/a/auxine/tlk00.smk
similarity index 100%
rename from mpq/portrait/askosi/auxine/tlk00.smk
rename to mpq/portrait/a/auxine/tlk00.smk
diff --git a/mpq/portrait/askosi/avatar/fid00.smk b/mpq/portrait/a/avatar/fid00.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/fid00.smk
rename to mpq/portrait/a/avatar/fid00.smk
diff --git a/mpq/portrait/askosi/avatar/fid01.smk b/mpq/portrait/a/avatar/fid01.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/fid01.smk
rename to mpq/portrait/a/avatar/fid01.smk
diff --git a/mpq/portrait/askosi/avatar/fid02.smk b/mpq/portrait/a/avatar/fid02.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/fid02.smk
rename to mpq/portrait/a/avatar/fid02.smk
diff --git a/mpq/portrait/askosi/avatar/fid03.smk b/mpq/portrait/a/avatar/fid03.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/fid03.smk
rename to mpq/portrait/a/avatar/fid03.smk
diff --git a/mpq/portrait/askosi/avatar/tlk00.smk b/mpq/portrait/a/avatar/tlk00.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/tlk00.smk
rename to mpq/portrait/a/avatar/tlk00.smk
diff --git a/mpq/portrait/askosi/avatar/tlk01.smk b/mpq/portrait/a/avatar/tlk01.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/tlk01.smk
rename to mpq/portrait/a/avatar/tlk01.smk
diff --git a/mpq/portrait/askosi/avatar/tlk02.smk b/mpq/portrait/a/avatar/tlk02.smk
similarity index 100%
rename from mpq/portrait/askosi/avatar/tlk02.smk
rename to mpq/portrait/a/avatar/tlk02.smk
diff --git a/mpq/portrait/faction/adherent/fid00.smk b/mpq/portrait/f/adherent/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/adherent/fid00.smk
rename to mpq/portrait/f/adherent/fid00.smk
diff --git a/mpq/portrait/faction/adherent/fid01.smk b/mpq/portrait/f/adherent/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/adherent/fid01.smk
rename to mpq/portrait/f/adherent/fid01.smk
diff --git a/mpq/portrait/faction/adherent/fid02.smk b/mpq/portrait/f/adherent/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/adherent/fid02.smk
rename to mpq/portrait/f/adherent/fid02.smk
diff --git a/mpq/portrait/faction/adherent/tlk00.smk b/mpq/portrait/f/adherent/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/adherent/tlk00.smk
rename to mpq/portrait/f/adherent/tlk00.smk
diff --git a/mpq/portrait/faction/adherent/tlk01.smk b/mpq/portrait/f/adherent/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/adherent/tlk01.smk
rename to mpq/portrait/f/adherent/tlk01.smk
diff --git a/mpq/portrait/faction/advisor_futuristfederation/fid00.smk b/mpq/portrait/f/advisor_futuristfederation/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_futuristfederation/fid00.smk
rename to mpq/portrait/f/advisor_futuristfederation/fid00.smk
diff --git a/mpq/portrait/faction/advisor_futuristfederation/fid01.smk b/mpq/portrait/f/advisor_futuristfederation/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_futuristfederation/fid01.smk
rename to mpq/portrait/f/advisor_futuristfederation/fid01.smk
diff --git a/mpq/portrait/faction/advisor_futuristfederation/tlk00.smk b/mpq/portrait/f/advisor_futuristfederation/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_futuristfederation/tlk00.smk
rename to mpq/portrait/f/advisor_futuristfederation/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_goldenrepublic/fid00.smk b/mpq/portrait/f/advisor_goldenrepublic/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_goldenrepublic/fid00.smk
rename to mpq/portrait/f/advisor_goldenrepublic/fid00.smk
diff --git a/mpq/portrait/faction/advisor_goldenrepublic/tlk00.smk b/mpq/portrait/f/advisor_goldenrepublic/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_goldenrepublic/tlk00.smk
rename to mpq/portrait/f/advisor_goldenrepublic/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_imicren/fid00.smk b/mpq/portrait/f/advisor_imicren/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_imicren/fid00.smk
rename to mpq/portrait/f/advisor_imicren/fid00.smk
diff --git a/mpq/portrait/faction/advisor_khalendricknights/fid00.smk b/mpq/portrait/f/advisor_khalendricknights/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_khalendricknights/fid00.smk
rename to mpq/portrait/f/advisor_khalendricknights/fid00.smk
diff --git a/mpq/portrait/faction/advisor_khalendricknights/fid01.smk b/mpq/portrait/f/advisor_khalendricknights/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_khalendricknights/fid01.smk
rename to mpq/portrait/f/advisor_khalendricknights/fid01.smk
diff --git a/mpq/portrait/faction/advisor_khalendricknights/tlk00.smk b/mpq/portrait/f/advisor_khalendricknights/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_khalendricknights/tlk00.smk
rename to mpq/portrait/f/advisor_khalendricknights/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_nydustrinity/fid00.smk b/mpq/portrait/f/advisor_nydustrinity/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_nydustrinity/fid00.smk
rename to mpq/portrait/f/advisor_nydustrinity/fid00.smk
diff --git a/mpq/portrait/faction/advisor_nydustrinity/fid01.smk b/mpq/portrait/f/advisor_nydustrinity/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_nydustrinity/fid01.smk
rename to mpq/portrait/f/advisor_nydustrinity/fid01.smk
diff --git a/mpq/portrait/faction/advisor_nydustrinity/fid02.smk b/mpq/portrait/f/advisor_nydustrinity/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_nydustrinity/fid02.smk
rename to mpq/portrait/f/advisor_nydustrinity/fid02.smk
diff --git a/mpq/portrait/faction/advisor_nydustrinity/tlk00.smk b/mpq/portrait/f/advisor_nydustrinity/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_nydustrinity/tlk00.smk
rename to mpq/portrait/f/advisor_nydustrinity/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_nydustrinity/tlk01.smk b/mpq/portrait/f/advisor_nydustrinity/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_nydustrinity/tlk01.smk
rename to mpq/portrait/f/advisor_nydustrinity/tlk01.smk
diff --git a/mpq/portrait/faction/advisor_nydustrinity/tlk02.smk b/mpq/portrait/f/advisor_nydustrinity/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_nydustrinity/tlk02.smk
rename to mpq/portrait/f/advisor_nydustrinity/tlk02.smk
diff --git a/mpq/portrait/faction/advisor_orkoti/fid00.smk b/mpq/portrait/f/advisor_orkoti/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_orkoti/fid00.smk
rename to mpq/portrait/f/advisor_orkoti/fid00.smk
diff --git a/mpq/portrait/faction/advisor_orkoti/fid01.smk b/mpq/portrait/f/advisor_orkoti/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_orkoti/fid01.smk
rename to mpq/portrait/f/advisor_orkoti/fid01.smk
diff --git a/mpq/portrait/faction/advisor_orkoti/fid02.smk b/mpq/portrait/f/advisor_orkoti/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_orkoti/fid02.smk
rename to mpq/portrait/f/advisor_orkoti/fid02.smk
diff --git a/mpq/portrait/faction/advisor_orkoti/tlk00.smk b/mpq/portrait/f/advisor_orkoti/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_orkoti/tlk00.smk
rename to mpq/portrait/f/advisor_orkoti/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_orkoti/tlk01.smk b/mpq/portrait/f/advisor_orkoti/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_orkoti/tlk01.smk
rename to mpq/portrait/f/advisor_orkoti/tlk01.smk
diff --git a/mpq/portrait/faction/advisor_starbound/fid00.smk b/mpq/portrait/f/advisor_starbound/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_starbound/fid00.smk
rename to mpq/portrait/f/advisor_starbound/fid00.smk
diff --git a/mpq/portrait/faction/advisor_upstartterran/fid00.smk b/mpq/portrait/f/advisor_upstartterran/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_upstartterran/fid00.smk
rename to mpq/portrait/f/advisor_upstartterran/fid00.smk
diff --git a/mpq/portrait/faction/advisor_upstartterran/tlk00.smk b/mpq/portrait/f/advisor_upstartterran/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_upstartterran/tlk00.smk
rename to mpq/portrait/f/advisor_upstartterran/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_upstartterran/tlk01.smk b/mpq/portrait/f/advisor_upstartterran/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_upstartterran/tlk01.smk
rename to mpq/portrait/f/advisor_upstartterran/tlk01.smk
diff --git a/mpq/portrait/faction/advisor_zorthos/fid00.smk b/mpq/portrait/f/advisor_zorthos/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_zorthos/fid00.smk
rename to mpq/portrait/f/advisor_zorthos/fid00.smk
diff --git a/mpq/portrait/faction/advisor_zorthos/fid01.smk b/mpq/portrait/f/advisor_zorthos/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_zorthos/fid01.smk
rename to mpq/portrait/f/advisor_zorthos/fid01.smk
diff --git a/mpq/portrait/faction/advisor_zorthos/fid02.smk b/mpq/portrait/f/advisor_zorthos/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_zorthos/fid02.smk
rename to mpq/portrait/f/advisor_zorthos/fid02.smk
diff --git a/mpq/portrait/faction/advisor_zorthos/fid03.smk b/mpq/portrait/f/advisor_zorthos/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_zorthos/fid03.smk
rename to mpq/portrait/f/advisor_zorthos/fid03.smk
diff --git a/mpq/portrait/faction/advisor_zorthos/tlk00.smk b/mpq/portrait/f/advisor_zorthos/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_zorthos/tlk00.smk
rename to mpq/portrait/f/advisor_zorthos/tlk00.smk
diff --git a/mpq/portrait/faction/advisor_zorthos/tlk01.smk b/mpq/portrait/f/advisor_zorthos/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/advisor_zorthos/tlk01.smk
rename to mpq/portrait/f/advisor_zorthos/tlk01.smk
diff --git a/mpq/portrait/faction/arhaun/fid00.smk b/mpq/portrait/f/arhaun/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/arhaun/fid00.smk
rename to mpq/portrait/f/arhaun/fid00.smk
diff --git a/mpq/portrait/faction/arhaun/fid01.smk b/mpq/portrait/f/arhaun/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/arhaun/fid01.smk
rename to mpq/portrait/f/arhaun/fid01.smk
diff --git a/mpq/portrait/faction/arhaun/fid02.smk b/mpq/portrait/f/arhaun/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/arhaun/fid02.smk
rename to mpq/portrait/f/arhaun/fid02.smk
diff --git a/mpq/portrait/faction/arhaun/tlk00.smk b/mpq/portrait/f/arhaun/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/arhaun/tlk00.smk
rename to mpq/portrait/f/arhaun/tlk00.smk
diff --git a/mpq/portrait/faction/arhaun/tlk01.smk b/mpq/portrait/f/arhaun/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/arhaun/tlk01.smk
rename to mpq/portrait/f/arhaun/tlk01.smk
diff --git a/mpq/portrait/faction/ashguard/fid00.smk b/mpq/portrait/f/ashguard/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/ashguard/fid00.smk
rename to mpq/portrait/f/ashguard/fid00.smk
diff --git a/mpq/portrait/faction/ashguard/fid01.smk b/mpq/portrait/f/ashguard/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/ashguard/fid01.smk
rename to mpq/portrait/f/ashguard/fid01.smk
diff --git a/mpq/portrait/faction/ashguard/tlk00.smk b/mpq/portrait/f/ashguard/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/ashguard/tlk00.smk
rename to mpq/portrait/f/ashguard/tlk00.smk
diff --git a/mpq/portrait/faction/ashguard/tlk01.smk b/mpq/portrait/f/ashguard/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/ashguard/tlk01.smk
rename to mpq/portrait/f/ashguard/tlk01.smk
diff --git a/mpq/portrait/faction/auriel/fid00.smk b/mpq/portrait/f/auriel/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/auriel/fid00.smk
rename to mpq/portrait/f/auriel/fid00.smk
diff --git a/mpq/portrait/faction/auriel/fid01.smk b/mpq/portrait/f/auriel/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/auriel/fid01.smk
rename to mpq/portrait/f/auriel/fid01.smk
diff --git a/mpq/portrait/faction/auriel/tlk00.smk b/mpq/portrait/f/auriel/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/auriel/tlk00.smk
rename to mpq/portrait/f/auriel/tlk00.smk
diff --git a/mpq/portrait/faction/auriel/tlk01.smk b/mpq/portrait/f/auriel/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/auriel/tlk01.smk
rename to mpq/portrait/f/auriel/tlk01.smk
diff --git a/mpq/portrait/faction/blackguard/fid00.smk b/mpq/portrait/f/blackguard/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/blackguard/fid00.smk
rename to mpq/portrait/f/blackguard/fid00.smk
diff --git a/mpq/portrait/faction/blackguard/fid01.smk b/mpq/portrait/f/blackguard/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/blackguard/fid01.smk
rename to mpq/portrait/f/blackguard/fid01.smk
diff --git a/mpq/portrait/faction/blackguard/fid02.smk b/mpq/portrait/f/blackguard/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/blackguard/fid02.smk
rename to mpq/portrait/f/blackguard/fid02.smk
diff --git a/mpq/portrait/faction/blackguard/tlk00.smk b/mpq/portrait/f/blackguard/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/blackguard/tlk00.smk
rename to mpq/portrait/f/blackguard/tlk00.smk
diff --git a/mpq/portrait/faction/blackguard/tlk01.smk b/mpq/portrait/f/blackguard/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/blackguard/tlk01.smk
rename to mpq/portrait/f/blackguard/tlk01.smk
diff --git a/mpq/portrait/faction/blackjack_golden/fid00.smk b/mpq/portrait/f/blackjack_golden/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/blackjack_golden/fid00.smk
rename to mpq/portrait/f/blackjack_golden/fid00.smk
diff --git a/mpq/portrait/faction/blackjack_golden/fid01.smk b/mpq/portrait/f/blackjack_golden/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/blackjack_golden/fid01.smk
rename to mpq/portrait/f/blackjack_golden/fid01.smk
diff --git a/mpq/portrait/faction/blackjack_golden/fid02.smk b/mpq/portrait/f/blackjack_golden/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/blackjack_golden/fid02.smk
rename to mpq/portrait/f/blackjack_golden/fid02.smk
diff --git a/mpq/portrait/faction/blackjack_golden/tlk00.smk b/mpq/portrait/f/blackjack_golden/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/blackjack_golden/tlk00.smk
rename to mpq/portrait/f/blackjack_golden/tlk00.smk
diff --git a/mpq/portrait/faction/blackjack_golden/tlk01.smk b/mpq/portrait/f/blackjack_golden/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/blackjack_golden/tlk01.smk
rename to mpq/portrait/f/blackjack_golden/tlk01.smk
diff --git a/mpq/portrait/faction/blackjack_golden/tlk02.smk b/mpq/portrait/f/blackjack_golden/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/blackjack_golden/tlk02.smk
rename to mpq/portrait/f/blackjack_golden/tlk02.smk
diff --git a/mpq/portrait/faction/cicatus/fid00.smk b/mpq/portrait/f/cicatus/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/fid00.smk
rename to mpq/portrait/f/cicatus/fid00.smk
diff --git a/mpq/portrait/faction/cicatus/fid01.smk b/mpq/portrait/f/cicatus/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/fid01.smk
rename to mpq/portrait/f/cicatus/fid01.smk
diff --git a/mpq/portrait/faction/cicatus/fid02.smk b/mpq/portrait/f/cicatus/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/fid02.smk
rename to mpq/portrait/f/cicatus/fid02.smk
diff --git a/mpq/portrait/faction/cicatus/fid03.smk b/mpq/portrait/f/cicatus/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/fid03.smk
rename to mpq/portrait/f/cicatus/fid03.smk
diff --git a/mpq/portrait/faction/cicatus/tlk00.smk b/mpq/portrait/f/cicatus/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/tlk00.smk
rename to mpq/portrait/f/cicatus/tlk00.smk
diff --git a/mpq/portrait/faction/cicatus/tlk01.smk b/mpq/portrait/f/cicatus/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/tlk01.smk
rename to mpq/portrait/f/cicatus/tlk01.smk
diff --git a/mpq/portrait/faction/cicatus/tlk02.smk b/mpq/portrait/f/cicatus/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/cicatus/tlk02.smk
rename to mpq/portrait/f/cicatus/tlk02.smk
diff --git a/mpq/portrait/faction/cleric_futurist/fid00.smk b/mpq/portrait/f/cleric_futurist/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/fid00.smk
rename to mpq/portrait/f/cleric_futurist/fid00.smk
diff --git a/mpq/portrait/faction/cleric_futurist/fid01.smk b/mpq/portrait/f/cleric_futurist/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/fid01.smk
rename to mpq/portrait/f/cleric_futurist/fid01.smk
diff --git a/mpq/portrait/faction/cleric_futurist/fid02.smk b/mpq/portrait/f/cleric_futurist/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/fid02.smk
rename to mpq/portrait/f/cleric_futurist/fid02.smk
diff --git a/mpq/portrait/faction/cleric_futurist/fid03.smk b/mpq/portrait/f/cleric_futurist/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/fid03.smk
rename to mpq/portrait/f/cleric_futurist/fid03.smk
diff --git a/mpq/portrait/faction/cleric_futurist/tlk00.smk b/mpq/portrait/f/cleric_futurist/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/tlk00.smk
rename to mpq/portrait/f/cleric_futurist/tlk00.smk
diff --git a/mpq/portrait/faction/cleric_futurist/tlk01.smk b/mpq/portrait/f/cleric_futurist/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/tlk01.smk
rename to mpq/portrait/f/cleric_futurist/tlk01.smk
diff --git a/mpq/portrait/faction/cleric_futurist/tlk02.smk b/mpq/portrait/f/cleric_futurist/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/cleric_futurist/tlk02.smk
rename to mpq/portrait/f/cleric_futurist/tlk02.smk
diff --git a/mpq/portrait/faction/cyclops_futurist/fid00.smk b/mpq/portrait/f/cyclops_futurist/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/cyclops_futurist/fid00.smk
rename to mpq/portrait/f/cyclops_futurist/fid00.smk
diff --git a/mpq/portrait/faction/cyclops_futurist/fid01.smk b/mpq/portrait/f/cyclops_futurist/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/cyclops_futurist/fid01.smk
rename to mpq/portrait/f/cyclops_futurist/fid01.smk
diff --git a/mpq/portrait/faction/cyclops_futurist/tlk00.smk b/mpq/portrait/f/cyclops_futurist/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/cyclops_futurist/tlk00.smk
rename to mpq/portrait/f/cyclops_futurist/tlk00.smk
diff --git a/mpq/portrait/faction/cyclops_futurist/tlk01.smk b/mpq/portrait/f/cyclops_futurist/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/cyclops_futurist/tlk01.smk
rename to mpq/portrait/f/cyclops_futurist/tlk01.smk
diff --git a/mpq/portrait/faction/dracadin_order/fid00.smk b/mpq/portrait/f/dracadin_order/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/fid00.smk
rename to mpq/portrait/f/dracadin_order/fid00.smk
diff --git a/mpq/portrait/faction/dracadin_order/fid01.smk b/mpq/portrait/f/dracadin_order/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/fid01.smk
rename to mpq/portrait/f/dracadin_order/fid01.smk
diff --git a/mpq/portrait/faction/dracadin_order/fid02.smk b/mpq/portrait/f/dracadin_order/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/fid02.smk
rename to mpq/portrait/f/dracadin_order/fid02.smk
diff --git a/mpq/portrait/faction/dracadin_order/fid03.smk b/mpq/portrait/f/dracadin_order/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/fid03.smk
rename to mpq/portrait/f/dracadin_order/fid03.smk
diff --git a/mpq/portrait/faction/dracadin_order/tlk00.smk b/mpq/portrait/f/dracadin_order/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/tlk00.smk
rename to mpq/portrait/f/dracadin_order/tlk00.smk
diff --git a/mpq/portrait/faction/dracadin_order/tlk01.smk b/mpq/portrait/f/dracadin_order/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/tlk01.smk
rename to mpq/portrait/f/dracadin_order/tlk01.smk
diff --git a/mpq/portrait/faction/dracadin_order/tlk02.smk b/mpq/portrait/f/dracadin_order/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/dracadin_order/tlk02.smk
rename to mpq/portrait/f/dracadin_order/tlk02.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/fid00.smk b/mpq/portrait/f/ecclesiast_astral/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/fid00.smk
rename to mpq/portrait/f/ecclesiast_astral/fid00.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/fid01.smk b/mpq/portrait/f/ecclesiast_astral/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/fid01.smk
rename to mpq/portrait/f/ecclesiast_astral/fid01.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/fid02.smk b/mpq/portrait/f/ecclesiast_astral/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/fid02.smk
rename to mpq/portrait/f/ecclesiast_astral/fid02.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/fid03.smk b/mpq/portrait/f/ecclesiast_astral/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/fid03.smk
rename to mpq/portrait/f/ecclesiast_astral/fid03.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/tlk00.smk b/mpq/portrait/f/ecclesiast_astral/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/tlk00.smk
rename to mpq/portrait/f/ecclesiast_astral/tlk00.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/tlk01.smk b/mpq/portrait/f/ecclesiast_astral/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/tlk01.smk
rename to mpq/portrait/f/ecclesiast_astral/tlk01.smk
diff --git a/mpq/portrait/faction/ecclesiast_astral/tlk02.smk b/mpq/portrait/f/ecclesiast_astral/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_astral/tlk02.smk
rename to mpq/portrait/f/ecclesiast_astral/tlk02.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid00.smk b/mpq/portrait/f/ecclesiast_khalendric/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/fid00.smk
rename to mpq/portrait/f/ecclesiast_khalendric/fid00.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid01.smk b/mpq/portrait/f/ecclesiast_khalendric/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/fid01.smk
rename to mpq/portrait/f/ecclesiast_khalendric/fid01.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid02.smk b/mpq/portrait/f/ecclesiast_khalendric/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/fid02.smk
rename to mpq/portrait/f/ecclesiast_khalendric/fid02.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid03.smk b/mpq/portrait/f/ecclesiast_khalendric/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/fid03.smk
rename to mpq/portrait/f/ecclesiast_khalendric/fid03.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/tlk00.smk b/mpq/portrait/f/ecclesiast_khalendric/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/tlk00.smk
rename to mpq/portrait/f/ecclesiast_khalendric/tlk00.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/tlk01.smk b/mpq/portrait/f/ecclesiast_khalendric/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/tlk01.smk
rename to mpq/portrait/f/ecclesiast_khalendric/tlk01.smk
diff --git a/mpq/portrait/faction/ecclesiast_khalendric/tlk02.smk b/mpq/portrait/f/ecclesiast_khalendric/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/ecclesiast_khalendric/tlk02.smk
rename to mpq/portrait/f/ecclesiast_khalendric/tlk02.smk
diff --git a/mpq/portrait/faction/eidolon_nydus/fid00.smk b/mpq/portrait/f/eidolon_nydus/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/eidolon_nydus/fid00.smk
rename to mpq/portrait/f/eidolon_nydus/fid00.smk
diff --git a/mpq/portrait/faction/eidolon_nydus/fid01.smk b/mpq/portrait/f/eidolon_nydus/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/eidolon_nydus/fid01.smk
rename to mpq/portrait/f/eidolon_nydus/fid01.smk
diff --git a/mpq/portrait/faction/eidolon_nydus/tlk00.smk b/mpq/portrait/f/eidolon_nydus/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/eidolon_nydus/tlk00.smk
rename to mpq/portrait/f/eidolon_nydus/tlk00.smk
diff --git a/mpq/portrait/faction/extatus/fid00.smk b/mpq/portrait/f/extatus/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/fid00.smk
rename to mpq/portrait/f/extatus/fid00.smk
diff --git a/mpq/portrait/faction/extatus/fid01.smk b/mpq/portrait/f/extatus/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/fid01.smk
rename to mpq/portrait/f/extatus/fid01.smk
diff --git a/mpq/portrait/faction/extatus/fid02.smk b/mpq/portrait/f/extatus/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/fid02.smk
rename to mpq/portrait/f/extatus/fid02.smk
diff --git a/mpq/portrait/faction/extatus/fid03.smk b/mpq/portrait/f/extatus/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/fid03.smk
rename to mpq/portrait/f/extatus/fid03.smk
diff --git a/mpq/portrait/faction/extatus/tlk00.smk b/mpq/portrait/f/extatus/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/tlk00.smk
rename to mpq/portrait/f/extatus/tlk00.smk
diff --git a/mpq/portrait/faction/extatus/tlk01.smk b/mpq/portrait/f/extatus/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/tlk01.smk
rename to mpq/portrait/f/extatus/tlk01.smk
diff --git a/mpq/portrait/faction/extatus/tlk02.smk b/mpq/portrait/f/extatus/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/extatus/tlk02.smk
rename to mpq/portrait/f/extatus/tlk02.smk
diff --git a/mpq/portrait/faction/harakan_golden/fid00.smk b/mpq/portrait/f/harakan_golden/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/harakan_golden/fid00.smk
rename to mpq/portrait/f/harakan_golden/fid00.smk
diff --git a/mpq/portrait/faction/harakan_golden/fid01.smk b/mpq/portrait/f/harakan_golden/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/harakan_golden/fid01.smk
rename to mpq/portrait/f/harakan_golden/fid01.smk
diff --git a/mpq/portrait/faction/harakan_golden/fid02.smk b/mpq/portrait/f/harakan_golden/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/harakan_golden/fid02.smk
rename to mpq/portrait/f/harakan_golden/fid02.smk
diff --git a/mpq/portrait/faction/harakan_golden/fid03.smk b/mpq/portrait/f/harakan_golden/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/harakan_golden/fid03.smk
rename to mpq/portrait/f/harakan_golden/fid03.smk
diff --git a/mpq/portrait/faction/harakan_golden/tlk00.smk b/mpq/portrait/f/harakan_golden/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/harakan_golden/tlk00.smk
rename to mpq/portrait/f/harakan_golden/tlk00.smk
diff --git a/mpq/portrait/faction/harakan_golden/tlk01.smk b/mpq/portrait/f/harakan_golden/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/harakan_golden/tlk01.smk
rename to mpq/portrait/f/harakan_golden/tlk01.smk
diff --git a/mpq/portrait/faction/hotshot/fid00.smk b/mpq/portrait/f/hotshot/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/hotshot/fid00.smk
rename to mpq/portrait/f/hotshot/fid00.smk
diff --git a/mpq/portrait/faction/hotshot/tlk00.smk b/mpq/portrait/f/hotshot/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/hotshot/tlk00.smk
rename to mpq/portrait/f/hotshot/tlk00.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid00.smk b/mpq/portrait/f/hydralisk_orkoti/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/fid00.smk
rename to mpq/portrait/f/hydralisk_orkoti/fid00.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid01.smk b/mpq/portrait/f/hydralisk_orkoti/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/fid01.smk
rename to mpq/portrait/f/hydralisk_orkoti/fid01.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid02.smk b/mpq/portrait/f/hydralisk_orkoti/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/fid02.smk
rename to mpq/portrait/f/hydralisk_orkoti/fid02.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid03.smk b/mpq/portrait/f/hydralisk_orkoti/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/fid03.smk
rename to mpq/portrait/f/hydralisk_orkoti/fid03.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/tlk00.smk b/mpq/portrait/f/hydralisk_orkoti/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/tlk00.smk
rename to mpq/portrait/f/hydralisk_orkoti/tlk00.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/tlk01.smk b/mpq/portrait/f/hydralisk_orkoti/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/tlk01.smk
rename to mpq/portrait/f/hydralisk_orkoti/tlk01.smk
diff --git a/mpq/portrait/faction/hydralisk_orkoti/tlk02.smk b/mpq/portrait/f/hydralisk_orkoti/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/hydralisk_orkoti/tlk02.smk
rename to mpq/portrait/f/hydralisk_orkoti/tlk02.smk
diff --git a/mpq/portrait/faction/inzorthrokor/fid00.smk b/mpq/portrait/f/inzorthrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/inzorthrokor/fid00.smk
rename to mpq/portrait/f/inzorthrokor/fid00.smk
diff --git a/mpq/portrait/faction/inzorthrokor/tlk00.smk b/mpq/portrait/f/inzorthrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/inzorthrokor/tlk00.smk
rename to mpq/portrait/f/inzorthrokor/tlk00.smk
diff --git a/mpq/portrait/faction/iziralisk/fid00.smk b/mpq/portrait/f/iziralisk/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/iziralisk/fid00.smk
rename to mpq/portrait/f/iziralisk/fid00.smk
diff --git a/mpq/portrait/faction/iziralisk/fid01.smk b/mpq/portrait/f/iziralisk/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/iziralisk/fid01.smk
rename to mpq/portrait/f/iziralisk/fid01.smk
diff --git a/mpq/portrait/faction/iziralisk/tlk00.smk b/mpq/portrait/f/iziralisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/iziralisk/tlk00.smk
rename to mpq/portrait/f/iziralisk/tlk00.smk
diff --git a/mpq/portrait/faction/manifold_starbound/fid00.smk b/mpq/portrait/f/manifold_starbound/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/fid00.smk
rename to mpq/portrait/f/manifold_starbound/fid00.smk
diff --git a/mpq/portrait/faction/manifold_starbound/fid01.smk b/mpq/portrait/f/manifold_starbound/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/fid01.smk
rename to mpq/portrait/f/manifold_starbound/fid01.smk
diff --git a/mpq/portrait/faction/manifold_starbound/fid02.smk b/mpq/portrait/f/manifold_starbound/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/fid02.smk
rename to mpq/portrait/f/manifold_starbound/fid02.smk
diff --git a/mpq/portrait/faction/manifold_starbound/fid03.smk b/mpq/portrait/f/manifold_starbound/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/fid03.smk
rename to mpq/portrait/f/manifold_starbound/fid03.smk
diff --git a/mpq/portrait/faction/manifold_starbound/tlk00.smk b/mpq/portrait/f/manifold_starbound/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/tlk00.smk
rename to mpq/portrait/f/manifold_starbound/tlk00.smk
diff --git a/mpq/portrait/faction/manifold_starbound/tlk01.smk b/mpq/portrait/f/manifold_starbound/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/tlk01.smk
rename to mpq/portrait/f/manifold_starbound/tlk01.smk
diff --git a/mpq/portrait/faction/manifold_starbound/tlk02.smk b/mpq/portrait/f/manifold_starbound/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/manifold_starbound/tlk02.smk
rename to mpq/portrait/f/manifold_starbound/tlk02.smk
diff --git a/mpq/portrait/faction/maverick_futurist/fid00.smk b/mpq/portrait/f/maverick_futurist/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/fid00.smk
rename to mpq/portrait/f/maverick_futurist/fid00.smk
diff --git a/mpq/portrait/faction/maverick_futurist/fid01.smk b/mpq/portrait/f/maverick_futurist/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/fid01.smk
rename to mpq/portrait/f/maverick_futurist/fid01.smk
diff --git a/mpq/portrait/faction/maverick_futurist/fid02.smk b/mpq/portrait/f/maverick_futurist/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/fid02.smk
rename to mpq/portrait/f/maverick_futurist/fid02.smk
diff --git a/mpq/portrait/faction/maverick_futurist/fid03.smk b/mpq/portrait/f/maverick_futurist/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/fid03.smk
rename to mpq/portrait/f/maverick_futurist/fid03.smk
diff --git a/mpq/portrait/faction/maverick_futurist/tlk00.smk b/mpq/portrait/f/maverick_futurist/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/tlk00.smk
rename to mpq/portrait/f/maverick_futurist/tlk00.smk
diff --git a/mpq/portrait/faction/maverick_futurist/tlk01.smk b/mpq/portrait/f/maverick_futurist/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/tlk01.smk
rename to mpq/portrait/f/maverick_futurist/tlk01.smk
diff --git a/mpq/portrait/faction/maverick_futurist/tlk02.smk b/mpq/portrait/f/maverick_futurist/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_futurist/tlk02.smk
rename to mpq/portrait/f/maverick_futurist/tlk02.smk
diff --git a/mpq/portrait/faction/maverick_golden/fid00.smk b/mpq/portrait/f/maverick_golden/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/fid00.smk
rename to mpq/portrait/f/maverick_golden/fid00.smk
diff --git a/mpq/portrait/faction/maverick_golden/fid01.smk b/mpq/portrait/f/maverick_golden/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/fid01.smk
rename to mpq/portrait/f/maverick_golden/fid01.smk
diff --git a/mpq/portrait/faction/maverick_golden/fid02.smk b/mpq/portrait/f/maverick_golden/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/fid02.smk
rename to mpq/portrait/f/maverick_golden/fid02.smk
diff --git a/mpq/portrait/faction/maverick_golden/fid03.smk b/mpq/portrait/f/maverick_golden/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/fid03.smk
rename to mpq/portrait/f/maverick_golden/fid03.smk
diff --git a/mpq/portrait/faction/maverick_golden/tlk00.smk b/mpq/portrait/f/maverick_golden/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/tlk00.smk
rename to mpq/portrait/f/maverick_golden/tlk00.smk
diff --git a/mpq/portrait/faction/maverick_golden/tlk01.smk b/mpq/portrait/f/maverick_golden/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/tlk01.smk
rename to mpq/portrait/f/maverick_golden/tlk01.smk
diff --git a/mpq/portrait/faction/maverick_golden/tlk02.smk b/mpq/portrait/f/maverick_golden/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_golden/tlk02.smk
rename to mpq/portrait/f/maverick_golden/tlk02.smk
diff --git a/mpq/portrait/faction/maverick_upstart/fid00.smk b/mpq/portrait/f/maverick_upstart/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/fid00.smk
rename to mpq/portrait/f/maverick_upstart/fid00.smk
diff --git a/mpq/portrait/faction/maverick_upstart/fid01.smk b/mpq/portrait/f/maverick_upstart/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/fid01.smk
rename to mpq/portrait/f/maverick_upstart/fid01.smk
diff --git a/mpq/portrait/faction/maverick_upstart/fid02.smk b/mpq/portrait/f/maverick_upstart/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/fid02.smk
rename to mpq/portrait/f/maverick_upstart/fid02.smk
diff --git a/mpq/portrait/faction/maverick_upstart/fid03.smk b/mpq/portrait/f/maverick_upstart/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/fid03.smk
rename to mpq/portrait/f/maverick_upstart/fid03.smk
diff --git a/mpq/portrait/faction/maverick_upstart/tlk00.smk b/mpq/portrait/f/maverick_upstart/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/tlk00.smk
rename to mpq/portrait/f/maverick_upstart/tlk00.smk
diff --git a/mpq/portrait/faction/maverick_upstart/tlk01.smk b/mpq/portrait/f/maverick_upstart/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/tlk01.smk
rename to mpq/portrait/f/maverick_upstart/tlk01.smk
diff --git a/mpq/portrait/faction/maverick_upstart/tlk02.smk b/mpq/portrait/f/maverick_upstart/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/maverick_upstart/tlk02.smk
rename to mpq/portrait/f/maverick_upstart/tlk02.smk
diff --git a/mpq/portrait/faction/nathrelisk/fid00.smk b/mpq/portrait/f/nathrelisk/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/nathrelisk/fid00.smk
rename to mpq/portrait/f/nathrelisk/fid00.smk
diff --git a/mpq/portrait/faction/nathrelisk/fid01.smk b/mpq/portrait/f/nathrelisk/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/nathrelisk/fid01.smk
rename to mpq/portrait/f/nathrelisk/fid01.smk
diff --git a/mpq/portrait/faction/nathrelisk/fid02.smk b/mpq/portrait/f/nathrelisk/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/nathrelisk/fid02.smk
rename to mpq/portrait/f/nathrelisk/fid02.smk
diff --git a/mpq/portrait/faction/nathrelisk/fid03.smk b/mpq/portrait/f/nathrelisk/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/nathrelisk/fid03.smk
rename to mpq/portrait/f/nathrelisk/fid03.smk
diff --git a/mpq/portrait/faction/nathrelisk/tlk00.smk b/mpq/portrait/f/nathrelisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/nathrelisk/tlk00.smk
rename to mpq/portrait/f/nathrelisk/tlk00.smk
diff --git a/mpq/portrait/faction/philoc/fid00.smk b/mpq/portrait/f/philoc/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/philoc/fid00.smk
rename to mpq/portrait/f/philoc/fid00.smk
diff --git a/mpq/portrait/faction/philoc/tlk00.smk b/mpq/portrait/f/philoc/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/philoc/tlk00.smk
rename to mpq/portrait/f/philoc/tlk00.smk
diff --git a/mpq/portrait/faction/qilin/fid00.smk b/mpq/portrait/f/qilin/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/fid00.smk
rename to mpq/portrait/f/qilin/fid00.smk
diff --git a/mpq/portrait/faction/qilin/fid01.smk b/mpq/portrait/f/qilin/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/fid01.smk
rename to mpq/portrait/f/qilin/fid01.smk
diff --git a/mpq/portrait/faction/qilin/fid02.smk b/mpq/portrait/f/qilin/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/fid02.smk
rename to mpq/portrait/f/qilin/fid02.smk
diff --git a/mpq/portrait/faction/qilin/fid03.smk b/mpq/portrait/f/qilin/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/fid03.smk
rename to mpq/portrait/f/qilin/fid03.smk
diff --git a/mpq/portrait/faction/qilin/tlk00.smk b/mpq/portrait/f/qilin/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/tlk00.smk
rename to mpq/portrait/f/qilin/tlk00.smk
diff --git a/mpq/portrait/faction/qilin/tlk01.smk b/mpq/portrait/f/qilin/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/tlk01.smk
rename to mpq/portrait/f/qilin/tlk01.smk
diff --git a/mpq/portrait/faction/qilin/tlk02.smk b/mpq/portrait/f/qilin/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/qilin/tlk02.smk
rename to mpq/portrait/f/qilin/tlk02.smk
diff --git a/mpq/portrait/faction/quazrokor/fid00.smk b/mpq/portrait/f/quazrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/fid00.smk
rename to mpq/portrait/f/quazrokor/fid00.smk
diff --git a/mpq/portrait/faction/quazrokor/fid01.smk b/mpq/portrait/f/quazrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/fid01.smk
rename to mpq/portrait/f/quazrokor/fid01.smk
diff --git a/mpq/portrait/faction/quazrokor/fid02.smk b/mpq/portrait/f/quazrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/fid02.smk
rename to mpq/portrait/f/quazrokor/fid02.smk
diff --git a/mpq/portrait/faction/quazrokor/fid03.smk b/mpq/portrait/f/quazrokor/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/fid03.smk
rename to mpq/portrait/f/quazrokor/fid03.smk
diff --git a/mpq/portrait/faction/quazrokor/tlk00.smk b/mpq/portrait/f/quazrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/tlk00.smk
rename to mpq/portrait/f/quazrokor/tlk00.smk
diff --git a/mpq/portrait/faction/quazrokor/tlk01.smk b/mpq/portrait/f/quazrokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/tlk01.smk
rename to mpq/portrait/f/quazrokor/tlk01.smk
diff --git a/mpq/portrait/faction/quazrokor/tlk02.smk b/mpq/portrait/f/quazrokor/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/quazrokor/tlk02.smk
rename to mpq/portrait/f/quazrokor/tlk02.smk
diff --git a/mpq/portrait/faction/renesair/fid00.smk b/mpq/portrait/f/renesair/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/renesair/fid00.smk
rename to mpq/portrait/f/renesair/fid00.smk
diff --git a/mpq/portrait/faction/renesair/fid01.smk b/mpq/portrait/f/renesair/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/renesair/fid01.smk
rename to mpq/portrait/f/renesair/fid01.smk
diff --git a/mpq/portrait/faction/renesair/tlk00.smk b/mpq/portrait/f/renesair/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/renesair/tlk00.smk
rename to mpq/portrait/f/renesair/tlk00.smk
diff --git a/mpq/portrait/faction/tarasque/fid00.smk b/mpq/portrait/f/tarasque/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/tarasque/fid00.smk
rename to mpq/portrait/f/tarasque/fid00.smk
diff --git a/mpq/portrait/faction/tarasque/tlk00.smk b/mpq/portrait/f/tarasque/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/tarasque/tlk00.smk
rename to mpq/portrait/f/tarasque/tlk00.smk
diff --git a/mpq/portrait/faction/tiangou/fid00.smk b/mpq/portrait/f/tiangou/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/fid00.smk
rename to mpq/portrait/f/tiangou/fid00.smk
diff --git a/mpq/portrait/faction/tiangou/fid01.smk b/mpq/portrait/f/tiangou/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/fid01.smk
rename to mpq/portrait/f/tiangou/fid01.smk
diff --git a/mpq/portrait/faction/tiangou/fid02.smk b/mpq/portrait/f/tiangou/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/fid02.smk
rename to mpq/portrait/f/tiangou/fid02.smk
diff --git a/mpq/portrait/faction/tiangou/fid03.smk b/mpq/portrait/f/tiangou/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/fid03.smk
rename to mpq/portrait/f/tiangou/fid03.smk
diff --git a/mpq/portrait/faction/tiangou/tlk00.smk b/mpq/portrait/f/tiangou/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/tlk00.smk
rename to mpq/portrait/f/tiangou/tlk00.smk
diff --git a/mpq/portrait/faction/tiangou/tlk01.smk b/mpq/portrait/f/tiangou/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/tlk01.smk
rename to mpq/portrait/f/tiangou/tlk01.smk
diff --git a/mpq/portrait/faction/tiangou/tlk02.smk b/mpq/portrait/f/tiangou/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/tiangou/tlk02.smk
rename to mpq/portrait/f/tiangou/tlk02.smk
diff --git a/mpq/portrait/faction/wendigo/fid00.smk b/mpq/portrait/f/wendigo/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/wendigo/fid00.smk
rename to mpq/portrait/f/wendigo/fid00.smk
diff --git a/mpq/portrait/faction/wendigo/tlk00.smk b/mpq/portrait/f/wendigo/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/wendigo/tlk00.smk
rename to mpq/portrait/f/wendigo/tlk00.smk
diff --git a/mpq/portrait/faction/wendigo/tlk01.smk b/mpq/portrait/f/wendigo/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/wendigo/tlk01.smk
rename to mpq/portrait/f/wendigo/tlk01.smk
diff --git a/mpq/portrait/faction/zealot_starbound/fid00.smk b/mpq/portrait/f/zealot_starbound/fid00.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/fid00.smk
rename to mpq/portrait/f/zealot_starbound/fid00.smk
diff --git a/mpq/portrait/faction/zealot_starbound/fid01.smk b/mpq/portrait/f/zealot_starbound/fid01.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/fid01.smk
rename to mpq/portrait/f/zealot_starbound/fid01.smk
diff --git a/mpq/portrait/faction/zealot_starbound/fid02.smk b/mpq/portrait/f/zealot_starbound/fid02.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/fid02.smk
rename to mpq/portrait/f/zealot_starbound/fid02.smk
diff --git a/mpq/portrait/faction/zealot_starbound/fid03.smk b/mpq/portrait/f/zealot_starbound/fid03.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/fid03.smk
rename to mpq/portrait/f/zealot_starbound/fid03.smk
diff --git a/mpq/portrait/faction/zealot_starbound/tlk00.smk b/mpq/portrait/f/zealot_starbound/tlk00.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/tlk00.smk
rename to mpq/portrait/f/zealot_starbound/tlk00.smk
diff --git a/mpq/portrait/faction/zealot_starbound/tlk01.smk b/mpq/portrait/f/zealot_starbound/tlk01.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/tlk01.smk
rename to mpq/portrait/f/zealot_starbound/tlk01.smk
diff --git a/mpq/portrait/faction/zealot_starbound/tlk02.smk b/mpq/portrait/f/zealot_starbound/tlk02.smk
similarity index 100%
rename from mpq/portrait/faction/zealot_starbound/tlk02.smk
rename to mpq/portrait/f/zealot_starbound/tlk02.smk
diff --git a/mpq/portrait/hl/cv/prophet-1/fid00.smk b/mpq/portrait/hl/cv/prophet-1/fid00.smk
new file mode 100644
index 00000000..50d70af8
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid00.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-1/fid01.smk b/mpq/portrait/hl/cv/prophet-1/fid01.smk
new file mode 100644
index 00000000..61926cfb
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid01.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-1/fid02.smk b/mpq/portrait/hl/cv/prophet-1/fid02.smk
new file mode 100644
index 00000000..6e2ab0eb
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid02.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-1/fid03.smk b/mpq/portrait/hl/cv/prophet-1/fid03.smk
new file mode 100644
index 00000000..72dcf003
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid03.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-1/tlk00.smk b/mpq/portrait/hl/cv/prophet-1/tlk00.smk
new file mode 100644
index 00000000..f85ba480
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/tlk00.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-1/tlk01.smk b/mpq/portrait/hl/cv/prophet-1/tlk01.smk
new file mode 100644
index 00000000..80e37087
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/tlk01.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-1/tlk02.smk b/mpq/portrait/hl/cv/prophet-1/tlk02.smk
new file mode 100644
index 00000000..e5e07f95
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/tlk02.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/fid00.smk b/mpq/portrait/hl/cv/prophet-2/fid00.smk
new file mode 100644
index 00000000..0b7b08d3
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid00.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/fid01.smk b/mpq/portrait/hl/cv/prophet-2/fid01.smk
new file mode 100644
index 00000000..5c5217c2
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid01.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/fid02.smk b/mpq/portrait/hl/cv/prophet-2/fid02.smk
new file mode 100644
index 00000000..020e388c
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid02.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/fid03.smk b/mpq/portrait/hl/cv/prophet-2/fid03.smk
new file mode 100644
index 00000000..3d6989a0
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid03.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/tlk00.smk b/mpq/portrait/hl/cv/prophet-2/tlk00.smk
new file mode 100644
index 00000000..00f338fd
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/tlk00.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/tlk01.smk b/mpq/portrait/hl/cv/prophet-2/tlk01.smk
new file mode 100644
index 00000000..17dbdc37
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/tlk01.smk differ
diff --git a/mpq/portrait/hl/cv/prophet-2/tlk02.smk b/mpq/portrait/hl/cv/prophet-2/tlk02.smk
new file mode 100644
index 00000000..3754f1fc
Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/tlk02.smk differ
diff --git a/mpq/portrait/halo/forerunner/ferrum/fid00.smk b/mpq/portrait/hl/fr/ferrum/fid00.smk
similarity index 100%
rename from mpq/portrait/halo/forerunner/ferrum/fid00.smk
rename to mpq/portrait/hl/fr/ferrum/fid00.smk
diff --git a/mpq/portrait/halo/forerunner/ferrum/fid01.smk b/mpq/portrait/hl/fr/ferrum/fid01.smk
similarity index 100%
rename from mpq/portrait/halo/forerunner/ferrum/fid01.smk
rename to mpq/portrait/hl/fr/ferrum/fid01.smk
diff --git a/mpq/portrait/halo/forerunner/ferrum/tlk00.smk b/mpq/portrait/hl/fr/ferrum/tlk00.smk
similarity index 100%
rename from mpq/portrait/halo/forerunner/ferrum/tlk00.smk
rename to mpq/portrait/hl/fr/ferrum/tlk00.smk
diff --git a/mpq/portrait/protoss/amaranth/fid00.smk b/mpq/portrait/p/amaranth/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/amaranth/fid00.smk
rename to mpq/portrait/p/amaranth/fid00.smk
diff --git a/mpq/portrait/protoss/amaranth/fid01.smk b/mpq/portrait/p/amaranth/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/amaranth/fid01.smk
rename to mpq/portrait/p/amaranth/fid01.smk
diff --git a/mpq/portrait/protoss/amaranth/tlk00.smk b/mpq/portrait/p/amaranth/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/amaranth/tlk00.smk
rename to mpq/portrait/p/amaranth/tlk00.smk
diff --git a/mpq/portrait/protoss/amaranth/tlk01.smk b/mpq/portrait/p/amaranth/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/amaranth/tlk01.smk
rename to mpq/portrait/p/amaranth/tlk01.smk
diff --git a/mpq/portrait/protoss/analogue/fid00.smk b/mpq/portrait/p/analogue/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/analogue/fid00.smk
rename to mpq/portrait/p/analogue/fid00.smk
diff --git a/mpq/portrait/protoss/analogue/tlk00.smk b/mpq/portrait/p/analogue/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/analogue/tlk00.smk
rename to mpq/portrait/p/analogue/tlk00.smk
diff --git a/mpq/portrait/protoss/analogue/tlk01.smk b/mpq/portrait/p/analogue/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/analogue/tlk01.smk
rename to mpq/portrait/p/analogue/tlk01.smk
diff --git a/mpq/portrait/protoss/anthelion/fid00.smk b/mpq/portrait/p/anthelion/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/anthelion/fid00.smk
rename to mpq/portrait/p/anthelion/fid00.smk
diff --git a/mpq/portrait/protoss/anthelion/fid01.smk b/mpq/portrait/p/anthelion/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/anthelion/fid01.smk
rename to mpq/portrait/p/anthelion/fid01.smk
diff --git a/mpq/portrait/protoss/anthelion/tlk00.smk b/mpq/portrait/p/anthelion/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/anthelion/tlk00.smk
rename to mpq/portrait/p/anthelion/tlk00.smk
diff --git a/mpq/portrait/protoss/anthelion/tlk01.smk b/mpq/portrait/p/anthelion/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/anthelion/tlk01.smk
rename to mpq/portrait/p/anthelion/tlk01.smk
diff --git a/mpq/portrait/protoss/architect/fid00.smk b/mpq/portrait/p/architect/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/architect/fid00.smk
rename to mpq/portrait/p/architect/fid00.smk
diff --git a/mpq/portrait/protoss/artisan/fid00.smk b/mpq/portrait/p/artisan/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/artisan/fid00.smk
rename to mpq/portrait/p/artisan/fid00.smk
diff --git a/mpq/portrait/protoss/artisan/tlk00.smk b/mpq/portrait/p/artisan/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/artisan/tlk00.smk
rename to mpq/portrait/p/artisan/tlk00.smk
diff --git a/mpq/portrait/protoss/atreus/fid00.smk b/mpq/portrait/p/atreus/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/atreus/fid00.smk
rename to mpq/portrait/p/atreus/fid00.smk
diff --git a/mpq/portrait/protoss/atreus/tlk00.smk b/mpq/portrait/p/atreus/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/atreus/tlk00.smk
rename to mpq/portrait/p/atreus/tlk00.smk
diff --git a/mpq/portrait/protoss/atreus/tlk01.smk b/mpq/portrait/p/atreus/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/atreus/tlk01.smk
rename to mpq/portrait/p/atreus/tlk01.smk
diff --git a/mpq/portrait/protoss/augur/fid00.smk b/mpq/portrait/p/augur/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/fid00.smk
rename to mpq/portrait/p/augur/fid00.smk
diff --git a/mpq/portrait/protoss/augur/fid01.smk b/mpq/portrait/p/augur/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/fid01.smk
rename to mpq/portrait/p/augur/fid01.smk
diff --git a/mpq/portrait/protoss/augur/fid02.smk b/mpq/portrait/p/augur/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/fid02.smk
rename to mpq/portrait/p/augur/fid02.smk
diff --git a/mpq/portrait/protoss/augur/fid03.smk b/mpq/portrait/p/augur/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/fid03.smk
rename to mpq/portrait/p/augur/fid03.smk
diff --git a/mpq/portrait/protoss/augur/tlk00.smk b/mpq/portrait/p/augur/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/tlk00.smk
rename to mpq/portrait/p/augur/tlk00.smk
diff --git a/mpq/portrait/protoss/augur/tlk01.smk b/mpq/portrait/p/augur/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/tlk01.smk
rename to mpq/portrait/p/augur/tlk01.smk
diff --git a/mpq/portrait/protoss/augur/tlk02.smk b/mpq/portrait/p/augur/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/augur/tlk02.smk
rename to mpq/portrait/p/augur/tlk02.smk
diff --git a/mpq/portrait/protoss/aurora/fid00.smk b/mpq/portrait/p/aurora/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/aurora/fid00.smk
rename to mpq/portrait/p/aurora/fid00.smk
diff --git a/mpq/portrait/protoss/aurora/fid01.smk b/mpq/portrait/p/aurora/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/aurora/fid01.smk
rename to mpq/portrait/p/aurora/fid01.smk
diff --git a/mpq/portrait/protoss/aurora/tlk00.smk b/mpq/portrait/p/aurora/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/aurora/tlk00.smk
rename to mpq/portrait/p/aurora/tlk00.smk
diff --git a/mpq/portrait/protoss/aurora/tlk01.smk b/mpq/portrait/p/aurora/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/aurora/tlk01.smk
rename to mpq/portrait/p/aurora/tlk01.smk
diff --git a/mpq/portrait/protoss/barghest/fid00.smk b/mpq/portrait/p/barghest/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/barghest/fid00.smk
rename to mpq/portrait/p/barghest/fid00.smk
diff --git a/mpq/portrait/protoss/barghest/tlk00.smk b/mpq/portrait/p/barghest/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/barghest/tlk00.smk
rename to mpq/portrait/p/barghest/tlk00.smk
diff --git a/mpq/portrait/protoss/charlatan/fid00.smk b/mpq/portrait/p/charlatan/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/fid00.smk
rename to mpq/portrait/p/charlatan/fid00.smk
diff --git a/mpq/portrait/protoss/charlatan/fid01.smk b/mpq/portrait/p/charlatan/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/fid01.smk
rename to mpq/portrait/p/charlatan/fid01.smk
diff --git a/mpq/portrait/protoss/charlatan/fid02.smk b/mpq/portrait/p/charlatan/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/fid02.smk
rename to mpq/portrait/p/charlatan/fid02.smk
diff --git a/mpq/portrait/protoss/charlatan/fid03.smk b/mpq/portrait/p/charlatan/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/fid03.smk
rename to mpq/portrait/p/charlatan/fid03.smk
diff --git a/mpq/portrait/protoss/charlatan/tlk00.smk b/mpq/portrait/p/charlatan/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/tlk00.smk
rename to mpq/portrait/p/charlatan/tlk00.smk
diff --git a/mpq/portrait/protoss/charlatan/tlk01.smk b/mpq/portrait/p/charlatan/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/tlk01.smk
rename to mpq/portrait/p/charlatan/tlk01.smk
diff --git a/mpq/portrait/protoss/charlatan/tlk02.smk b/mpq/portrait/p/charlatan/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/charlatan/tlk02.smk
rename to mpq/portrait/p/charlatan/tlk02.smk
diff --git a/mpq/portrait/protoss/clarion/fid00.smk b/mpq/portrait/p/clarion/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/clarion/fid00.smk
rename to mpq/portrait/p/clarion/fid00.smk
diff --git a/mpq/portrait/protoss/clarion/tlk00.smk b/mpq/portrait/p/clarion/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/clarion/tlk00.smk
rename to mpq/portrait/p/clarion/tlk00.smk
diff --git a/mpq/portrait/protoss/demiurge/fid00.smk b/mpq/portrait/p/demiurge/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/demiurge/fid00.smk
rename to mpq/portrait/p/demiurge/fid00.smk
diff --git a/mpq/portrait/protoss/demiurge/tlk00.smk b/mpq/portrait/p/demiurge/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/demiurge/tlk00.smk
rename to mpq/portrait/p/demiurge/tlk00.smk
diff --git a/mpq/portrait/protoss/ecclesiast/fid00.smk b/mpq/portrait/p/ecclesiast/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/fid00.smk
rename to mpq/portrait/p/ecclesiast/fid00.smk
diff --git a/mpq/portrait/protoss/ecclesiast/fid01.smk b/mpq/portrait/p/ecclesiast/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/fid01.smk
rename to mpq/portrait/p/ecclesiast/fid01.smk
diff --git a/mpq/portrait/protoss/ecclesiast/fid02.smk b/mpq/portrait/p/ecclesiast/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/fid02.smk
rename to mpq/portrait/p/ecclesiast/fid02.smk
diff --git a/mpq/portrait/protoss/ecclesiast/fid03.smk b/mpq/portrait/p/ecclesiast/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/fid03.smk
rename to mpq/portrait/p/ecclesiast/fid03.smk
diff --git a/mpq/portrait/protoss/ecclesiast/tlk00.smk b/mpq/portrait/p/ecclesiast/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/tlk00.smk
rename to mpq/portrait/p/ecclesiast/tlk00.smk
diff --git a/mpq/portrait/protoss/ecclesiast/tlk01.smk b/mpq/portrait/p/ecclesiast/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/tlk01.smk
rename to mpq/portrait/p/ecclesiast/tlk01.smk
diff --git a/mpq/portrait/protoss/ecclesiast/tlk02.smk b/mpq/portrait/p/ecclesiast/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/ecclesiast/tlk02.smk
rename to mpq/portrait/p/ecclesiast/tlk02.smk
diff --git a/mpq/portrait/protoss/empress/fid00.smk b/mpq/portrait/p/empress/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/empress/fid00.smk
rename to mpq/portrait/p/empress/fid00.smk
diff --git a/mpq/portrait/protoss/empress/fid01.smk b/mpq/portrait/p/empress/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/empress/fid01.smk
rename to mpq/portrait/p/empress/fid01.smk
diff --git a/mpq/portrait/protoss/empress/tlk00.smk b/mpq/portrait/p/empress/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/empress/tlk00.smk
rename to mpq/portrait/p/empress/tlk00.smk
diff --git a/mpq/portrait/protoss/empress/tlk01.smk b/mpq/portrait/p/empress/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/empress/tlk01.smk
rename to mpq/portrait/p/empress/tlk01.smk
diff --git a/mpq/portrait/protoss/empyrean/fid00.smk b/mpq/portrait/p/empyrean/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/fid00.smk
rename to mpq/portrait/p/empyrean/fid00.smk
diff --git a/mpq/portrait/protoss/empyrean/fid01.smk b/mpq/portrait/p/empyrean/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/fid01.smk
rename to mpq/portrait/p/empyrean/fid01.smk
diff --git a/mpq/portrait/protoss/empyrean/fid02.smk b/mpq/portrait/p/empyrean/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/fid02.smk
rename to mpq/portrait/p/empyrean/fid02.smk
diff --git a/mpq/portrait/protoss/empyrean/fid03.smk b/mpq/portrait/p/empyrean/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/fid03.smk
rename to mpq/portrait/p/empyrean/fid03.smk
diff --git a/mpq/portrait/protoss/empyrean/tlk00.smk b/mpq/portrait/p/empyrean/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/tlk00.smk
rename to mpq/portrait/p/empyrean/tlk00.smk
diff --git a/mpq/portrait/protoss/empyrean/tlk01.smk b/mpq/portrait/p/empyrean/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/tlk01.smk
rename to mpq/portrait/p/empyrean/tlk01.smk
diff --git a/mpq/portrait/protoss/empyrean/tlk02.smk b/mpq/portrait/p/empyrean/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/empyrean/tlk02.smk
rename to mpq/portrait/p/empyrean/tlk02.smk
diff --git a/mpq/portrait/protoss/epigraph/fid00.smk b/mpq/portrait/p/epigraph/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/epigraph/fid00.smk
rename to mpq/portrait/p/epigraph/fid00.smk
diff --git a/mpq/portrait/protoss/epigraph/fid01.smk b/mpq/portrait/p/epigraph/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/epigraph/fid01.smk
rename to mpq/portrait/p/epigraph/fid01.smk
diff --git a/mpq/portrait/protoss/epigraph/tlk00.smk b/mpq/portrait/p/epigraph/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/epigraph/tlk00.smk
rename to mpq/portrait/p/epigraph/tlk00.smk
diff --git a/mpq/portrait/protoss/epigraph/tlk01.smk b/mpq/portrait/p/epigraph/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/epigraph/tlk01.smk
rename to mpq/portrait/p/epigraph/tlk01.smk
diff --git a/mpq/portrait/protoss/exemplar/fid00.smk b/mpq/portrait/p/exemplar/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/exemplar/fid00.smk
rename to mpq/portrait/p/exemplar/fid00.smk
diff --git a/mpq/portrait/protoss/exemplar/fid01.smk b/mpq/portrait/p/exemplar/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/exemplar/fid01.smk
rename to mpq/portrait/p/exemplar/fid01.smk
diff --git a/mpq/portrait/protoss/exemplar/tlk01.smk b/mpq/portrait/p/exemplar/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/exemplar/tlk01.smk
rename to mpq/portrait/p/exemplar/tlk01.smk
diff --git a/mpq/portrait/protoss/gladius/fid00.smk b/mpq/portrait/p/gladius/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/gladius/fid00.smk
rename to mpq/portrait/p/gladius/fid00.smk
diff --git a/mpq/portrait/protoss/gladius/fid01.smk b/mpq/portrait/p/gladius/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/gladius/fid01.smk
rename to mpq/portrait/p/gladius/fid01.smk
diff --git a/mpq/portrait/protoss/gladius/fid02.smk b/mpq/portrait/p/gladius/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/gladius/fid02.smk
rename to mpq/portrait/p/gladius/fid02.smk
diff --git a/mpq/portrait/protoss/gladius/tlk00.smk b/mpq/portrait/p/gladius/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/gladius/tlk00.smk
rename to mpq/portrait/p/gladius/tlk00.smk
diff --git a/mpq/portrait/protoss/gladius/tlk01.smk b/mpq/portrait/p/gladius/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/gladius/tlk01.smk
rename to mpq/portrait/p/gladius/tlk01.smk
diff --git a/mpq/portrait/protoss/golem/fid00.smk b/mpq/portrait/p/golem/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/golem/fid00.smk
rename to mpq/portrait/p/golem/fid00.smk
diff --git a/mpq/portrait/protoss/golem/fid01.smk b/mpq/portrait/p/golem/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/golem/fid01.smk
rename to mpq/portrait/p/golem/fid01.smk
diff --git a/mpq/portrait/protoss/golem/tlk00.smk b/mpq/portrait/p/golem/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/golem/tlk00.smk
rename to mpq/portrait/p/golem/tlk00.smk
diff --git a/mpq/portrait/protoss/golem/tlk01.smk b/mpq/portrait/p/golem/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/golem/tlk01.smk
rename to mpq/portrait/p/golem/tlk01.smk
diff --git a/mpq/portrait/protoss/golem/tlk02.smk b/mpq/portrait/p/golem/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/golem/tlk02.smk
rename to mpq/portrait/p/golem/tlk02.smk
diff --git a/mpq/portrait/protoss/herald/fid00.smk b/mpq/portrait/p/herald/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/fid00.smk
rename to mpq/portrait/p/herald/fid00.smk
diff --git a/mpq/portrait/protoss/herald/fid01.smk b/mpq/portrait/p/herald/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/fid01.smk
rename to mpq/portrait/p/herald/fid01.smk
diff --git a/mpq/portrait/protoss/herald/fid02.smk b/mpq/portrait/p/herald/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/fid02.smk
rename to mpq/portrait/p/herald/fid02.smk
diff --git a/mpq/portrait/protoss/herald/fid03.smk b/mpq/portrait/p/herald/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/fid03.smk
rename to mpq/portrait/p/herald/fid03.smk
diff --git a/mpq/portrait/protoss/herald/tlk00.smk b/mpq/portrait/p/herald/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/tlk00.smk
rename to mpq/portrait/p/herald/tlk00.smk
diff --git a/mpq/portrait/protoss/herald/tlk01.smk b/mpq/portrait/p/herald/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/tlk01.smk
rename to mpq/portrait/p/herald/tlk01.smk
diff --git a/mpq/portrait/protoss/herald/tlk02.smk b/mpq/portrait/p/herald/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/herald/tlk02.smk
rename to mpq/portrait/p/herald/tlk02.smk
diff --git a/mpq/portrait/protoss/hierophant/fid00.smk b/mpq/portrait/p/hierophant/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/hierophant/fid00.smk
rename to mpq/portrait/p/hierophant/fid00.smk
diff --git a/mpq/portrait/protoss/hierophant/fid01.smk b/mpq/portrait/p/hierophant/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/hierophant/fid01.smk
rename to mpq/portrait/p/hierophant/fid01.smk
diff --git a/mpq/portrait/protoss/hierophant/tlk00.smk b/mpq/portrait/p/hierophant/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/hierophant/tlk00.smk
rename to mpq/portrait/p/hierophant/tlk00.smk
diff --git a/mpq/portrait/protoss/idol/fid00.smk b/mpq/portrait/p/idol/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/idol/fid00.smk
rename to mpq/portrait/p/idol/fid00.smk
diff --git a/mpq/portrait/protoss/idol/fid01.smk b/mpq/portrait/p/idol/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/idol/fid01.smk
rename to mpq/portrait/p/idol/fid01.smk
diff --git a/mpq/portrait/protoss/idol/fid02.smk b/mpq/portrait/p/idol/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/idol/fid02.smk
rename to mpq/portrait/p/idol/fid02.smk
diff --git a/mpq/portrait/protoss/idol/tlk00.smk b/mpq/portrait/p/idol/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/idol/tlk00.smk
rename to mpq/portrait/p/idol/tlk00.smk
diff --git a/mpq/portrait/protoss/idol/tlk01.smk b/mpq/portrait/p/idol/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/idol/tlk01.smk
rename to mpq/portrait/p/idol/tlk01.smk
diff --git a/mpq/portrait/protoss/legionnaire/fid00.smk b/mpq/portrait/p/legionnaire/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/fid00.smk
rename to mpq/portrait/p/legionnaire/fid00.smk
diff --git a/mpq/portrait/protoss/legionnaire/fid01.smk b/mpq/portrait/p/legionnaire/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/fid01.smk
rename to mpq/portrait/p/legionnaire/fid01.smk
diff --git a/mpq/portrait/protoss/legionnaire/fid02.smk b/mpq/portrait/p/legionnaire/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/fid02.smk
rename to mpq/portrait/p/legionnaire/fid02.smk
diff --git a/mpq/portrait/protoss/legionnaire/fid03.smk b/mpq/portrait/p/legionnaire/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/fid03.smk
rename to mpq/portrait/p/legionnaire/fid03.smk
diff --git a/mpq/portrait/protoss/legionnaire/tlk00.smk b/mpq/portrait/p/legionnaire/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/tlk00.smk
rename to mpq/portrait/p/legionnaire/tlk00.smk
diff --git a/mpq/portrait/protoss/legionnaire/tlk01.smk b/mpq/portrait/p/legionnaire/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/tlk01.smk
rename to mpq/portrait/p/legionnaire/tlk01.smk
diff --git a/mpq/portrait/protoss/legionnaire/tlk02.smk b/mpq/portrait/p/legionnaire/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/legionnaire/tlk02.smk
rename to mpq/portrait/p/legionnaire/tlk02.smk
diff --git a/mpq/portrait/protoss/magister/fid00.smk b/mpq/portrait/p/magister/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/magister/fid00.smk
rename to mpq/portrait/p/magister/fid00.smk
diff --git a/mpq/portrait/protoss/magister/fid01.smk b/mpq/portrait/p/magister/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/magister/fid01.smk
rename to mpq/portrait/p/magister/fid01.smk
diff --git a/mpq/portrait/protoss/magister/fid02.smk b/mpq/portrait/p/magister/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/magister/fid02.smk
rename to mpq/portrait/p/magister/fid02.smk
diff --git a/mpq/portrait/protoss/magister/tlk00.smk b/mpq/portrait/p/magister/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/magister/tlk00.smk
rename to mpq/portrait/p/magister/tlk00.smk
diff --git a/mpq/portrait/protoss/magister/tlk01.smk b/mpq/portrait/p/magister/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/magister/tlk01.smk
rename to mpq/portrait/p/magister/tlk01.smk
diff --git a/mpq/portrait/protoss/optecton/fid00.smk b/mpq/portrait/p/optecton/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/optecton/fid00.smk
rename to mpq/portrait/p/optecton/fid00.smk
diff --git a/mpq/portrait/protoss/optecton/fid01.smk b/mpq/portrait/p/optecton/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/optecton/fid01.smk
rename to mpq/portrait/p/optecton/fid01.smk
diff --git a/mpq/portrait/protoss/optecton/tlk00.smk b/mpq/portrait/p/optecton/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/optecton/tlk00.smk
rename to mpq/portrait/p/optecton/tlk00.smk
diff --git a/mpq/portrait/protoss/oscilliant/fid00.smk b/mpq/portrait/p/oscilliant/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/oscilliant/fid00.smk
rename to mpq/portrait/p/oscilliant/fid00.smk
diff --git a/mpq/portrait/protoss/oscilliant/fid01.smk b/mpq/portrait/p/oscilliant/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/oscilliant/fid01.smk
rename to mpq/portrait/p/oscilliant/fid01.smk
diff --git a/mpq/portrait/protoss/oscilliant/tlk00.smk b/mpq/portrait/p/oscilliant/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/oscilliant/tlk00.smk
rename to mpq/portrait/p/oscilliant/tlk00.smk
diff --git a/mpq/portrait/protoss/oscilliant/tlk01.smk b/mpq/portrait/p/oscilliant/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/oscilliant/tlk01.smk
rename to mpq/portrait/p/oscilliant/tlk01.smk
diff --git a/mpq/portrait/protoss/pariah/fid00.smk b/mpq/portrait/p/pariah/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/pariah/fid00.smk
rename to mpq/portrait/p/pariah/fid00.smk
diff --git a/mpq/portrait/protoss/pariah/fid01.smk b/mpq/portrait/p/pariah/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/pariah/fid01.smk
rename to mpq/portrait/p/pariah/fid01.smk
diff --git a/mpq/portrait/protoss/pariah/tlk00.smk b/mpq/portrait/p/pariah/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/pariah/tlk00.smk
rename to mpq/portrait/p/pariah/tlk00.smk
diff --git a/mpq/portrait/protoss/patriarch/fid00.smk b/mpq/portrait/p/patriarch/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/fid00.smk
rename to mpq/portrait/p/patriarch/fid00.smk
diff --git a/mpq/portrait/protoss/patriarch/fid01.smk b/mpq/portrait/p/patriarch/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/fid01.smk
rename to mpq/portrait/p/patriarch/fid01.smk
diff --git a/mpq/portrait/protoss/patriarch/fid02.smk b/mpq/portrait/p/patriarch/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/fid02.smk
rename to mpq/portrait/p/patriarch/fid02.smk
diff --git a/mpq/portrait/protoss/patriarch/fid03.smk b/mpq/portrait/p/patriarch/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/fid03.smk
rename to mpq/portrait/p/patriarch/fid03.smk
diff --git a/mpq/portrait/protoss/patriarch/tlk00.smk b/mpq/portrait/p/patriarch/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/tlk00.smk
rename to mpq/portrait/p/patriarch/tlk00.smk
diff --git a/mpq/portrait/protoss/patriarch/tlk01.smk b/mpq/portrait/p/patriarch/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/tlk01.smk
rename to mpq/portrait/p/patriarch/tlk01.smk
diff --git a/mpq/portrait/protoss/patriarch/tlk02.smk b/mpq/portrait/p/patriarch/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/patriarch/tlk02.smk
rename to mpq/portrait/p/patriarch/tlk02.smk
diff --git a/mpq/portrait/protoss/positron/fid00.smk b/mpq/portrait/p/positron/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/positron/fid00.smk
rename to mpq/portrait/p/positron/fid00.smk
diff --git a/mpq/portrait/protoss/positron/fid01.smk b/mpq/portrait/p/positron/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/positron/fid01.smk
rename to mpq/portrait/p/positron/fid01.smk
diff --git a/mpq/portrait/protoss/positron/tlk00.smk b/mpq/portrait/p/positron/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/positron/tlk00.smk
rename to mpq/portrait/p/positron/tlk00.smk
diff --git a/mpq/portrait/protoss/potentate/fid00.smk b/mpq/portrait/p/potentate/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/potentate/fid00.smk
rename to mpq/portrait/p/potentate/fid00.smk
diff --git a/mpq/portrait/protoss/potentate/fid01.smk b/mpq/portrait/p/potentate/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/potentate/fid01.smk
rename to mpq/portrait/p/potentate/fid01.smk
diff --git a/mpq/portrait/protoss/potentate/tlk00.smk b/mpq/portrait/p/potentate/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/potentate/tlk00.smk
rename to mpq/portrait/p/potentate/tlk00.smk
diff --git a/mpq/portrait/protoss/potentate/tlk01.smk b/mpq/portrait/p/potentate/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/potentate/tlk01.smk
rename to mpq/portrait/p/potentate/tlk01.smk
diff --git a/mpq/portrait/protoss/servitor/fid00.smk b/mpq/portrait/p/servitor/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/servitor/fid00.smk
rename to mpq/portrait/p/servitor/fid00.smk
diff --git a/mpq/portrait/protoss/servitor/tlk00.smk b/mpq/portrait/p/servitor/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/servitor/tlk00.smk
rename to mpq/portrait/p/servitor/tlk00.smk
diff --git a/mpq/portrait/protoss/simulacrum-old/fid00.smk b/mpq/portrait/p/simulacrum-old/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum-old/fid00.smk
rename to mpq/portrait/p/simulacrum-old/fid00.smk
diff --git a/mpq/portrait/protoss/simulacrum-old/tlk00.smk b/mpq/portrait/p/simulacrum-old/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum-old/tlk00.smk
rename to mpq/portrait/p/simulacrum-old/tlk00.smk
diff --git a/mpq/portrait/protoss/simulacrum/fid00.smk b/mpq/portrait/p/simulacrum/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/fid00.smk
rename to mpq/portrait/p/simulacrum/fid00.smk
diff --git a/mpq/portrait/protoss/simulacrum/fid01.smk b/mpq/portrait/p/simulacrum/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/fid01.smk
rename to mpq/portrait/p/simulacrum/fid01.smk
diff --git a/mpq/portrait/protoss/simulacrum/fid02.smk b/mpq/portrait/p/simulacrum/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/fid02.smk
rename to mpq/portrait/p/simulacrum/fid02.smk
diff --git a/mpq/portrait/protoss/simulacrum/fid03.smk b/mpq/portrait/p/simulacrum/fid03.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/fid03.smk
rename to mpq/portrait/p/simulacrum/fid03.smk
diff --git a/mpq/portrait/protoss/simulacrum/tlk00.smk b/mpq/portrait/p/simulacrum/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/tlk00.smk
rename to mpq/portrait/p/simulacrum/tlk00.smk
diff --git a/mpq/portrait/protoss/simulacrum/tlk01.smk b/mpq/portrait/p/simulacrum/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/tlk01.smk
rename to mpq/portrait/p/simulacrum/tlk01.smk
diff --git a/mpq/portrait/protoss/simulacrum/tlk02.smk b/mpq/portrait/p/simulacrum/tlk02.smk
similarity index 100%
rename from mpq/portrait/protoss/simulacrum/tlk02.smk
rename to mpq/portrait/p/simulacrum/tlk02.smk
diff --git a/mpq/portrait/protoss/starsovereign/fid00.smk b/mpq/portrait/p/starsovereign/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/starsovereign/fid00.smk
rename to mpq/portrait/p/starsovereign/fid00.smk
diff --git a/mpq/portrait/protoss/starsovereign/tlk00.smk b/mpq/portrait/p/starsovereign/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/starsovereign/tlk00.smk
rename to mpq/portrait/p/starsovereign/tlk00.smk
diff --git a/mpq/portrait/protoss/sycophant/fid00.smk b/mpq/portrait/p/sycophant/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/sycophant/fid00.smk
rename to mpq/portrait/p/sycophant/fid00.smk
diff --git a/mpq/portrait/protoss/sycophant/fid01.smk b/mpq/portrait/p/sycophant/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/sycophant/fid01.smk
rename to mpq/portrait/p/sycophant/fid01.smk
diff --git a/mpq/portrait/protoss/sycophant/tlk00.smk b/mpq/portrait/p/sycophant/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/sycophant/tlk00.smk
rename to mpq/portrait/p/sycophant/tlk00.smk
diff --git a/mpq/portrait/protoss/sycophant/tlk01.smk b/mpq/portrait/p/sycophant/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/sycophant/tlk01.smk
rename to mpq/portrait/p/sycophant/tlk01.smk
diff --git a/mpq/portrait/protoss/unar/fid00.smk b/mpq/portrait/p/unar/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/unar/fid00.smk
rename to mpq/portrait/p/unar/fid00.smk
diff --git a/mpq/portrait/protoss/unar/tlk00.smk b/mpq/portrait/p/unar/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/unar/tlk00.smk
rename to mpq/portrait/p/unar/tlk00.smk
diff --git a/mpq/portrait/protoss/vagrant/fid00.smk b/mpq/portrait/p/vagrant/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/vagrant/fid00.smk
rename to mpq/portrait/p/vagrant/fid00.smk
diff --git a/mpq/portrait/protoss/vagrant/fid01.smk b/mpq/portrait/p/vagrant/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/vagrant/fid01.smk
rename to mpq/portrait/p/vagrant/fid01.smk
diff --git a/mpq/portrait/protoss/vagrant/fid02.smk b/mpq/portrait/p/vagrant/fid02.smk
similarity index 100%
rename from mpq/portrait/protoss/vagrant/fid02.smk
rename to mpq/portrait/p/vagrant/fid02.smk
diff --git a/mpq/portrait/protoss/vagrant/tlk00.smk b/mpq/portrait/p/vagrant/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/vagrant/tlk00.smk
rename to mpq/portrait/p/vagrant/tlk00.smk
diff --git a/mpq/portrait/protoss/vagrant/tlk01.smk b/mpq/portrait/p/vagrant/tlk01.smk
similarity index 100%
rename from mpq/portrait/protoss/vagrant/tlk01.smk
rename to mpq/portrait/p/vagrant/tlk01.smk
diff --git a/mpq/portrait/protoss/vassal/fid00.smk b/mpq/portrait/p/vassal/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/vassal/fid00.smk
rename to mpq/portrait/p/vassal/fid00.smk
diff --git a/mpq/portrait/protoss/vassal/fid01.smk b/mpq/portrait/p/vassal/fid01.smk
similarity index 100%
rename from mpq/portrait/protoss/vassal/fid01.smk
rename to mpq/portrait/p/vassal/fid01.smk
diff --git a/mpq/portrait/protoss/vassal/tlk00.smk b/mpq/portrait/p/vassal/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/vassal/tlk00.smk
rename to mpq/portrait/p/vassal/tlk00.smk
diff --git a/mpq/portrait/protoss/vibrance/fid00.smk b/mpq/portrait/p/vibrance/fid00.smk
similarity index 100%
rename from mpq/portrait/protoss/vibrance/fid00.smk
rename to mpq/portrait/p/vibrance/fid00.smk
diff --git a/mpq/portrait/protoss/vibrance/tlk00.smk b/mpq/portrait/p/vibrance/tlk00.smk
similarity index 100%
rename from mpq/portrait/protoss/vibrance/tlk00.smk
rename to mpq/portrait/p/vibrance/tlk00.smk
diff --git a/mpq/portrait/special/ackmed/fid00.smk b/mpq/portrait/sp/ackmed/fid00.smk
similarity index 100%
rename from mpq/portrait/special/ackmed/fid00.smk
rename to mpq/portrait/sp/ackmed/fid00.smk
diff --git a/mpq/portrait/special/ackmed/fid01.smk b/mpq/portrait/sp/ackmed/fid01.smk
similarity index 100%
rename from mpq/portrait/special/ackmed/fid01.smk
rename to mpq/portrait/sp/ackmed/fid01.smk
diff --git a/mpq/portrait/special/ackmed/fid02.smk b/mpq/portrait/sp/ackmed/fid02.smk
similarity index 100%
rename from mpq/portrait/special/ackmed/fid02.smk
rename to mpq/portrait/sp/ackmed/fid02.smk
diff --git a/mpq/portrait/special/ackmed/fid03.smk b/mpq/portrait/sp/ackmed/fid03.smk
similarity index 100%
rename from mpq/portrait/special/ackmed/fid03.smk
rename to mpq/portrait/sp/ackmed/fid03.smk
diff --git a/mpq/portrait/special/ackmed/tlk00.smk b/mpq/portrait/sp/ackmed/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/ackmed/tlk00.smk
rename to mpq/portrait/sp/ackmed/tlk00.smk
diff --git a/mpq/portrait/special/ackmed/tlk01.smk b/mpq/portrait/sp/ackmed/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/ackmed/tlk01.smk
rename to mpq/portrait/sp/ackmed/tlk01.smk
diff --git a/mpq/portrait/special/ajax/fid00.smk b/mpq/portrait/sp/ajax/fid00.smk
similarity index 100%
rename from mpq/portrait/special/ajax/fid00.smk
rename to mpq/portrait/sp/ajax/fid00.smk
diff --git a/mpq/portrait/special/ajax/tlk00.smk b/mpq/portrait/sp/ajax/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/ajax/tlk00.smk
rename to mpq/portrait/sp/ajax/tlk00.smk
diff --git a/mpq/portrait/special/ajax/tlk01.smk b/mpq/portrait/sp/ajax/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/ajax/tlk01.smk
rename to mpq/portrait/sp/ajax/tlk01.smk
diff --git a/mpq/portrait/special/barlow/fid00.smk b/mpq/portrait/sp/barlow/fid00.smk
similarity index 100%
rename from mpq/portrait/special/barlow/fid00.smk
rename to mpq/portrait/sp/barlow/fid00.smk
diff --git a/mpq/portrait/special/barlow/fid01.smk b/mpq/portrait/sp/barlow/fid01.smk
similarity index 100%
rename from mpq/portrait/special/barlow/fid01.smk
rename to mpq/portrait/sp/barlow/fid01.smk
diff --git a/mpq/portrait/special/barlow/fid02.smk b/mpq/portrait/sp/barlow/fid02.smk
similarity index 100%
rename from mpq/portrait/special/barlow/fid02.smk
rename to mpq/portrait/sp/barlow/fid02.smk
diff --git a/mpq/portrait/special/barlow/tlk00.smk b/mpq/portrait/sp/barlow/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/barlow/tlk00.smk
rename to mpq/portrait/sp/barlow/tlk00.smk
diff --git a/mpq/portrait/special/barlow/tlk01.smk b/mpq/portrait/sp/barlow/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/barlow/tlk01.smk
rename to mpq/portrait/sp/barlow/tlk01.smk
diff --git a/mpq/portrait/special/boyeau/fid00.smk b/mpq/portrait/sp/boyeau/fid00.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/fid00.smk
rename to mpq/portrait/sp/boyeau/fid00.smk
diff --git a/mpq/portrait/special/boyeau/fid01.smk b/mpq/portrait/sp/boyeau/fid01.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/fid01.smk
rename to mpq/portrait/sp/boyeau/fid01.smk
diff --git a/mpq/portrait/special/boyeau/fid02.smk b/mpq/portrait/sp/boyeau/fid02.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/fid02.smk
rename to mpq/portrait/sp/boyeau/fid02.smk
diff --git a/mpq/portrait/special/boyeau/fid03.smk b/mpq/portrait/sp/boyeau/fid03.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/fid03.smk
rename to mpq/portrait/sp/boyeau/fid03.smk
diff --git a/mpq/portrait/special/boyeau/tlk00.smk b/mpq/portrait/sp/boyeau/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/tlk00.smk
rename to mpq/portrait/sp/boyeau/tlk00.smk
diff --git a/mpq/portrait/special/boyeau/tlk01.smk b/mpq/portrait/sp/boyeau/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/tlk01.smk
rename to mpq/portrait/sp/boyeau/tlk01.smk
diff --git a/mpq/portrait/special/boyeau/tlk02.smk b/mpq/portrait/sp/boyeau/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/boyeau/tlk02.smk
rename to mpq/portrait/sp/boyeau/tlk02.smk
diff --git a/mpq/portrait/special/eritreus/fid00.smk b/mpq/portrait/sp/eritreus/fid00.smk
similarity index 100%
rename from mpq/portrait/special/eritreus/fid00.smk
rename to mpq/portrait/sp/eritreus/fid00.smk
diff --git a/mpq/portrait/special/eritreus/tlk00.smk b/mpq/portrait/sp/eritreus/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/eritreus/tlk00.smk
rename to mpq/portrait/sp/eritreus/tlk00.smk
diff --git a/mpq/portrait/special/eritreus/tlk01.smk b/mpq/portrait/sp/eritreus/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/eritreus/tlk01.smk
rename to mpq/portrait/sp/eritreus/tlk01.smk
diff --git a/mpq/portrait/special/eritreus/tlk02.smk b/mpq/portrait/sp/eritreus/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/eritreus/tlk02.smk
rename to mpq/portrait/sp/eritreus/tlk02.smk
diff --git a/mpq/portrait/special/esmond/fid00.smk b/mpq/portrait/sp/esmond/fid00.smk
similarity index 100%
rename from mpq/portrait/special/esmond/fid00.smk
rename to mpq/portrait/sp/esmond/fid00.smk
diff --git a/mpq/portrait/special/esmond/fid01.smk b/mpq/portrait/sp/esmond/fid01.smk
similarity index 100%
rename from mpq/portrait/special/esmond/fid01.smk
rename to mpq/portrait/sp/esmond/fid01.smk
diff --git a/mpq/portrait/special/esmond/fid02.smk b/mpq/portrait/sp/esmond/fid02.smk
similarity index 100%
rename from mpq/portrait/special/esmond/fid02.smk
rename to mpq/portrait/sp/esmond/fid02.smk
diff --git a/mpq/portrait/special/esmond/fid03.smk b/mpq/portrait/sp/esmond/fid03.smk
similarity index 100%
rename from mpq/portrait/special/esmond/fid03.smk
rename to mpq/portrait/sp/esmond/fid03.smk
diff --git a/mpq/portrait/special/esmond/tlk00.smk b/mpq/portrait/sp/esmond/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/esmond/tlk00.smk
rename to mpq/portrait/sp/esmond/tlk00.smk
diff --git a/mpq/portrait/special/esmond/tlk01.smk b/mpq/portrait/sp/esmond/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/esmond/tlk01.smk
rename to mpq/portrait/sp/esmond/tlk01.smk
diff --git a/mpq/portrait/special/esmond/tlk02.smk b/mpq/portrait/sp/esmond/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/esmond/tlk02.smk
rename to mpq/portrait/sp/esmond/tlk02.smk
diff --git a/mpq/portrait/special/furen/fid00.smk b/mpq/portrait/sp/furen/fid00.smk
similarity index 100%
rename from mpq/portrait/special/furen/fid00.smk
rename to mpq/portrait/sp/furen/fid00.smk
diff --git a/mpq/portrait/special/furen/fid01.smk b/mpq/portrait/sp/furen/fid01.smk
similarity index 100%
rename from mpq/portrait/special/furen/fid01.smk
rename to mpq/portrait/sp/furen/fid01.smk
diff --git a/mpq/portrait/special/furen/fid02.smk b/mpq/portrait/sp/furen/fid02.smk
similarity index 100%
rename from mpq/portrait/special/furen/fid02.smk
rename to mpq/portrait/sp/furen/fid02.smk
diff --git a/mpq/portrait/special/furen/tlk00.smk b/mpq/portrait/sp/furen/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/furen/tlk00.smk
rename to mpq/portrait/sp/furen/tlk00.smk
diff --git a/mpq/portrait/special/furen/tlk01.smk b/mpq/portrait/sp/furen/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/furen/tlk01.smk
rename to mpq/portrait/sp/furen/tlk01.smk
diff --git a/mpq/portrait/special/hadral/fid00.smk b/mpq/portrait/sp/hadral/fid00.smk
similarity index 100%
rename from mpq/portrait/special/hadral/fid00.smk
rename to mpq/portrait/sp/hadral/fid00.smk
diff --git a/mpq/portrait/special/hadral/fid01.smk b/mpq/portrait/sp/hadral/fid01.smk
similarity index 100%
rename from mpq/portrait/special/hadral/fid01.smk
rename to mpq/portrait/sp/hadral/fid01.smk
diff --git a/mpq/portrait/special/hadral/tlk00.smk b/mpq/portrait/sp/hadral/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/hadral/tlk00.smk
rename to mpq/portrait/sp/hadral/tlk00.smk
diff --git a/mpq/portrait/special/hadral/tlk01.smk b/mpq/portrait/sp/hadral/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/hadral/tlk01.smk
rename to mpq/portrait/sp/hadral/tlk01.smk
diff --git a/mpq/portrait/special/inc/algannor/fid00.smk b/mpq/portrait/sp/inc/algannor/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/fid00.smk
rename to mpq/portrait/sp/inc/algannor/fid00.smk
diff --git a/mpq/portrait/special/inc/algannor/fid01.smk b/mpq/portrait/sp/inc/algannor/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/fid01.smk
rename to mpq/portrait/sp/inc/algannor/fid01.smk
diff --git a/mpq/portrait/special/inc/algannor/fid02.smk b/mpq/portrait/sp/inc/algannor/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/fid02.smk
rename to mpq/portrait/sp/inc/algannor/fid02.smk
diff --git a/mpq/portrait/special/inc/algannor/fid03.smk b/mpq/portrait/sp/inc/algannor/fid03.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/fid03.smk
rename to mpq/portrait/sp/inc/algannor/fid03.smk
diff --git a/mpq/portrait/special/inc/algannor/tlk00.smk b/mpq/portrait/sp/inc/algannor/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/tlk00.smk
rename to mpq/portrait/sp/inc/algannor/tlk00.smk
diff --git a/mpq/portrait/special/inc/algannor/tlk01.smk b/mpq/portrait/sp/inc/algannor/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/tlk01.smk
rename to mpq/portrait/sp/inc/algannor/tlk01.smk
diff --git a/mpq/portrait/special/inc/algannor/tlk02.smk b/mpq/portrait/sp/inc/algannor/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/algannor/tlk02.smk
rename to mpq/portrait/sp/inc/algannor/tlk02.smk
diff --git a/mpq/portrait/special/inc/gorn/fid00.smk b/mpq/portrait/sp/inc/gorn/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/gorn/fid00.smk
rename to mpq/portrait/sp/inc/gorn/fid00.smk
diff --git a/mpq/portrait/special/inc/gorn/fid01.smk b/mpq/portrait/sp/inc/gorn/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/gorn/fid01.smk
rename to mpq/portrait/sp/inc/gorn/fid01.smk
diff --git a/mpq/portrait/special/inc/gorn/fid02.smk b/mpq/portrait/sp/inc/gorn/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/gorn/fid02.smk
rename to mpq/portrait/sp/inc/gorn/fid02.smk
diff --git a/mpq/portrait/special/inc/gorn/tlk00.smk b/mpq/portrait/sp/inc/gorn/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/gorn/tlk00.smk
rename to mpq/portrait/sp/inc/gorn/tlk00.smk
diff --git a/mpq/portrait/special/inc/gorn/tlk01.smk b/mpq/portrait/sp/inc/gorn/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/gorn/tlk01.smk
rename to mpq/portrait/sp/inc/gorn/tlk01.smk
diff --git a/mpq/portrait/special/inc/gorn/tlk02.smk b/mpq/portrait/sp/inc/gorn/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/gorn/tlk02.smk
rename to mpq/portrait/sp/inc/gorn/tlk02.smk
diff --git a/mpq/portrait/special/inc/goska/fid00.smk b/mpq/portrait/sp/inc/goska/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/goska/fid00.smk
rename to mpq/portrait/sp/inc/goska/fid00.smk
diff --git a/mpq/portrait/special/inc/goska/fid01.smk b/mpq/portrait/sp/inc/goska/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/goska/fid01.smk
rename to mpq/portrait/sp/inc/goska/fid01.smk
diff --git a/mpq/portrait/special/inc/goska/fid02.smk b/mpq/portrait/sp/inc/goska/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/goska/fid02.smk
rename to mpq/portrait/sp/inc/goska/fid02.smk
diff --git a/mpq/portrait/special/inc/goska/fid03.smk b/mpq/portrait/sp/inc/goska/fid03.smk
similarity index 100%
rename from mpq/portrait/special/inc/goska/fid03.smk
rename to mpq/portrait/sp/inc/goska/fid03.smk
diff --git a/mpq/portrait/special/inc/goska/tlk00.smk b/mpq/portrait/sp/inc/goska/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/goska/tlk00.smk
rename to mpq/portrait/sp/inc/goska/tlk00.smk
diff --git a/mpq/portrait/special/inc/stroluum/fid00.smk b/mpq/portrait/sp/inc/stroluum/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/fid00.smk
rename to mpq/portrait/sp/inc/stroluum/fid00.smk
diff --git a/mpq/portrait/special/inc/stroluum/fid01.smk b/mpq/portrait/sp/inc/stroluum/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/fid01.smk
rename to mpq/portrait/sp/inc/stroluum/fid01.smk
diff --git a/mpq/portrait/special/inc/stroluum/fid02.smk b/mpq/portrait/sp/inc/stroluum/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/fid02.smk
rename to mpq/portrait/sp/inc/stroluum/fid02.smk
diff --git a/mpq/portrait/special/inc/stroluum/fid03.smk b/mpq/portrait/sp/inc/stroluum/fid03.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/fid03.smk
rename to mpq/portrait/sp/inc/stroluum/fid03.smk
diff --git a/mpq/portrait/special/inc/stroluum/tlk00.smk b/mpq/portrait/sp/inc/stroluum/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/tlk00.smk
rename to mpq/portrait/sp/inc/stroluum/tlk00.smk
diff --git a/mpq/portrait/special/inc/stroluum/tlk01.smk b/mpq/portrait/sp/inc/stroluum/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/tlk01.smk
rename to mpq/portrait/sp/inc/stroluum/tlk01.smk
diff --git a/mpq/portrait/special/inc/stroluum/tlk02.smk b/mpq/portrait/sp/inc/stroluum/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/stroluum/tlk02.smk
rename to mpq/portrait/sp/inc/stroluum/tlk02.smk
diff --git a/mpq/portrait/special/inc/thalazim/fid00.smk b/mpq/portrait/sp/inc/thalazim/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/thalazim/fid00.smk
rename to mpq/portrait/sp/inc/thalazim/fid00.smk
diff --git a/mpq/portrait/special/inc/thalazim/fid01.smk b/mpq/portrait/sp/inc/thalazim/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/thalazim/fid01.smk
rename to mpq/portrait/sp/inc/thalazim/fid01.smk
diff --git a/mpq/portrait/special/inc/thalazim/fid02.smk b/mpq/portrait/sp/inc/thalazim/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/thalazim/fid02.smk
rename to mpq/portrait/sp/inc/thalazim/fid02.smk
diff --git a/mpq/portrait/special/inc/thalazim/tlk00.smk b/mpq/portrait/sp/inc/thalazim/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/thalazim/tlk00.smk
rename to mpq/portrait/sp/inc/thalazim/tlk00.smk
diff --git a/mpq/portrait/special/inc/thalazim/tlk01.smk b/mpq/portrait/sp/inc/thalazim/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/thalazim/tlk01.smk
rename to mpq/portrait/sp/inc/thalazim/tlk01.smk
diff --git a/mpq/portrait/special/inc/thalazim/tlk02.smk b/mpq/portrait/sp/inc/thalazim/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/thalazim/tlk02.smk
rename to mpq/portrait/sp/inc/thalazim/tlk02.smk
diff --git a/mpq/portrait/special/inc/tuzor/fid00.smk b/mpq/portrait/sp/inc/tuzor/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/tuzor/fid00.smk
rename to mpq/portrait/sp/inc/tuzor/fid00.smk
diff --git a/mpq/portrait/special/inc/tuzor/fid01.smk b/mpq/portrait/sp/inc/tuzor/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/tuzor/fid01.smk
rename to mpq/portrait/sp/inc/tuzor/fid01.smk
diff --git a/mpq/portrait/special/inc/tuzor/fid02.smk b/mpq/portrait/sp/inc/tuzor/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/tuzor/fid02.smk
rename to mpq/portrait/sp/inc/tuzor/fid02.smk
diff --git a/mpq/portrait/special/inc/tuzor/tlk00.smk b/mpq/portrait/sp/inc/tuzor/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/tuzor/tlk00.smk
rename to mpq/portrait/sp/inc/tuzor/tlk00.smk
diff --git a/mpq/portrait/special/inc/tuzor/tlk01.smk b/mpq/portrait/sp/inc/tuzor/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/tuzor/tlk01.smk
rename to mpq/portrait/sp/inc/tuzor/tlk01.smk
diff --git a/mpq/portrait/special/inc/tuzor/tlk02.smk b/mpq/portrait/sp/inc/tuzor/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/tuzor/tlk02.smk
rename to mpq/portrait/sp/inc/tuzor/tlk02.smk
diff --git a/mpq/portrait/special/inc/warmonger/fid00.smk b/mpq/portrait/sp/inc/warmonger/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/fid00.smk
rename to mpq/portrait/sp/inc/warmonger/fid00.smk
diff --git a/mpq/portrait/special/inc/warmonger/fid01.smk b/mpq/portrait/sp/inc/warmonger/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/fid01.smk
rename to mpq/portrait/sp/inc/warmonger/fid01.smk
diff --git a/mpq/portrait/special/inc/warmonger/fid02.smk b/mpq/portrait/sp/inc/warmonger/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/fid02.smk
rename to mpq/portrait/sp/inc/warmonger/fid02.smk
diff --git a/mpq/portrait/special/inc/warmonger/fid03.smk b/mpq/portrait/sp/inc/warmonger/fid03.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/fid03.smk
rename to mpq/portrait/sp/inc/warmonger/fid03.smk
diff --git a/mpq/portrait/special/inc/warmonger/tlk00.smk b/mpq/portrait/sp/inc/warmonger/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/tlk00.smk
rename to mpq/portrait/sp/inc/warmonger/tlk00.smk
diff --git a/mpq/portrait/special/inc/warmonger/tlk01.smk b/mpq/portrait/sp/inc/warmonger/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/tlk01.smk
rename to mpq/portrait/sp/inc/warmonger/tlk01.smk
diff --git a/mpq/portrait/special/inc/warmonger/tlk02.smk b/mpq/portrait/sp/inc/warmonger/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/warmonger/tlk02.smk
rename to mpq/portrait/sp/inc/warmonger/tlk02.smk
diff --git a/mpq/portrait/special/inc/yggdrasil/fid00.smk b/mpq/portrait/sp/inc/yggdrasil/fid00.smk
similarity index 100%
rename from mpq/portrait/special/inc/yggdrasil/fid00.smk
rename to mpq/portrait/sp/inc/yggdrasil/fid00.smk
diff --git a/mpq/portrait/special/inc/yggdrasil/fid01.smk b/mpq/portrait/sp/inc/yggdrasil/fid01.smk
similarity index 100%
rename from mpq/portrait/special/inc/yggdrasil/fid01.smk
rename to mpq/portrait/sp/inc/yggdrasil/fid01.smk
diff --git a/mpq/portrait/special/inc/yggdrasil/fid02.smk b/mpq/portrait/sp/inc/yggdrasil/fid02.smk
similarity index 100%
rename from mpq/portrait/special/inc/yggdrasil/fid02.smk
rename to mpq/portrait/sp/inc/yggdrasil/fid02.smk
diff --git a/mpq/portrait/special/inc/yggdrasil/tlk00.smk b/mpq/portrait/sp/inc/yggdrasil/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/inc/yggdrasil/tlk00.smk
rename to mpq/portrait/sp/inc/yggdrasil/tlk00.smk
diff --git a/mpq/portrait/special/inc/yggdrasil/tlk01.smk b/mpq/portrait/sp/inc/yggdrasil/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/inc/yggdrasil/tlk01.smk
rename to mpq/portrait/sp/inc/yggdrasil/tlk01.smk
diff --git a/mpq/portrait/special/inc/yggdrasil/tlk02.smk b/mpq/portrait/sp/inc/yggdrasil/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/inc/yggdrasil/tlk02.smk
rename to mpq/portrait/sp/inc/yggdrasil/tlk02.smk
diff --git a/mpq/portrait/special/joran/fid00.smk b/mpq/portrait/sp/joran/fid00.smk
similarity index 100%
rename from mpq/portrait/special/joran/fid00.smk
rename to mpq/portrait/sp/joran/fid00.smk
diff --git a/mpq/portrait/special/joran/fid01.smk b/mpq/portrait/sp/joran/fid01.smk
similarity index 100%
rename from mpq/portrait/special/joran/fid01.smk
rename to mpq/portrait/sp/joran/fid01.smk
diff --git a/mpq/portrait/special/joran/fid02.smk b/mpq/portrait/sp/joran/fid02.smk
similarity index 100%
rename from mpq/portrait/special/joran/fid02.smk
rename to mpq/portrait/sp/joran/fid02.smk
diff --git a/mpq/portrait/special/joran/fid03.smk b/mpq/portrait/sp/joran/fid03.smk
similarity index 100%
rename from mpq/portrait/special/joran/fid03.smk
rename to mpq/portrait/sp/joran/fid03.smk
diff --git a/mpq/portrait/special/joran/tlk00.smk b/mpq/portrait/sp/joran/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/joran/tlk00.smk
rename to mpq/portrait/sp/joran/tlk00.smk
diff --git a/mpq/portrait/special/kortar/fid00.smk b/mpq/portrait/sp/kortar/fid00.smk
similarity index 100%
rename from mpq/portrait/special/kortar/fid00.smk
rename to mpq/portrait/sp/kortar/fid00.smk
diff --git a/mpq/portrait/special/kortar/fid01.smk b/mpq/portrait/sp/kortar/fid01.smk
similarity index 100%
rename from mpq/portrait/special/kortar/fid01.smk
rename to mpq/portrait/sp/kortar/fid01.smk
diff --git a/mpq/portrait/special/kortar/fid02.smk b/mpq/portrait/sp/kortar/fid02.smk
similarity index 100%
rename from mpq/portrait/special/kortar/fid02.smk
rename to mpq/portrait/sp/kortar/fid02.smk
diff --git a/mpq/portrait/special/kortar/fid03.smk b/mpq/portrait/sp/kortar/fid03.smk
similarity index 100%
rename from mpq/portrait/special/kortar/fid03.smk
rename to mpq/portrait/sp/kortar/fid03.smk
diff --git a/mpq/portrait/special/kortar/tlk00.smk b/mpq/portrait/sp/kortar/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/kortar/tlk00.smk
rename to mpq/portrait/sp/kortar/tlk00.smk
diff --git a/mpq/portrait/special/kortar/tlk01.smk b/mpq/portrait/sp/kortar/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/kortar/tlk01.smk
rename to mpq/portrait/sp/kortar/tlk01.smk
diff --git a/mpq/portrait/special/kortar/tlk02.smk b/mpq/portrait/sp/kortar/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/kortar/tlk02.smk
rename to mpq/portrait/sp/kortar/tlk02.smk
diff --git a/mpq/portrait/special/lannigan/fid00.smk b/mpq/portrait/sp/lannigan/fid00.smk
similarity index 100%
rename from mpq/portrait/special/lannigan/fid00.smk
rename to mpq/portrait/sp/lannigan/fid00.smk
diff --git a/mpq/portrait/special/lannigan/tlk00.smk b/mpq/portrait/sp/lannigan/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/lannigan/tlk00.smk
rename to mpq/portrait/sp/lannigan/tlk00.smk
diff --git a/mpq/portrait/special/lannigan/tlk01.smk b/mpq/portrait/sp/lannigan/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/lannigan/tlk01.smk
rename to mpq/portrait/sp/lannigan/tlk01.smk
diff --git a/mpq/portrait/special/mazakel/fid00.smk b/mpq/portrait/sp/mazakel/fid00.smk
similarity index 100%
rename from mpq/portrait/special/mazakel/fid00.smk
rename to mpq/portrait/sp/mazakel/fid00.smk
diff --git a/mpq/portrait/special/mazakel/fid01.smk b/mpq/portrait/sp/mazakel/fid01.smk
similarity index 100%
rename from mpq/portrait/special/mazakel/fid01.smk
rename to mpq/portrait/sp/mazakel/fid01.smk
diff --git a/mpq/portrait/special/mazakel/tlk00.smk b/mpq/portrait/sp/mazakel/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/mazakel/tlk00.smk
rename to mpq/portrait/sp/mazakel/tlk00.smk
diff --git a/mpq/portrait/special/mazakel/tlk01.smk b/mpq/portrait/sp/mazakel/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/mazakel/tlk01.smk
rename to mpq/portrait/sp/mazakel/tlk01.smk
diff --git a/mpq/portrait/special/medly/fid00.smk b/mpq/portrait/sp/medly/fid00.smk
similarity index 100%
rename from mpq/portrait/special/medly/fid00.smk
rename to mpq/portrait/sp/medly/fid00.smk
diff --git a/mpq/portrait/special/medly/tlk00.smk b/mpq/portrait/sp/medly/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/medly/tlk00.smk
rename to mpq/portrait/sp/medly/tlk00.smk
diff --git a/mpq/portrait/special/mephis/fid00.smk b/mpq/portrait/sp/mephis/fid00.smk
similarity index 100%
rename from mpq/portrait/special/mephis/fid00.smk
rename to mpq/portrait/sp/mephis/fid00.smk
diff --git a/mpq/portrait/special/mephis/fid01.smk b/mpq/portrait/sp/mephis/fid01.smk
similarity index 100%
rename from mpq/portrait/special/mephis/fid01.smk
rename to mpq/portrait/sp/mephis/fid01.smk
diff --git a/mpq/portrait/special/mephis/fid02.smk b/mpq/portrait/sp/mephis/fid02.smk
similarity index 100%
rename from mpq/portrait/special/mephis/fid02.smk
rename to mpq/portrait/sp/mephis/fid02.smk
diff --git a/mpq/portrait/special/mephis/tlk00.smk b/mpq/portrait/sp/mephis/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/mephis/tlk00.smk
rename to mpq/portrait/sp/mephis/tlk00.smk
diff --git a/mpq/portrait/special/mephis/tlk01.smk b/mpq/portrait/sp/mephis/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/mephis/tlk01.smk
rename to mpq/portrait/sp/mephis/tlk01.smk
diff --git a/mpq/portrait/special/mephis/tlk02.smk b/mpq/portrait/sp/mephis/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/mephis/tlk02.smk
rename to mpq/portrait/sp/mephis/tlk02.smk
diff --git a/mpq/portrait/special/mirith/fid00.smk b/mpq/portrait/sp/mirith/fid00.smk
similarity index 100%
rename from mpq/portrait/special/mirith/fid00.smk
rename to mpq/portrait/sp/mirith/fid00.smk
diff --git a/mpq/portrait/special/mirith/fid01.smk b/mpq/portrait/sp/mirith/fid01.smk
similarity index 100%
rename from mpq/portrait/special/mirith/fid01.smk
rename to mpq/portrait/sp/mirith/fid01.smk
diff --git a/mpq/portrait/special/mirith/tlk00.smk b/mpq/portrait/sp/mirith/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/mirith/tlk00.smk
rename to mpq/portrait/sp/mirith/tlk00.smk
diff --git a/mpq/portrait/special/mirith/tlk01.smk b/mpq/portrait/sp/mirith/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/mirith/tlk01.smk
rename to mpq/portrait/sp/mirith/tlk01.smk
diff --git a/mpq/portrait/special/nekron/fid00.smk b/mpq/portrait/sp/nekron/fid00.smk
similarity index 100%
rename from mpq/portrait/special/nekron/fid00.smk
rename to mpq/portrait/sp/nekron/fid00.smk
diff --git a/mpq/portrait/special/nekron/fid01.smk b/mpq/portrait/sp/nekron/fid01.smk
similarity index 100%
rename from mpq/portrait/special/nekron/fid01.smk
rename to mpq/portrait/sp/nekron/fid01.smk
diff --git a/mpq/portrait/special/nekron/fid02.smk b/mpq/portrait/sp/nekron/fid02.smk
similarity index 100%
rename from mpq/portrait/special/nekron/fid02.smk
rename to mpq/portrait/sp/nekron/fid02.smk
diff --git a/mpq/portrait/special/nekron/fid03.smk b/mpq/portrait/sp/nekron/fid03.smk
similarity index 100%
rename from mpq/portrait/special/nekron/fid03.smk
rename to mpq/portrait/sp/nekron/fid03.smk
diff --git a/mpq/portrait/special/nekron/tlk00.smk b/mpq/portrait/sp/nekron/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/nekron/tlk00.smk
rename to mpq/portrait/sp/nekron/tlk00.smk
diff --git a/mpq/portrait/special/nekron/tlk01.smk b/mpq/portrait/sp/nekron/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/nekron/tlk01.smk
rename to mpq/portrait/sp/nekron/tlk01.smk
diff --git a/mpq/portrait/special/nekron/tlk02.smk b/mpq/portrait/sp/nekron/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/nekron/tlk02.smk
rename to mpq/portrait/sp/nekron/tlk02.smk
diff --git a/mpq/portrait/special/organ_senescent/fid00.smk b/mpq/portrait/sp/organ_senescent/fid00.smk
similarity index 100%
rename from mpq/portrait/special/organ_senescent/fid00.smk
rename to mpq/portrait/sp/organ_senescent/fid00.smk
diff --git a/mpq/portrait/special/organ_senescent/fid01.smk b/mpq/portrait/sp/organ_senescent/fid01.smk
similarity index 100%
rename from mpq/portrait/special/organ_senescent/fid01.smk
rename to mpq/portrait/sp/organ_senescent/fid01.smk
diff --git a/mpq/portrait/special/organ_senescent/fid02.smk b/mpq/portrait/sp/organ_senescent/fid02.smk
similarity index 100%
rename from mpq/portrait/special/organ_senescent/fid02.smk
rename to mpq/portrait/sp/organ_senescent/fid02.smk
diff --git a/mpq/portrait/special/organ_senescent/tlk00.smk b/mpq/portrait/sp/organ_senescent/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/organ_senescent/tlk00.smk
rename to mpq/portrait/sp/organ_senescent/tlk00.smk
diff --git a/mpq/portrait/special/organ_senescent/tlk01.smk b/mpq/portrait/sp/organ_senescent/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/organ_senescent/tlk01.smk
rename to mpq/portrait/sp/organ_senescent/tlk01.smk
diff --git a/mpq/portrait/special/organ_senescent/tlk02.smk b/mpq/portrait/sp/organ_senescent/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/organ_senescent/tlk02.smk
rename to mpq/portrait/sp/organ_senescent/tlk02.smk
diff --git a/mpq/portrait/special/osina/fid00.smk b/mpq/portrait/sp/osina/fid00.smk
similarity index 100%
rename from mpq/portrait/special/osina/fid00.smk
rename to mpq/portrait/sp/osina/fid00.smk
diff --git a/mpq/portrait/special/osina/fid01.smk b/mpq/portrait/sp/osina/fid01.smk
similarity index 100%
rename from mpq/portrait/special/osina/fid01.smk
rename to mpq/portrait/sp/osina/fid01.smk
diff --git a/mpq/portrait/special/osina/fid02.smk b/mpq/portrait/sp/osina/fid02.smk
similarity index 100%
rename from mpq/portrait/special/osina/fid02.smk
rename to mpq/portrait/sp/osina/fid02.smk
diff --git a/mpq/portrait/special/osina/tlk00.smk b/mpq/portrait/sp/osina/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/osina/tlk00.smk
rename to mpq/portrait/sp/osina/tlk00.smk
diff --git a/mpq/portrait/special/osina/tlk01.smk b/mpq/portrait/sp/osina/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/osina/tlk01.smk
rename to mpq/portrait/sp/osina/tlk01.smk
diff --git a/mpq/portrait/special/piler/fid00.smk b/mpq/portrait/sp/piler/fid00.smk
similarity index 100%
rename from mpq/portrait/special/piler/fid00.smk
rename to mpq/portrait/sp/piler/fid00.smk
diff --git a/mpq/portrait/special/piler/fid01.smk b/mpq/portrait/sp/piler/fid01.smk
similarity index 100%
rename from mpq/portrait/special/piler/fid01.smk
rename to mpq/portrait/sp/piler/fid01.smk
diff --git a/mpq/portrait/special/piler/tlk00.smk b/mpq/portrait/sp/piler/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/piler/tlk00.smk
rename to mpq/portrait/sp/piler/tlk00.smk
diff --git a/mpq/portrait/special/piler/tlk01.smk b/mpq/portrait/sp/piler/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/piler/tlk01.smk
rename to mpq/portrait/sp/piler/tlk01.smk
diff --git a/mpq/portrait/special/pr0nogo/fid00.smk b/mpq/portrait/sp/pr0nogo/fid00.smk
similarity index 100%
rename from mpq/portrait/special/pr0nogo/fid00.smk
rename to mpq/portrait/sp/pr0nogo/fid00.smk
diff --git a/mpq/portrait/special/pr0nogo/fid01.smk b/mpq/portrait/sp/pr0nogo/fid01.smk
similarity index 100%
rename from mpq/portrait/special/pr0nogo/fid01.smk
rename to mpq/portrait/sp/pr0nogo/fid01.smk
diff --git a/mpq/portrait/special/pr0nogo/fid02.smk b/mpq/portrait/sp/pr0nogo/fid02.smk
similarity index 100%
rename from mpq/portrait/special/pr0nogo/fid02.smk
rename to mpq/portrait/sp/pr0nogo/fid02.smk
diff --git a/mpq/portrait/special/pr0nogo/tlk00.smk b/mpq/portrait/sp/pr0nogo/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/pr0nogo/tlk00.smk
rename to mpq/portrait/sp/pr0nogo/tlk00.smk
diff --git a/mpq/portrait/special/pr0nogo/tlk01.smk b/mpq/portrait/sp/pr0nogo/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/pr0nogo/tlk01.smk
rename to mpq/portrait/sp/pr0nogo/tlk01.smk
diff --git a/mpq/portrait/special/pr0nogo/tlk02.smk b/mpq/portrait/sp/pr0nogo/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/pr0nogo/tlk02.smk
rename to mpq/portrait/sp/pr0nogo/tlk02.smk
diff --git a/mpq/portrait/special/tazarain/fid00.smk b/mpq/portrait/sp/tazarain/fid00.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/fid00.smk
rename to mpq/portrait/sp/tazarain/fid00.smk
diff --git a/mpq/portrait/special/tazarain/fid01.smk b/mpq/portrait/sp/tazarain/fid01.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/fid01.smk
rename to mpq/portrait/sp/tazarain/fid01.smk
diff --git a/mpq/portrait/special/tazarain/fid02.smk b/mpq/portrait/sp/tazarain/fid02.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/fid02.smk
rename to mpq/portrait/sp/tazarain/fid02.smk
diff --git a/mpq/portrait/special/tazarain/fid03.smk b/mpq/portrait/sp/tazarain/fid03.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/fid03.smk
rename to mpq/portrait/sp/tazarain/fid03.smk
diff --git a/mpq/portrait/special/tazarain/tlk00.smk b/mpq/portrait/sp/tazarain/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/tlk00.smk
rename to mpq/portrait/sp/tazarain/tlk00.smk
diff --git a/mpq/portrait/special/tazarain/tlk01.smk b/mpq/portrait/sp/tazarain/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/tlk01.smk
rename to mpq/portrait/sp/tazarain/tlk01.smk
diff --git a/mpq/portrait/special/tazarain/tlk02.smk b/mpq/portrait/sp/tazarain/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/tazarain/tlk02.smk
rename to mpq/portrait/sp/tazarain/tlk02.smk
diff --git a/mpq/portrait/special/terimanok/fid00.smk b/mpq/portrait/sp/terimanok/fid00.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/fid00.smk
rename to mpq/portrait/sp/terimanok/fid00.smk
diff --git a/mpq/portrait/special/terimanok/fid01.smk b/mpq/portrait/sp/terimanok/fid01.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/fid01.smk
rename to mpq/portrait/sp/terimanok/fid01.smk
diff --git a/mpq/portrait/special/terimanok/fid02.smk b/mpq/portrait/sp/terimanok/fid02.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/fid02.smk
rename to mpq/portrait/sp/terimanok/fid02.smk
diff --git a/mpq/portrait/special/terimanok/fid03.smk b/mpq/portrait/sp/terimanok/fid03.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/fid03.smk
rename to mpq/portrait/sp/terimanok/fid03.smk
diff --git a/mpq/portrait/special/terimanok/tlk00.smk b/mpq/portrait/sp/terimanok/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/tlk00.smk
rename to mpq/portrait/sp/terimanok/tlk00.smk
diff --git a/mpq/portrait/special/terimanok/tlk01.smk b/mpq/portrait/sp/terimanok/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/tlk01.smk
rename to mpq/portrait/sp/terimanok/tlk01.smk
diff --git a/mpq/portrait/special/terimanok/tlk02.smk b/mpq/portrait/sp/terimanok/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/terimanok/tlk02.smk
rename to mpq/portrait/sp/terimanok/tlk02.smk
diff --git a/mpq/portrait/special/thyron/fid00.smk b/mpq/portrait/sp/thyron/fid00.smk
similarity index 100%
rename from mpq/portrait/special/thyron/fid00.smk
rename to mpq/portrait/sp/thyron/fid00.smk
diff --git a/mpq/portrait/special/thyron/tlk00.smk b/mpq/portrait/sp/thyron/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/thyron/tlk00.smk
rename to mpq/portrait/sp/thyron/tlk00.smk
diff --git a/mpq/portrait/special/trodin/fid00.smk b/mpq/portrait/sp/trodin/fid00.smk
similarity index 100%
rename from mpq/portrait/special/trodin/fid00.smk
rename to mpq/portrait/sp/trodin/fid00.smk
diff --git a/mpq/portrait/special/trodin/fid01.smk b/mpq/portrait/sp/trodin/fid01.smk
similarity index 100%
rename from mpq/portrait/special/trodin/fid01.smk
rename to mpq/portrait/sp/trodin/fid01.smk
diff --git a/mpq/portrait/special/trodin/fid02.smk b/mpq/portrait/sp/trodin/fid02.smk
similarity index 100%
rename from mpq/portrait/special/trodin/fid02.smk
rename to mpq/portrait/sp/trodin/fid02.smk
diff --git a/mpq/portrait/special/trodin/tlk00.smk b/mpq/portrait/sp/trodin/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/trodin/tlk00.smk
rename to mpq/portrait/sp/trodin/tlk00.smk
diff --git a/mpq/portrait/special/trodin/tlk01.smk b/mpq/portrait/sp/trodin/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/trodin/tlk01.smk
rename to mpq/portrait/sp/trodin/tlk01.smk
diff --git a/mpq/portrait/special/trodin/tlk02.smk b/mpq/portrait/sp/trodin/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/trodin/tlk02.smk
rename to mpq/portrait/sp/trodin/tlk02.smk
diff --git a/mpq/portrait/special/venammar/fid00.smk b/mpq/portrait/sp/venammar/fid00.smk
similarity index 100%
rename from mpq/portrait/special/venammar/fid00.smk
rename to mpq/portrait/sp/venammar/fid00.smk
diff --git a/mpq/portrait/special/venammar/fid01.smk b/mpq/portrait/sp/venammar/fid01.smk
similarity index 100%
rename from mpq/portrait/special/venammar/fid01.smk
rename to mpq/portrait/sp/venammar/fid01.smk
diff --git a/mpq/portrait/special/venammar/fid02.smk b/mpq/portrait/sp/venammar/fid02.smk
similarity index 100%
rename from mpq/portrait/special/venammar/fid02.smk
rename to mpq/portrait/sp/venammar/fid02.smk
diff --git a/mpq/portrait/special/venammar/fid03.smk b/mpq/portrait/sp/venammar/fid03.smk
similarity index 100%
rename from mpq/portrait/special/venammar/fid03.smk
rename to mpq/portrait/sp/venammar/fid03.smk
diff --git a/mpq/portrait/special/venammar/tlk00.smk b/mpq/portrait/sp/venammar/tlk00.smk
similarity index 100%
rename from mpq/portrait/special/venammar/tlk00.smk
rename to mpq/portrait/sp/venammar/tlk00.smk
diff --git a/mpq/portrait/special/venammar/tlk01.smk b/mpq/portrait/sp/venammar/tlk01.smk
similarity index 100%
rename from mpq/portrait/special/venammar/tlk01.smk
rename to mpq/portrait/sp/venammar/tlk01.smk
diff --git a/mpq/portrait/special/venammar/tlk02.smk b/mpq/portrait/sp/venammar/tlk02.smk
similarity index 100%
rename from mpq/portrait/special/venammar/tlk02.smk
rename to mpq/portrait/sp/venammar/tlk02.smk
diff --git a/mpq/portrait/terran/aion/fid00.smk b/mpq/portrait/t/aion/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/aion/fid00.smk
rename to mpq/portrait/t/aion/fid00.smk
diff --git a/mpq/portrait/terran/aion/fid01.smk b/mpq/portrait/t/aion/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/aion/fid01.smk
rename to mpq/portrait/t/aion/fid01.smk
diff --git a/mpq/portrait/terran/aion/tlk00.smk b/mpq/portrait/t/aion/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/aion/tlk00.smk
rename to mpq/portrait/t/aion/tlk00.smk
diff --git a/mpq/portrait/terran/aion/tlk01.smk b/mpq/portrait/t/aion/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/aion/tlk01.smk
rename to mpq/portrait/t/aion/tlk01.smk
diff --git a/mpq/portrait/terran/aion/tlk02.smk b/mpq/portrait/t/aion/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/aion/tlk02.smk
rename to mpq/portrait/t/aion/tlk02.smk
diff --git a/mpq/portrait/terran/ancile/fid00.smk b/mpq/portrait/t/ancile/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/ancile/fid00.smk
rename to mpq/portrait/t/ancile/fid00.smk
diff --git a/mpq/portrait/terran/ancile/fid01.smk b/mpq/portrait/t/ancile/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/ancile/fid01.smk
rename to mpq/portrait/t/ancile/fid01.smk
diff --git a/mpq/portrait/terran/ancile/fid02.smk b/mpq/portrait/t/ancile/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/ancile/fid02.smk
rename to mpq/portrait/t/ancile/fid02.smk
diff --git a/mpq/portrait/terran/ancile/tlk00.smk b/mpq/portrait/t/ancile/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/ancile/tlk00.smk
rename to mpq/portrait/t/ancile/tlk00.smk
diff --git a/mpq/portrait/terran/ancile/tlk01.smk b/mpq/portrait/t/ancile/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/ancile/tlk01.smk
rename to mpq/portrait/t/ancile/tlk01.smk
diff --git a/mpq/portrait/terran/anticthon/fid00.smk b/mpq/portrait/t/anticthon/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/anticthon/fid00.smk
rename to mpq/portrait/t/anticthon/fid00.smk
diff --git a/mpq/portrait/terran/anticthon/tlk00.smk b/mpq/portrait/t/anticthon/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/anticthon/tlk00.smk
rename to mpq/portrait/t/anticthon/tlk00.smk
diff --git a/mpq/portrait/terran/apostle/fid00.smk b/mpq/portrait/t/apostle/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/apostle/fid00.smk
rename to mpq/portrait/t/apostle/fid00.smk
diff --git a/mpq/portrait/terran/apostle/fid01.smk b/mpq/portrait/t/apostle/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/apostle/fid01.smk
rename to mpq/portrait/t/apostle/fid01.smk
diff --git a/mpq/portrait/terran/apostle/tlk00.smk b/mpq/portrait/t/apostle/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/apostle/tlk00.smk
rename to mpq/portrait/t/apostle/tlk00.smk
diff --git a/mpq/portrait/terran/apostle/tlk01.smk b/mpq/portrait/t/apostle/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/apostle/tlk01.smk
rename to mpq/portrait/t/apostle/tlk01.smk
diff --git a/mpq/portrait/terran/autocrat/fid00.smk b/mpq/portrait/t/autocrat/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/autocrat/fid00.smk
rename to mpq/portrait/t/autocrat/fid00.smk
diff --git a/mpq/portrait/terran/autocrat/fid01.smk b/mpq/portrait/t/autocrat/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/autocrat/fid01.smk
rename to mpq/portrait/t/autocrat/fid01.smk
diff --git a/mpq/portrait/terran/autocrat/tlk00.smk b/mpq/portrait/t/autocrat/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/autocrat/tlk00.smk
rename to mpq/portrait/t/autocrat/tlk00.smk
diff --git a/mpq/portrait/terran/autocrat/tlk01.smk b/mpq/portrait/t/autocrat/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/autocrat/tlk01.smk
rename to mpq/portrait/t/autocrat/tlk01.smk
diff --git a/mpq/portrait/terran/azazel/fid00.smk b/mpq/portrait/t/azazel/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/azazel/fid00.smk
rename to mpq/portrait/t/azazel/fid00.smk
diff --git a/mpq/portrait/terran/azazel/fid01.smk b/mpq/portrait/t/azazel/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/azazel/fid01.smk
rename to mpq/portrait/t/azazel/fid01.smk
diff --git a/mpq/portrait/terran/azazel/fid02.smk b/mpq/portrait/t/azazel/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/azazel/fid02.smk
rename to mpq/portrait/t/azazel/fid02.smk
diff --git a/mpq/portrait/terran/azazel/tlk00.smk b/mpq/portrait/t/azazel/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/azazel/tlk00.smk
rename to mpq/portrait/t/azazel/tlk00.smk
diff --git a/mpq/portrait/terran/azazel/tlk01.smk b/mpq/portrait/t/azazel/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/azazel/tlk01.smk
rename to mpq/portrait/t/azazel/tlk01.smk
diff --git a/mpq/portrait/terran/cataphract/fid00.smk b/mpq/portrait/t/cataphract/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/cataphract/fid00.smk
rename to mpq/portrait/t/cataphract/fid00.smk
diff --git a/mpq/portrait/terran/cataphract/fid01.smk b/mpq/portrait/t/cataphract/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/cataphract/fid01.smk
rename to mpq/portrait/t/cataphract/fid01.smk
diff --git a/mpq/portrait/terran/cataphract/tlk00.smk b/mpq/portrait/t/cataphract/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/cataphract/tlk00.smk
rename to mpq/portrait/t/cataphract/tlk00.smk
diff --git a/mpq/portrait/terran/cataphract/tlk01.smk b/mpq/portrait/t/cataphract/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/cataphract/tlk01.smk
rename to mpq/portrait/t/cataphract/tlk01.smk
diff --git a/mpq/portrait/terran/centaur/fid00.smk b/mpq/portrait/t/centaur/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/centaur/fid00.smk
rename to mpq/portrait/t/centaur/fid00.smk
diff --git a/mpq/portrait/terran/centaur/fid01.smk b/mpq/portrait/t/centaur/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/centaur/fid01.smk
rename to mpq/portrait/t/centaur/fid01.smk
diff --git a/mpq/portrait/terran/centaur/tlk00.smk b/mpq/portrait/t/centaur/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/centaur/tlk00.smk
rename to mpq/portrait/t/centaur/tlk00.smk
diff --git a/mpq/portrait/terran/centaur/tlk01.smk b/mpq/portrait/t/centaur/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/centaur/tlk01.smk
rename to mpq/portrait/t/centaur/tlk01.smk
diff --git a/mpq/portrait/terran/centaur/tlk02.smk b/mpq/portrait/t/centaur/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/centaur/tlk02.smk
rename to mpq/portrait/t/centaur/tlk02.smk
diff --git a/mpq/portrait/terran/claymore/fid00.smk b/mpq/portrait/t/claymore/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/claymore/fid00.smk
rename to mpq/portrait/t/claymore/fid00.smk
diff --git a/mpq/portrait/terran/claymore/tlk00.smk b/mpq/portrait/t/claymore/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/claymore/tlk00.smk
rename to mpq/portrait/t/claymore/tlk00.smk
diff --git a/mpq/portrait/terran/cuirass/fid00.smk b/mpq/portrait/t/cuirass/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/cuirass/fid00.smk
rename to mpq/portrait/t/cuirass/fid00.smk
diff --git a/mpq/portrait/terran/cuirass/fid01.smk b/mpq/portrait/t/cuirass/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/cuirass/fid01.smk
rename to mpq/portrait/t/cuirass/fid01.smk
diff --git a/mpq/portrait/terran/cuirass/tlk00.smk b/mpq/portrait/t/cuirass/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/cuirass/tlk00.smk
rename to mpq/portrait/t/cuirass/tlk00.smk
diff --git a/mpq/portrait/terran/cuirass/tlk01.smk b/mpq/portrait/t/cuirass/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/cuirass/tlk01.smk
rename to mpq/portrait/t/cuirass/tlk01.smk
diff --git a/mpq/portrait/terran/cyclops/fid00.smk b/mpq/portrait/t/cyclops/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/cyclops/fid00.smk
rename to mpq/portrait/t/cyclops/fid00.smk
diff --git a/mpq/portrait/terran/cyclops/tlk00.smk b/mpq/portrait/t/cyclops/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/cyclops/tlk00.smk
rename to mpq/portrait/t/cyclops/tlk00.smk
diff --git a/mpq/portrait/terran/cyprian/fid00.smk b/mpq/portrait/t/cyprian/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/cyprian/fid00.smk
rename to mpq/portrait/t/cyprian/fid00.smk
diff --git a/mpq/portrait/terran/cyprian/tlk00.smk b/mpq/portrait/t/cyprian/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/cyprian/tlk00.smk
rename to mpq/portrait/t/cyprian/tlk00.smk
diff --git a/mpq/portrait/terran/dilettante/fid00.smk b/mpq/portrait/t/dilettante/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/dilettante/fid00.smk
rename to mpq/portrait/t/dilettante/fid00.smk
diff --git a/mpq/portrait/terran/durendal/fid00.smk b/mpq/portrait/t/durendal/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/fid00.smk
rename to mpq/portrait/t/durendal/fid00.smk
diff --git a/mpq/portrait/terran/durendal/fid01.smk b/mpq/portrait/t/durendal/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/fid01.smk
rename to mpq/portrait/t/durendal/fid01.smk
diff --git a/mpq/portrait/terran/durendal/fid02.smk b/mpq/portrait/t/durendal/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/fid02.smk
rename to mpq/portrait/t/durendal/fid02.smk
diff --git a/mpq/portrait/terran/durendal/fid03.smk b/mpq/portrait/t/durendal/fid03.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/fid03.smk
rename to mpq/portrait/t/durendal/fid03.smk
diff --git a/mpq/portrait/terran/durendal/tlk00.smk b/mpq/portrait/t/durendal/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/tlk00.smk
rename to mpq/portrait/t/durendal/tlk00.smk
diff --git a/mpq/portrait/terran/durendal/tlk01.smk b/mpq/portrait/t/durendal/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/tlk01.smk
rename to mpq/portrait/t/durendal/tlk01.smk
diff --git a/mpq/portrait/terran/durendal/tlk02.smk b/mpq/portrait/t/durendal/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/durendal/tlk02.smk
rename to mpq/portrait/t/durendal/tlk02.smk
diff --git a/mpq/portrait/terran/gorgon/fid00.smk b/mpq/portrait/t/gorgon/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/fid00.smk
rename to mpq/portrait/t/gorgon/fid00.smk
diff --git a/mpq/portrait/terran/gorgon/fid01.smk b/mpq/portrait/t/gorgon/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/fid01.smk
rename to mpq/portrait/t/gorgon/fid01.smk
diff --git a/mpq/portrait/terran/gorgon/fid02.smk b/mpq/portrait/t/gorgon/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/fid02.smk
rename to mpq/portrait/t/gorgon/fid02.smk
diff --git a/mpq/portrait/terran/gorgon/fid03.smk b/mpq/portrait/t/gorgon/fid03.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/fid03.smk
rename to mpq/portrait/t/gorgon/fid03.smk
diff --git a/mpq/portrait/terran/gorgon/tlk00.smk b/mpq/portrait/t/gorgon/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/tlk00.smk
rename to mpq/portrait/t/gorgon/tlk00.smk
diff --git a/mpq/portrait/terran/gorgon/tlk01.smk b/mpq/portrait/t/gorgon/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/tlk01.smk
rename to mpq/portrait/t/gorgon/tlk01.smk
diff --git a/mpq/portrait/terran/gorgon/tlk02.smk b/mpq/portrait/t/gorgon/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/gorgon/tlk02.smk
rename to mpq/portrait/t/gorgon/tlk02.smk
diff --git a/mpq/portrait/terran/heracles/fid00.smk b/mpq/portrait/t/heracles/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/heracles/fid00.smk
rename to mpq/portrait/t/heracles/fid00.smk
diff --git a/mpq/portrait/terran/heracles/fid01.smk b/mpq/portrait/t/heracles/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/heracles/fid01.smk
rename to mpq/portrait/t/heracles/fid01.smk
diff --git a/mpq/portrait/terran/heracles/fid02.smk b/mpq/portrait/t/heracles/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/heracles/fid02.smk
rename to mpq/portrait/t/heracles/fid02.smk
diff --git a/mpq/portrait/terran/heracles/tlk00.smk b/mpq/portrait/t/heracles/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/heracles/tlk00.smk
rename to mpq/portrait/t/heracles/tlk00.smk
diff --git a/mpq/portrait/terran/heracles/tlk01.smk b/mpq/portrait/t/heracles/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/heracles/tlk01.smk
rename to mpq/portrait/t/heracles/tlk01.smk
diff --git a/mpq/portrait/terran/hippogriff/fid00.smk b/mpq/portrait/t/hippogriff/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/hippogriff/fid00.smk
rename to mpq/portrait/t/hippogriff/fid00.smk
diff --git a/mpq/portrait/terran/hippogriff/fid01.smk b/mpq/portrait/t/hippogriff/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/hippogriff/fid01.smk
rename to mpq/portrait/t/hippogriff/fid01.smk
diff --git a/mpq/portrait/terran/hippogriff/tlk00.smk b/mpq/portrait/t/hippogriff/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/hippogriff/tlk00.smk
rename to mpq/portrait/t/hippogriff/tlk00.smk
diff --git a/mpq/portrait/terran/hypnagogue/fid00.smk b/mpq/portrait/t/hypnagogue/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/hypnagogue/fid00.smk
rename to mpq/portrait/t/hypnagogue/fid00.smk
diff --git a/mpq/portrait/terran/hypnagogue/fid01.smk b/mpq/portrait/t/hypnagogue/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/hypnagogue/fid01.smk
rename to mpq/portrait/t/hypnagogue/fid01.smk
diff --git a/mpq/portrait/terran/hypnagogue/tlk00.smk b/mpq/portrait/t/hypnagogue/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/hypnagogue/tlk00.smk
rename to mpq/portrait/t/hypnagogue/tlk00.smk
diff --git a/mpq/portrait/terran/hypnagogue/tlk01.smk b/mpq/portrait/t/hypnagogue/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/hypnagogue/tlk01.smk
rename to mpq/portrait/t/hypnagogue/tlk01.smk
diff --git a/mpq/portrait/terran/hypnagogue/tlk02.smk b/mpq/portrait/t/hypnagogue/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/hypnagogue/tlk02.smk
rename to mpq/portrait/t/hypnagogue/tlk02.smk
diff --git a/mpq/portrait/terran/madcap/fid00.smk b/mpq/portrait/t/madcap/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/madcap/fid00.smk
rename to mpq/portrait/t/madcap/fid00.smk
diff --git a/mpq/portrait/terran/madcap/fid01.smk b/mpq/portrait/t/madcap/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/madcap/fid01.smk
rename to mpq/portrait/t/madcap/fid01.smk
diff --git a/mpq/portrait/terran/madcap/tlk00.smk b/mpq/portrait/t/madcap/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/madcap/tlk00.smk
rename to mpq/portrait/t/madcap/tlk00.smk
diff --git a/mpq/portrait/terran/madcap/tlk01.smk b/mpq/portrait/t/madcap/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/madcap/tlk01.smk
rename to mpq/portrait/t/madcap/tlk01.smk
diff --git a/mpq/portrait/terran/madrigal/fid00.smk b/mpq/portrait/t/madrigal/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/madrigal/fid00.smk
rename to mpq/portrait/t/madrigal/fid00.smk
diff --git a/mpq/portrait/terran/madrigal/tlk00.smk b/mpq/portrait/t/madrigal/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/madrigal/tlk00.smk
rename to mpq/portrait/t/madrigal/tlk00.smk
diff --git a/mpq/portrait/terran/matador/fid00.smk b/mpq/portrait/t/matador/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/matador/fid00.smk
rename to mpq/portrait/t/matador/fid00.smk
diff --git a/mpq/portrait/terran/matador/tlk00.smk b/mpq/portrait/t/matador/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/matador/tlk00.smk
rename to mpq/portrait/t/matador/tlk00.smk
diff --git a/mpq/portrait/terran/olympian/fid00.smk b/mpq/portrait/t/olympian/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/olympian/fid00.smk
rename to mpq/portrait/t/olympian/fid00.smk
diff --git a/mpq/portrait/terran/olympian/tlk00.smk b/mpq/portrait/t/olympian/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/olympian/tlk00.smk
rename to mpq/portrait/t/olympian/tlk00.smk
diff --git a/mpq/portrait/terran/paladin/fid00.smk b/mpq/portrait/t/paladin/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/paladin/fid00.smk
rename to mpq/portrait/t/paladin/fid00.smk
diff --git a/mpq/portrait/terran/paladin/fid01.smk b/mpq/portrait/t/paladin/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/paladin/fid01.smk
rename to mpq/portrait/t/paladin/fid01.smk
diff --git a/mpq/portrait/terran/paladin/fid02.smk b/mpq/portrait/t/paladin/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/paladin/fid02.smk
rename to mpq/portrait/t/paladin/fid02.smk
diff --git a/mpq/portrait/terran/paladin/tlk00.smk b/mpq/portrait/t/paladin/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/paladin/tlk00.smk
rename to mpq/portrait/t/paladin/tlk00.smk
diff --git a/mpq/portrait/terran/paladin/tlk01.smk b/mpq/portrait/t/paladin/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/paladin/tlk01.smk
rename to mpq/portrait/t/paladin/tlk01.smk
diff --git a/mpq/portrait/terran/pazuzu/fid00.smk b/mpq/portrait/t/pazuzu/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/pazuzu/fid00.smk
rename to mpq/portrait/t/pazuzu/fid00.smk
diff --git a/mpq/portrait/terran/pazuzu/fid01.smk b/mpq/portrait/t/pazuzu/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/pazuzu/fid01.smk
rename to mpq/portrait/t/pazuzu/fid01.smk
diff --git a/mpq/portrait/terran/pazuzu/fid02.smk b/mpq/portrait/t/pazuzu/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/pazuzu/fid02.smk
rename to mpq/portrait/t/pazuzu/fid02.smk
diff --git a/mpq/portrait/terran/pazuzu/tlk00.smk b/mpq/portrait/t/pazuzu/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/pazuzu/tlk00.smk
rename to mpq/portrait/t/pazuzu/tlk00.smk
diff --git a/mpq/portrait/terran/pazuzu/tlk01.smk b/mpq/portrait/t/pazuzu/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/pazuzu/tlk01.smk
rename to mpq/portrait/t/pazuzu/tlk01.smk
diff --git a/mpq/portrait/terran/phobos/fid00.smk b/mpq/portrait/t/phobos/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/fid00.smk
rename to mpq/portrait/t/phobos/fid00.smk
diff --git a/mpq/portrait/terran/phobos/fid01.smk b/mpq/portrait/t/phobos/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/fid01.smk
rename to mpq/portrait/t/phobos/fid01.smk
diff --git a/mpq/portrait/terran/phobos/fid02.smk b/mpq/portrait/t/phobos/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/fid02.smk
rename to mpq/portrait/t/phobos/fid02.smk
diff --git a/mpq/portrait/terran/phobos/fid03.smk b/mpq/portrait/t/phobos/fid03.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/fid03.smk
rename to mpq/portrait/t/phobos/fid03.smk
diff --git a/mpq/portrait/terran/phobos/tlk00.smk b/mpq/portrait/t/phobos/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/tlk00.smk
rename to mpq/portrait/t/phobos/tlk00.smk
diff --git a/mpq/portrait/terran/phobos/tlk01.smk b/mpq/portrait/t/phobos/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/tlk01.smk
rename to mpq/portrait/t/phobos/tlk01.smk
diff --git a/mpq/portrait/terran/phobos/tlk02.smk b/mpq/portrait/t/phobos/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/phobos/tlk02.smk
rename to mpq/portrait/t/phobos/tlk02.smk
diff --git a/mpq/portrait/terran/pythean/fid00.smk b/mpq/portrait/t/pythean/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/fid00.smk
rename to mpq/portrait/t/pythean/fid00.smk
diff --git a/mpq/portrait/terran/pythean/fid01.smk b/mpq/portrait/t/pythean/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/fid01.smk
rename to mpq/portrait/t/pythean/fid01.smk
diff --git a/mpq/portrait/terran/pythean/fid02.smk b/mpq/portrait/t/pythean/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/fid02.smk
rename to mpq/portrait/t/pythean/fid02.smk
diff --git a/mpq/portrait/terran/pythean/fid03.smk b/mpq/portrait/t/pythean/fid03.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/fid03.smk
rename to mpq/portrait/t/pythean/fid03.smk
diff --git a/mpq/portrait/terran/pythean/tlk00.smk b/mpq/portrait/t/pythean/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/tlk00.smk
rename to mpq/portrait/t/pythean/tlk00.smk
diff --git a/mpq/portrait/terran/pythean/tlk01.smk b/mpq/portrait/t/pythean/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/tlk01.smk
rename to mpq/portrait/t/pythean/tlk01.smk
diff --git a/mpq/portrait/terran/pythean/tlk02.smk b/mpq/portrait/t/pythean/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/pythean/tlk02.smk
rename to mpq/portrait/t/pythean/tlk02.smk
diff --git a/mpq/portrait/terran/ramesses/fid00.smk b/mpq/portrait/t/ramesses/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/ramesses/fid00.smk
rename to mpq/portrait/t/ramesses/fid00.smk
diff --git a/mpq/portrait/terran/ramesses/fid01.smk b/mpq/portrait/t/ramesses/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/ramesses/fid01.smk
rename to mpq/portrait/t/ramesses/fid01.smk
diff --git a/mpq/portrait/terran/ramesses/fid02.smk b/mpq/portrait/t/ramesses/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/ramesses/fid02.smk
rename to mpq/portrait/t/ramesses/fid02.smk
diff --git a/mpq/portrait/terran/ramesses/tlk00.smk b/mpq/portrait/t/ramesses/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/ramesses/tlk00.smk
rename to mpq/portrait/t/ramesses/tlk00.smk
diff --git a/mpq/portrait/terran/ramesses/tlk01.smk b/mpq/portrait/t/ramesses/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/ramesses/tlk01.smk
rename to mpq/portrait/t/ramesses/tlk01.smk
diff --git a/mpq/portrait/terran/salamander/fid00.smk b/mpq/portrait/t/salamander/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/fid00.smk
rename to mpq/portrait/t/salamander/fid00.smk
diff --git a/mpq/portrait/terran/salamander/fid01.smk b/mpq/portrait/t/salamander/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/fid01.smk
rename to mpq/portrait/t/salamander/fid01.smk
diff --git a/mpq/portrait/terran/salamander/fid02.smk b/mpq/portrait/t/salamander/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/fid02.smk
rename to mpq/portrait/t/salamander/fid02.smk
diff --git a/mpq/portrait/terran/salamander/fid03.smk b/mpq/portrait/t/salamander/fid03.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/fid03.smk
rename to mpq/portrait/t/salamander/fid03.smk
diff --git a/mpq/portrait/terran/salamander/tlk00.smk b/mpq/portrait/t/salamander/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/tlk00.smk
rename to mpq/portrait/t/salamander/tlk00.smk
diff --git a/mpq/portrait/terran/salamander/tlk01.smk b/mpq/portrait/t/salamander/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/tlk01.smk
rename to mpq/portrait/t/salamander/tlk01.smk
diff --git a/mpq/portrait/terran/salamander/tlk02.smk b/mpq/portrait/t/salamander/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/salamander/tlk02.smk
rename to mpq/portrait/t/salamander/tlk02.smk
diff --git a/mpq/portrait/terran/savant/fid00.smk b/mpq/portrait/t/savant/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/savant/fid00.smk
rename to mpq/portrait/t/savant/fid00.smk
diff --git a/mpq/portrait/terran/savant/fid01.smk b/mpq/portrait/t/savant/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/savant/fid01.smk
rename to mpq/portrait/t/savant/fid01.smk
diff --git a/mpq/portrait/terran/savant/tlk00.smk b/mpq/portrait/t/savant/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/savant/tlk00.smk
rename to mpq/portrait/t/savant/tlk00.smk
diff --git a/mpq/portrait/terran/sevenstep/fid00.smk b/mpq/portrait/t/sevenstep/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/sevenstep/fid00.smk
rename to mpq/portrait/t/sevenstep/fid00.smk
diff --git a/mpq/portrait/terran/sevenstep/tlk00.smk b/mpq/portrait/t/sevenstep/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/sevenstep/tlk00.smk
rename to mpq/portrait/t/sevenstep/tlk00.smk
diff --git a/mpq/portrait/terran/shaman/fid00.smk b/mpq/portrait/t/shaman/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/shaman/fid00.smk
rename to mpq/portrait/t/shaman/fid00.smk
diff --git a/mpq/portrait/terran/shaman/tlk00.smk b/mpq/portrait/t/shaman/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/shaman/tlk00.smk
rename to mpq/portrait/t/shaman/tlk00.smk
diff --git a/mpq/portrait/terran/silvertongue/fid00.smk b/mpq/portrait/t/silvertongue/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/fid00.smk
rename to mpq/portrait/t/silvertongue/fid00.smk
diff --git a/mpq/portrait/terran/silvertongue/fid01.smk b/mpq/portrait/t/silvertongue/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/fid01.smk
rename to mpq/portrait/t/silvertongue/fid01.smk
diff --git a/mpq/portrait/terran/silvertongue/fid02.smk b/mpq/portrait/t/silvertongue/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/fid02.smk
rename to mpq/portrait/t/silvertongue/fid02.smk
diff --git a/mpq/portrait/terran/silvertongue/fid03.smk b/mpq/portrait/t/silvertongue/fid03.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/fid03.smk
rename to mpq/portrait/t/silvertongue/fid03.smk
diff --git a/mpq/portrait/terran/silvertongue/tlk00.smk b/mpq/portrait/t/silvertongue/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/tlk00.smk
rename to mpq/portrait/t/silvertongue/tlk00.smk
diff --git a/mpq/portrait/terran/silvertongue/tlk01.smk b/mpq/portrait/t/silvertongue/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/tlk01.smk
rename to mpq/portrait/t/silvertongue/tlk01.smk
diff --git a/mpq/portrait/terran/silvertongue/tlk02.smk b/mpq/portrait/t/silvertongue/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/silvertongue/tlk02.smk
rename to mpq/portrait/t/silvertongue/tlk02.smk
diff --git a/mpq/portrait/terran/siren/fid00.smk b/mpq/portrait/t/siren/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/siren/fid00.smk
rename to mpq/portrait/t/siren/fid00.smk
diff --git a/mpq/portrait/terran/siren/fid01.smk b/mpq/portrait/t/siren/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/siren/fid01.smk
rename to mpq/portrait/t/siren/fid01.smk
diff --git a/mpq/portrait/terran/siren/fid02.smk b/mpq/portrait/t/siren/fid02.smk
similarity index 100%
rename from mpq/portrait/terran/siren/fid02.smk
rename to mpq/portrait/t/siren/fid02.smk
diff --git a/mpq/portrait/terran/siren/tlk00.smk b/mpq/portrait/t/siren/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/siren/tlk00.smk
rename to mpq/portrait/t/siren/tlk00.smk
diff --git a/mpq/portrait/terran/striga/fid00.smk b/mpq/portrait/t/striga/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/striga/fid00.smk
rename to mpq/portrait/t/striga/fid00.smk
diff --git a/mpq/portrait/terran/striga/tlk00.smk b/mpq/portrait/t/striga/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/striga/tlk00.smk
rename to mpq/portrait/t/striga/tlk00.smk
diff --git a/mpq/portrait/terran/sundog/fid00.smk b/mpq/portrait/t/sundog/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/sundog/fid00.smk
rename to mpq/portrait/t/sundog/fid00.smk
diff --git a/mpq/portrait/terran/sundog/fid01.smk b/mpq/portrait/t/sundog/fid01.smk
similarity index 100%
rename from mpq/portrait/terran/sundog/fid01.smk
rename to mpq/portrait/t/sundog/fid01.smk
diff --git a/mpq/portrait/terran/sundog/tlk00.smk b/mpq/portrait/t/sundog/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/sundog/tlk00.smk
rename to mpq/portrait/t/sundog/tlk00.smk
diff --git a/mpq/portrait/terran/talos/fid00.smk b/mpq/portrait/t/talos/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/talos/fid00.smk
rename to mpq/portrait/t/talos/fid00.smk
diff --git a/mpq/portrait/terran/talos/tlk00.smk b/mpq/portrait/t/talos/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/talos/tlk00.smk
rename to mpq/portrait/t/talos/tlk00.smk
diff --git a/mpq/portrait/terran/talos/tlk01.smk b/mpq/portrait/t/talos/tlk01.smk
similarity index 100%
rename from mpq/portrait/terran/talos/tlk01.smk
rename to mpq/portrait/t/talos/tlk01.smk
diff --git a/mpq/portrait/terran/talos/tlk02.smk b/mpq/portrait/t/talos/tlk02.smk
similarity index 100%
rename from mpq/portrait/terran/talos/tlk02.smk
rename to mpq/portrait/t/talos/tlk02.smk
diff --git a/mpq/portrait/terran/wyvern/fid00.smk b/mpq/portrait/t/wyvern/fid00.smk
similarity index 100%
rename from mpq/portrait/terran/wyvern/fid00.smk
rename to mpq/portrait/t/wyvern/fid00.smk
diff --git a/mpq/portrait/terran/wyvern/tlk00.smk b/mpq/portrait/t/wyvern/tlk00.smk
similarity index 100%
rename from mpq/portrait/terran/wyvern/tlk00.smk
rename to mpq/portrait/t/wyvern/tlk00.smk
diff --git a/mpq/portrait/zerg/akistrokor/fid00.smk b/mpq/portrait/z/akistrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/akistrokor/fid00.smk
rename to mpq/portrait/z/akistrokor/fid00.smk
diff --git a/mpq/portrait/zerg/akistrokor/fid01.smk b/mpq/portrait/z/akistrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/akistrokor/fid01.smk
rename to mpq/portrait/z/akistrokor/fid01.smk
diff --git a/mpq/portrait/zerg/akistrokor/fid02.smk b/mpq/portrait/z/akistrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/akistrokor/fid02.smk
rename to mpq/portrait/z/akistrokor/fid02.smk
diff --git a/mpq/portrait/zerg/akistrokor/fid03.smk b/mpq/portrait/z/akistrokor/fid03.smk
similarity index 100%
rename from mpq/portrait/zerg/akistrokor/fid03.smk
rename to mpq/portrait/z/akistrokor/fid03.smk
diff --git a/mpq/portrait/zerg/akistrokor/tlk00.smk b/mpq/portrait/z/akistrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/akistrokor/tlk00.smk
rename to mpq/portrait/z/akistrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/akistrokor/tlk01.smk b/mpq/portrait/z/akistrokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/akistrokor/tlk01.smk
rename to mpq/portrait/z/akistrokor/tlk01.smk
diff --git a/mpq/portrait/zerg/algoztalisk/fid00.smk b/mpq/portrait/z/algoztalisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/algoztalisk/fid00.smk
rename to mpq/portrait/z/algoztalisk/fid00.smk
diff --git a/mpq/portrait/zerg/algoztalisk/fid01.smk b/mpq/portrait/z/algoztalisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/algoztalisk/fid01.smk
rename to mpq/portrait/z/algoztalisk/fid01.smk
diff --git a/mpq/portrait/zerg/algoztalisk/fid02.smk b/mpq/portrait/z/algoztalisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/algoztalisk/fid02.smk
rename to mpq/portrait/z/algoztalisk/fid02.smk
diff --git a/mpq/portrait/zerg/algoztalisk/tlk00.smk b/mpq/portrait/z/algoztalisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/algoztalisk/tlk00.smk
rename to mpq/portrait/z/algoztalisk/tlk00.smk
diff --git a/mpq/portrait/zerg/alkajelisk/fid00.smk b/mpq/portrait/z/alkajelisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/alkajelisk/fid00.smk
rename to mpq/portrait/z/alkajelisk/fid00.smk
diff --git a/mpq/portrait/zerg/alkajelisk/tlk00.smk b/mpq/portrait/z/alkajelisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/alkajelisk/tlk00.smk
rename to mpq/portrait/z/alkajelisk/tlk00.smk
diff --git a/mpq/portrait/zerg/almaksalisk/fid00.smk b/mpq/portrait/z/almaksalisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/almaksalisk/fid00.smk
rename to mpq/portrait/z/almaksalisk/fid00.smk
diff --git a/mpq/portrait/zerg/almaksalisk/tlk00.smk b/mpq/portrait/z/almaksalisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/almaksalisk/tlk00.smk
rename to mpq/portrait/z/almaksalisk/tlk00.smk
diff --git a/mpq/portrait/zerg/axitrilisk/fid00.smk b/mpq/portrait/z/axitrilisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/axitrilisk/fid00.smk
rename to mpq/portrait/z/axitrilisk/fid00.smk
diff --git a/mpq/portrait/zerg/axitrilisk/fid01.smk b/mpq/portrait/z/axitrilisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/axitrilisk/fid01.smk
rename to mpq/portrait/z/axitrilisk/fid01.smk
diff --git a/mpq/portrait/zerg/axitrilisk/fid02.smk b/mpq/portrait/z/axitrilisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/axitrilisk/fid02.smk
rename to mpq/portrait/z/axitrilisk/fid02.smk
diff --git a/mpq/portrait/zerg/axitrilisk/tlk00.smk b/mpq/portrait/z/axitrilisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/axitrilisk/tlk00.smk
rename to mpq/portrait/z/axitrilisk/tlk00.smk
diff --git a/mpq/portrait/zerg/bactalisk/fid00.smk b/mpq/portrait/z/bactalisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/bactalisk/fid00.smk
rename to mpq/portrait/z/bactalisk/fid00.smk
diff --git a/mpq/portrait/zerg/bactalisk/fid01.smk b/mpq/portrait/z/bactalisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/bactalisk/fid01.smk
rename to mpq/portrait/z/bactalisk/fid01.smk
diff --git a/mpq/portrait/zerg/bactalisk/fid02.smk b/mpq/portrait/z/bactalisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/bactalisk/fid02.smk
rename to mpq/portrait/z/bactalisk/fid02.smk
diff --git a/mpq/portrait/zerg/bactalisk/tlk00.smk b/mpq/portrait/z/bactalisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/bactalisk/tlk00.smk
rename to mpq/portrait/z/bactalisk/tlk00.smk
diff --git a/mpq/portrait/zerg/bactalisk/tlk01.smk b/mpq/portrait/z/bactalisk/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/bactalisk/tlk01.smk
rename to mpq/portrait/z/bactalisk/tlk01.smk
diff --git a/mpq/portrait/zerg/cherbrathalor/fid00.smk b/mpq/portrait/z/cherbrathalor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/cherbrathalor/fid00.smk
rename to mpq/portrait/z/cherbrathalor/fid00.smk
diff --git a/mpq/portrait/zerg/cherbrathalor/fid01.smk b/mpq/portrait/z/cherbrathalor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/cherbrathalor/fid01.smk
rename to mpq/portrait/z/cherbrathalor/fid01.smk
diff --git a/mpq/portrait/zerg/cherbrathalor/tlk00.smk b/mpq/portrait/z/cherbrathalor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/cherbrathalor/tlk00.smk
rename to mpq/portrait/z/cherbrathalor/tlk00.smk
diff --git a/mpq/portrait/zerg/cikralisk/fid00.smk b/mpq/portrait/z/cikralisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/cikralisk/fid00.smk
rename to mpq/portrait/z/cikralisk/fid00.smk
diff --git a/mpq/portrait/zerg/cikralisk/fid01.smk b/mpq/portrait/z/cikralisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/cikralisk/fid01.smk
rename to mpq/portrait/z/cikralisk/fid01.smk
diff --git a/mpq/portrait/zerg/cikralisk/tlk00.smk b/mpq/portrait/z/cikralisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/cikralisk/tlk00.smk
rename to mpq/portrait/z/cikralisk/tlk00.smk
diff --git a/mpq/portrait/zerg/evigrilisk/fid00.smk b/mpq/portrait/z/evigrilisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/evigrilisk/fid00.smk
rename to mpq/portrait/z/evigrilisk/fid00.smk
diff --git a/mpq/portrait/zerg/evigrilisk/fid01.smk b/mpq/portrait/z/evigrilisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/evigrilisk/fid01.smk
rename to mpq/portrait/z/evigrilisk/fid01.smk
diff --git a/mpq/portrait/zerg/evigrilisk/fid02.smk b/mpq/portrait/z/evigrilisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/evigrilisk/fid02.smk
rename to mpq/portrait/z/evigrilisk/fid02.smk
diff --git a/mpq/portrait/zerg/evigrilisk/tlk00.smk b/mpq/portrait/z/evigrilisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/evigrilisk/tlk00.smk
rename to mpq/portrait/z/evigrilisk/tlk00.smk
diff --git a/mpq/portrait/zerg/ghitorokor/fid00.smk b/mpq/portrait/z/ghitorokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/ghitorokor/fid00.smk
rename to mpq/portrait/z/ghitorokor/fid00.smk
diff --git a/mpq/portrait/zerg/ghitorokor/fid01.smk b/mpq/portrait/z/ghitorokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/ghitorokor/fid01.smk
rename to mpq/portrait/z/ghitorokor/fid01.smk
diff --git a/mpq/portrait/zerg/ghitorokor/tlk00.smk b/mpq/portrait/z/ghitorokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/ghitorokor/tlk00.smk
rename to mpq/portrait/z/ghitorokor/tlk00.smk
diff --git a/mpq/portrait/zerg/gorgrokor/fid00.smk b/mpq/portrait/z/gorgrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/gorgrokor/fid00.smk
rename to mpq/portrait/z/gorgrokor/fid00.smk
diff --git a/mpq/portrait/zerg/gorgrokor/fid01.smk b/mpq/portrait/z/gorgrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/gorgrokor/fid01.smk
rename to mpq/portrait/z/gorgrokor/fid01.smk
diff --git a/mpq/portrait/zerg/gorgrokor/fid02.smk b/mpq/portrait/z/gorgrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/gorgrokor/fid02.smk
rename to mpq/portrait/z/gorgrokor/fid02.smk
diff --git a/mpq/portrait/zerg/gorgrokor/tlk00.smk b/mpq/portrait/z/gorgrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/gorgrokor/tlk00.smk
rename to mpq/portrait/z/gorgrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/gosvileth/fid00.smk b/mpq/portrait/z/gosvileth/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/gosvileth/fid00.smk
rename to mpq/portrait/z/gosvileth/fid00.smk
diff --git a/mpq/portrait/zerg/gosvileth/fid01.smk b/mpq/portrait/z/gosvileth/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/gosvileth/fid01.smk
rename to mpq/portrait/z/gosvileth/fid01.smk
diff --git a/mpq/portrait/zerg/gosvileth/tlk00.smk b/mpq/portrait/z/gosvileth/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/gosvileth/tlk00.smk
rename to mpq/portrait/z/gosvileth/tlk00.smk
diff --git a/mpq/portrait/zerg/gosvileth/tlk01.smk b/mpq/portrait/z/gosvileth/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/gosvileth/tlk01.smk
rename to mpq/portrait/z/gosvileth/tlk01.smk
diff --git a/mpq/portrait/zerg/iroleth/fid00.smk b/mpq/portrait/z/iroleth/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/iroleth/fid00.smk
rename to mpq/portrait/z/iroleth/fid00.smk
diff --git a/mpq/portrait/zerg/iroleth/fid01.smk b/mpq/portrait/z/iroleth/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/iroleth/fid01.smk
rename to mpq/portrait/z/iroleth/fid01.smk
diff --git a/mpq/portrait/zerg/iroleth/fid02.smk b/mpq/portrait/z/iroleth/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/iroleth/fid02.smk
rename to mpq/portrait/z/iroleth/fid02.smk
diff --git a/mpq/portrait/zerg/iroleth/tlk00.smk b/mpq/portrait/z/iroleth/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/iroleth/tlk00.smk
rename to mpq/portrait/z/iroleth/tlk00.smk
diff --git a/mpq/portrait/zerg/iroleth/tlk01.smk b/mpq/portrait/z/iroleth/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/iroleth/tlk01.smk
rename to mpq/portrait/z/iroleth/tlk01.smk
diff --git a/mpq/portrait/zerg/izirokor/fid00.smk b/mpq/portrait/z/izirokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/izirokor/fid00.smk
rename to mpq/portrait/z/izirokor/fid00.smk
diff --git a/mpq/portrait/zerg/izirokor/fid01.smk b/mpq/portrait/z/izirokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/izirokor/fid01.smk
rename to mpq/portrait/z/izirokor/fid01.smk
diff --git a/mpq/portrait/zerg/izirokor/fid02.smk b/mpq/portrait/z/izirokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/izirokor/fid02.smk
rename to mpq/portrait/z/izirokor/fid02.smk
diff --git a/mpq/portrait/zerg/izirokor/tlk00.smk b/mpq/portrait/z/izirokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/izirokor/tlk00.smk
rename to mpq/portrait/z/izirokor/tlk00.smk
diff --git a/mpq/portrait/zerg/izirokor/tlk01.smk b/mpq/portrait/z/izirokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/izirokor/tlk01.smk
rename to mpq/portrait/z/izirokor/tlk01.smk
diff --git a/mpq/portrait/zerg/izirokor/tlk02.smk b/mpq/portrait/z/izirokor/tlk02.smk
similarity index 100%
rename from mpq/portrait/zerg/izirokor/tlk02.smk
rename to mpq/portrait/z/izirokor/tlk02.smk
diff --git a/mpq/portrait/zerg/kagralisk/fid00.smk b/mpq/portrait/z/kagralisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/kagralisk/fid00.smk
rename to mpq/portrait/z/kagralisk/fid00.smk
diff --git a/mpq/portrait/zerg/kagralisk/fid01.smk b/mpq/portrait/z/kagralisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/kagralisk/fid01.smk
rename to mpq/portrait/z/kagralisk/fid01.smk
diff --git a/mpq/portrait/zerg/kagralisk/tlk00.smk b/mpq/portrait/z/kagralisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/kagralisk/tlk00.smk
rename to mpq/portrait/z/kagralisk/tlk00.smk
diff --git a/mpq/portrait/zerg/kalkalisk/fid00.smk b/mpq/portrait/z/kalkalisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/kalkalisk/fid00.smk
rename to mpq/portrait/z/kalkalisk/fid00.smk
diff --git a/mpq/portrait/zerg/kalkalisk/fid01.smk b/mpq/portrait/z/kalkalisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/kalkalisk/fid01.smk
rename to mpq/portrait/z/kalkalisk/fid01.smk
diff --git a/mpq/portrait/zerg/kalkalisk/fid02.smk b/mpq/portrait/z/kalkalisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/kalkalisk/fid02.smk
rename to mpq/portrait/z/kalkalisk/fid02.smk
diff --git a/mpq/portrait/zerg/kalkalisk/tlk00.smk b/mpq/portrait/z/kalkalisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/kalkalisk/tlk00.smk
rename to mpq/portrait/z/kalkalisk/tlk00.smk
diff --git a/mpq/portrait/zerg/kalkalisk/tlk01.smk b/mpq/portrait/z/kalkalisk/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/kalkalisk/tlk01.smk
rename to mpq/portrait/z/kalkalisk/tlk01.smk
diff --git a/mpq/portrait/zerg/keskathalor/fid00.smk b/mpq/portrait/z/keskathalor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/keskathalor/fid00.smk
rename to mpq/portrait/z/keskathalor/fid00.smk
diff --git a/mpq/portrait/zerg/keskathalor/tlk00.smk b/mpq/portrait/z/keskathalor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/keskathalor/tlk00.smk
rename to mpq/portrait/z/keskathalor/tlk00.smk
diff --git a/mpq/portrait/zerg/keskathalor/tlk01.smk b/mpq/portrait/z/keskathalor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/keskathalor/tlk01.smk
rename to mpq/portrait/z/keskathalor/tlk01.smk
diff --git a/mpq/portrait/zerg/konvilisk/fid00.smk b/mpq/portrait/z/konvilisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/konvilisk/fid00.smk
rename to mpq/portrait/z/konvilisk/fid00.smk
diff --git a/mpq/portrait/zerg/konvilisk/fid01.smk b/mpq/portrait/z/konvilisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/konvilisk/fid01.smk
rename to mpq/portrait/z/konvilisk/fid01.smk
diff --git a/mpq/portrait/zerg/konvilisk/fid02.smk b/mpq/portrait/z/konvilisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/konvilisk/fid02.smk
rename to mpq/portrait/z/konvilisk/fid02.smk
diff --git a/mpq/portrait/zerg/konvilisk/tlk00.smk b/mpq/portrait/z/konvilisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/konvilisk/tlk00.smk
rename to mpq/portrait/z/konvilisk/tlk00.smk
diff --git a/mpq/portrait/zerg/liiralisk/fid00.smk b/mpq/portrait/z/liiralisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/liiralisk/fid00.smk
rename to mpq/portrait/z/liiralisk/fid00.smk
diff --git a/mpq/portrait/zerg/liiralisk/fid01.smk b/mpq/portrait/z/liiralisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/liiralisk/fid01.smk
rename to mpq/portrait/z/liiralisk/fid01.smk
diff --git a/mpq/portrait/zerg/liiralisk/fid02.smk b/mpq/portrait/z/liiralisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/liiralisk/fid02.smk
rename to mpq/portrait/z/liiralisk/fid02.smk
diff --git a/mpq/portrait/zerg/liiralisk/tlk00.smk b/mpq/portrait/z/liiralisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/liiralisk/tlk00.smk
rename to mpq/portrait/z/liiralisk/tlk00.smk
diff --git a/mpq/portrait/zerg/liiralisk/tlk01.smk b/mpq/portrait/z/liiralisk/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/liiralisk/tlk01.smk
rename to mpq/portrait/z/liiralisk/tlk01.smk
diff --git a/mpq/portrait/zerg/mortothrokor/fid00.smk b/mpq/portrait/z/mortothrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/mortothrokor/fid00.smk
rename to mpq/portrait/z/mortothrokor/fid00.smk
diff --git a/mpq/portrait/zerg/mortothrokor/fid01.smk b/mpq/portrait/z/mortothrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/mortothrokor/fid01.smk
rename to mpq/portrait/z/mortothrokor/fid01.smk
diff --git a/mpq/portrait/zerg/mortothrokor/fid02.smk b/mpq/portrait/z/mortothrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/mortothrokor/fid02.smk
rename to mpq/portrait/z/mortothrokor/fid02.smk
diff --git a/mpq/portrait/zerg/mortothrokor/tlk00.smk b/mpq/portrait/z/mortothrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/mortothrokor/tlk00.smk
rename to mpq/portrait/z/mortothrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/mortothrokor/tlk01.smk b/mpq/portrait/z/mortothrokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/mortothrokor/tlk01.smk
rename to mpq/portrait/z/mortothrokor/tlk01.smk
diff --git a/mpq/portrait/zerg/nathrokor/fid00.smk b/mpq/portrait/z/nathrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/nathrokor/fid00.smk
rename to mpq/portrait/z/nathrokor/fid00.smk
diff --git a/mpq/portrait/zerg/nathrokor/fid01.smk b/mpq/portrait/z/nathrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/nathrokor/fid01.smk
rename to mpq/portrait/z/nathrokor/fid01.smk
diff --git a/mpq/portrait/zerg/nathrokor/fid02.smk b/mpq/portrait/z/nathrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/nathrokor/fid02.smk
rename to mpq/portrait/z/nathrokor/fid02.smk
diff --git a/mpq/portrait/zerg/nathrokor/tlk00.smk b/mpq/portrait/z/nathrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/nathrokor/tlk00.smk
rename to mpq/portrait/z/nathrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/okrimnilisk/fid00.smk b/mpq/portrait/z/okrimnilisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/okrimnilisk/fid00.smk
rename to mpq/portrait/z/okrimnilisk/fid00.smk
diff --git a/mpq/portrait/zerg/okrimnilisk/tlk00.smk b/mpq/portrait/z/okrimnilisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/okrimnilisk/tlk00.smk
rename to mpq/portrait/z/okrimnilisk/tlk00.smk
diff --git a/mpq/portrait/zerg/othstoleth/fid00.smk b/mpq/portrait/z/othstoleth/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/othstoleth/fid00.smk
rename to mpq/portrait/z/othstoleth/fid00.smk
diff --git a/mpq/portrait/zerg/othstoleth/tlk00.smk b/mpq/portrait/z/othstoleth/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/othstoleth/tlk00.smk
rename to mpq/portrait/z/othstoleth/tlk00.smk
diff --git a/mpq/portrait/zerg/protathalor/fid00.smk b/mpq/portrait/z/protathalor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/protathalor/fid00.smk
rename to mpq/portrait/z/protathalor/fid00.smk
diff --git a/mpq/portrait/zerg/protathalor/fid01.smk b/mpq/portrait/z/protathalor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/protathalor/fid01.smk
rename to mpq/portrait/z/protathalor/fid01.smk
diff --git a/mpq/portrait/zerg/protathalor/tlk00.smk b/mpq/portrait/z/protathalor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/protathalor/tlk00.smk
rename to mpq/portrait/z/protathalor/tlk00.smk
diff --git a/mpq/portrait/zerg/quazilisk/fid00.smk b/mpq/portrait/z/quazilisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/quazilisk/fid00.smk
rename to mpq/portrait/z/quazilisk/fid00.smk
diff --git a/mpq/portrait/zerg/quazilisk/fid01.smk b/mpq/portrait/z/quazilisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/quazilisk/fid01.smk
rename to mpq/portrait/z/quazilisk/fid01.smk
diff --git a/mpq/portrait/zerg/quazilisk/tlk00.smk b/mpq/portrait/z/quazilisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/quazilisk/tlk00.smk
rename to mpq/portrait/z/quazilisk/tlk00.smk
diff --git a/mpq/portrait/zerg/rililisk/fid00.smk b/mpq/portrait/z/rililisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/rililisk/fid00.smk
rename to mpq/portrait/z/rililisk/fid00.smk
diff --git a/mpq/portrait/zerg/rililisk/fid01.smk b/mpq/portrait/z/rililisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/rililisk/fid01.smk
rename to mpq/portrait/z/rililisk/fid01.smk
diff --git a/mpq/portrait/zerg/rililisk/tlk00.smk b/mpq/portrait/z/rililisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/rililisk/tlk00.smk
rename to mpq/portrait/z/rililisk/tlk00.smk
diff --git a/mpq/portrait/zerg/rililisk/tlk01.smk b/mpq/portrait/z/rililisk/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/rililisk/tlk01.smk
rename to mpq/portrait/z/rililisk/tlk01.smk
diff --git a/mpq/portrait/zerg/sasyrvoleth/fid00.smk b/mpq/portrait/z/sasyrvoleth/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/sasyrvoleth/fid00.smk
rename to mpq/portrait/z/sasyrvoleth/fid00.smk
diff --git a/mpq/portrait/zerg/sasyrvoleth/fid01.smk b/mpq/portrait/z/sasyrvoleth/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/sasyrvoleth/fid01.smk
rename to mpq/portrait/z/sasyrvoleth/fid01.smk
diff --git a/mpq/portrait/zerg/sasyrvoleth/tlk00.smk b/mpq/portrait/z/sasyrvoleth/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/sasyrvoleth/tlk00.smk
rename to mpq/portrait/z/sasyrvoleth/tlk00.smk
diff --git a/mpq/portrait/zerg/skithrokor/fid00.smk b/mpq/portrait/z/skithrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/skithrokor/fid00.smk
rename to mpq/portrait/z/skithrokor/fid00.smk
diff --git a/mpq/portrait/zerg/skithrokor/fid01.smk b/mpq/portrait/z/skithrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/skithrokor/fid01.smk
rename to mpq/portrait/z/skithrokor/fid01.smk
diff --git a/mpq/portrait/zerg/skithrokor/fid02.smk b/mpq/portrait/z/skithrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/skithrokor/fid02.smk
rename to mpq/portrait/z/skithrokor/fid02.smk
diff --git a/mpq/portrait/zerg/skithrokor/tlk00.smk b/mpq/portrait/z/skithrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/skithrokor/tlk00.smk
rename to mpq/portrait/z/skithrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/skithrokor/tlk01.smk b/mpq/portrait/z/skithrokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/skithrokor/tlk01.smk
rename to mpq/portrait/z/skithrokor/tlk01.smk
diff --git a/mpq/portrait/zerg/sovroleth/fid00.smk b/mpq/portrait/z/sovroleth/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/sovroleth/fid00.smk
rename to mpq/portrait/z/sovroleth/fid00.smk
diff --git a/mpq/portrait/zerg/sovroleth/fid01.smk b/mpq/portrait/z/sovroleth/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/sovroleth/fid01.smk
rename to mpq/portrait/z/sovroleth/fid01.smk
diff --git a/mpq/portrait/zerg/sovroleth/tlk00.smk b/mpq/portrait/z/sovroleth/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/sovroleth/tlk00.smk
rename to mpq/portrait/z/sovroleth/tlk00.smk
diff --git a/mpq/portrait/zerg/sovroleth/tlk01.smk b/mpq/portrait/z/sovroleth/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/sovroleth/tlk01.smk
rename to mpq/portrait/z/sovroleth/tlk01.smk
diff --git a/mpq/portrait/zerg/tetcaerokor/fid00.smk b/mpq/portrait/z/tetcaerokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/tetcaerokor/fid00.smk
rename to mpq/portrait/z/tetcaerokor/fid00.smk
diff --git a/mpq/portrait/zerg/tetcaerokor/tlk00.smk b/mpq/portrait/z/tetcaerokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/tetcaerokor/tlk00.smk
rename to mpq/portrait/z/tetcaerokor/tlk00.smk
diff --git a/mpq/portrait/zerg/tethzorokor/fid00.smk b/mpq/portrait/z/tethzorokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/tethzorokor/fid00.smk
rename to mpq/portrait/z/tethzorokor/fid00.smk
diff --git a/mpq/portrait/zerg/tethzorokor/fid01.smk b/mpq/portrait/z/tethzorokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/tethzorokor/fid01.smk
rename to mpq/portrait/z/tethzorokor/fid01.smk
diff --git a/mpq/portrait/zerg/tethzorokor/fid02.smk b/mpq/portrait/z/tethzorokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/tethzorokor/fid02.smk
rename to mpq/portrait/z/tethzorokor/fid02.smk
diff --git a/mpq/portrait/zerg/tethzorokor/tlk00.smk b/mpq/portrait/z/tethzorokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/tethzorokor/tlk00.smk
rename to mpq/portrait/z/tethzorokor/tlk00.smk
diff --git a/mpq/portrait/zerg/tethzorokor/tlk01.smk b/mpq/portrait/z/tethzorokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/tethzorokor/tlk01.smk
rename to mpq/portrait/z/tethzorokor/tlk01.smk
diff --git a/mpq/portrait/zerg/tosgrilisk/fid00.smk b/mpq/portrait/z/tosgrilisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/tosgrilisk/fid00.smk
rename to mpq/portrait/z/tosgrilisk/fid00.smk
diff --git a/mpq/portrait/zerg/tosgrilisk/fid01.smk b/mpq/portrait/z/tosgrilisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/tosgrilisk/fid01.smk
rename to mpq/portrait/z/tosgrilisk/fid01.smk
diff --git a/mpq/portrait/zerg/tosgrilisk/fid02.smk b/mpq/portrait/z/tosgrilisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/tosgrilisk/fid02.smk
rename to mpq/portrait/z/tosgrilisk/fid02.smk
diff --git a/mpq/portrait/zerg/tosgrilisk/tlk00.smk b/mpq/portrait/z/tosgrilisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/tosgrilisk/tlk00.smk
rename to mpq/portrait/z/tosgrilisk/tlk00.smk
diff --git a/mpq/portrait/zerg/tosgrilisk/tlk01.smk b/mpq/portrait/z/tosgrilisk/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/tosgrilisk/tlk01.smk
rename to mpq/portrait/z/tosgrilisk/tlk01.smk
diff --git a/mpq/portrait/zerg/vilgorokor/fid00.smk b/mpq/portrait/z/vilgorokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/vilgorokor/fid00.smk
rename to mpq/portrait/z/vilgorokor/fid00.smk
diff --git a/mpq/portrait/zerg/vilgorokor/fid01.smk b/mpq/portrait/z/vilgorokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/vilgorokor/fid01.smk
rename to mpq/portrait/z/vilgorokor/fid01.smk
diff --git a/mpq/portrait/zerg/vilgorokor/tlk00.smk b/mpq/portrait/z/vilgorokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/vilgorokor/tlk00.smk
rename to mpq/portrait/z/vilgorokor/tlk00.smk
diff --git a/mpq/portrait/zerg/vorvrokor/fid00.smk b/mpq/portrait/z/vorvrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/fid00.smk
rename to mpq/portrait/z/vorvrokor/fid00.smk
diff --git a/mpq/portrait/zerg/vorvrokor/fid01.smk b/mpq/portrait/z/vorvrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/fid01.smk
rename to mpq/portrait/z/vorvrokor/fid01.smk
diff --git a/mpq/portrait/zerg/vorvrokor/fid02.smk b/mpq/portrait/z/vorvrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/fid02.smk
rename to mpq/portrait/z/vorvrokor/fid02.smk
diff --git a/mpq/portrait/zerg/vorvrokor/fid03.smk b/mpq/portrait/z/vorvrokor/fid03.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/fid03.smk
rename to mpq/portrait/z/vorvrokor/fid03.smk
diff --git a/mpq/portrait/zerg/vorvrokor/tlk00.smk b/mpq/portrait/z/vorvrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/tlk00.smk
rename to mpq/portrait/z/vorvrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/vorvrokor/tlk01.smk b/mpq/portrait/z/vorvrokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/tlk01.smk
rename to mpq/portrait/z/vorvrokor/tlk01.smk
diff --git a/mpq/portrait/zerg/vorvrokor/tlk02.smk b/mpq/portrait/z/vorvrokor/tlk02.smk
similarity index 100%
rename from mpq/portrait/zerg/vorvrokor/tlk02.smk
rename to mpq/portrait/z/vorvrokor/tlk02.smk
diff --git a/mpq/portrait/zerg/zarcavrokor/fid00.smk b/mpq/portrait/z/zarcavrokor/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/zarcavrokor/fid00.smk
rename to mpq/portrait/z/zarcavrokor/fid00.smk
diff --git a/mpq/portrait/zerg/zarcavrokor/fid01.smk b/mpq/portrait/z/zarcavrokor/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/zarcavrokor/fid01.smk
rename to mpq/portrait/z/zarcavrokor/fid01.smk
diff --git a/mpq/portrait/zerg/zarcavrokor/fid02.smk b/mpq/portrait/z/zarcavrokor/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/zarcavrokor/fid02.smk
rename to mpq/portrait/z/zarcavrokor/fid02.smk
diff --git a/mpq/portrait/zerg/zarcavrokor/tlk00.smk b/mpq/portrait/z/zarcavrokor/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/zarcavrokor/tlk00.smk
rename to mpq/portrait/z/zarcavrokor/tlk00.smk
diff --git a/mpq/portrait/zerg/zarcavrokor/tlk01.smk b/mpq/portrait/z/zarcavrokor/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/zarcavrokor/tlk01.smk
rename to mpq/portrait/z/zarcavrokor/tlk01.smk
diff --git a/mpq/portrait/zerg/zobriolisk/fid00.smk b/mpq/portrait/z/zobriolisk/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/zobriolisk/fid00.smk
rename to mpq/portrait/z/zobriolisk/fid00.smk
diff --git a/mpq/portrait/zerg/zobriolisk/fid01.smk b/mpq/portrait/z/zobriolisk/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/zobriolisk/fid01.smk
rename to mpq/portrait/z/zobriolisk/fid01.smk
diff --git a/mpq/portrait/zerg/zobriolisk/fid02.smk b/mpq/portrait/z/zobriolisk/fid02.smk
similarity index 100%
rename from mpq/portrait/zerg/zobriolisk/fid02.smk
rename to mpq/portrait/z/zobriolisk/fid02.smk
diff --git a/mpq/portrait/zerg/zobriolisk/tlk00.smk b/mpq/portrait/z/zobriolisk/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/zobriolisk/tlk00.smk
rename to mpq/portrait/z/zobriolisk/tlk00.smk
diff --git a/mpq/portrait/zerg/zobriolisk/tlk01.smk b/mpq/portrait/z/zobriolisk/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/zobriolisk/tlk01.smk
rename to mpq/portrait/z/zobriolisk/tlk01.smk
diff --git a/mpq/portrait/zerg/zoryusthaleth/fid00.smk b/mpq/portrait/z/zoryusthaleth/fid00.smk
similarity index 100%
rename from mpq/portrait/zerg/zoryusthaleth/fid00.smk
rename to mpq/portrait/z/zoryusthaleth/fid00.smk
diff --git a/mpq/portrait/zerg/zoryusthaleth/fid01.smk b/mpq/portrait/z/zoryusthaleth/fid01.smk
similarity index 100%
rename from mpq/portrait/zerg/zoryusthaleth/fid01.smk
rename to mpq/portrait/z/zoryusthaleth/fid01.smk
diff --git a/mpq/portrait/zerg/zoryusthaleth/tlk00.smk b/mpq/portrait/z/zoryusthaleth/tlk00.smk
similarity index 100%
rename from mpq/portrait/zerg/zoryusthaleth/tlk00.smk
rename to mpq/portrait/z/zoryusthaleth/tlk00.smk
diff --git a/mpq/portrait/zerg/zoryusthaleth/tlk01.smk b/mpq/portrait/z/zoryusthaleth/tlk01.smk
similarity index 100%
rename from mpq/portrait/zerg/zoryusthaleth/tlk01.smk
rename to mpq/portrait/z/zoryusthaleth/tlk01.smk
diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt
index a38d79cb..281aa68e 100644
--- a/mpq/samase/unitdef.txt
+++ b/mpq/samase/unitdef.txt
@@ -16,7 +16,7 @@ building left_upper_door = 205
 building right_upper_door = 206
 
 # Special
-building special_control_node = 192
+building town_center_marker = 192
 building crashed_minotaur = 335
 building psi_disruptor = 336
 building power_generator = 337
diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin
index 8f27c2b2..04489df9 100644
Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ
diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin
index d2e00da3..324945c8 100644
Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ
diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt
index 53af4859..37203e1f 100644
--- a/mpq/scripts/iscript_general.txt
+++ b/mpq/scripts/iscript_general.txt
@@ -4621,7 +4621,7 @@ YoungChrysalisDeath:
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 2335 Forerunner Ferrum (cm\sp\h\ferrum.grp)
+# 2335 Ferrum (hl\fr\ferrum.grp)
 .headerstart
 IsId          	378
 Type          	21
@@ -4651,7 +4651,7 @@ WarpIn        	FerrumWarpIn
 # ----------------------------------------------------------------------------- #
 
 FerrumInit:
-	imgulnextid			0 42 # Sentinel Shadow (cm\sp\h\ferrum.grp)
+	imgulnextid			0 42 # Ferrum Shadow (hl\fr\ferrum.grp)
 FerrumGndAttkToIdle:
 	playfram          	0x00
 	goto              	FerrumWalkingToIdle
@@ -4668,7 +4668,7 @@ FerrumWalkingToIdle:
 	goto              	FerrumWalkingToIdle
 
 FerrumDeath:
-	playsnd           	533 # Protoss\Ferrum\PScDth00.WAV
+	playsnd           	533 # Protoss\Scout\PScDth00.WAV
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
@@ -4686,18 +4686,317 @@ FerrumGndAttkInit:
 FerrumWalking:
 	playfram          	0x00
 	setvertpos        	0
-#	imgol             	142 0 0 # Forerunner Ferrum Engines (thingy\pscGlow.grp)
+#	imgol             	142 0 0 # Ferrum Engines (thingy\pscGlow.grp)
 	goto              	SkryrokorLocal00
 
 FerrumWarpIn:
-	imgol             	2337 0 0 # Forerunner Ferrum Warp Flash (cm\sp\h\sentinel.grp)
+	imgol             	2337 0 0 # Ferrum Warp Flash (hl\fr\ferrum.grp)
 	goto              	FerrumWalkingToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2338 Chalyb (hl\fr\chalyb.grp)
+.headerstart
+IsId          	379
+Type          	21
+Init          	ChalybInit
+Death         	ChalybDeath
+GndAttkInit   	ChalybGndAttkInit
+AirAttkInit   	ChalybGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	ChalybGndAttkInit
+AirAttkRpt    	ChalybGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	ChalybGndAttkToIdle
+AirAttkToIdle 	ChalybGndAttkToIdle
+Unused2       	[NONE]
+Walking       	ChalybWalking
+WalkingToIdle 	ChalybWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	ChalybWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ChalybInit:
+	imgulnextid			0 42 # Chalyb Shadow (hl\fr\chalyb.grp)
+ChalybGndAttkToIdle:
+	playfram          	0x00
+	goto              	ChalybWalkingToIdle
+
+ChalybWalkingToIdle:
+	setvertpos        	0
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	setvertpos        	-1
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	goto              	ChalybWalkingToIdle
+
+ChalybDeath:
+	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
+	wait              	1
+	end
+
+ChalybGndAttkInit:
+	wait				1
+	attack
+	wait				2
+	gotorepeatattk
+	ignorerest
+	goto              	SkryrokorLocal00
+
+ChalybWalking:
+	playfram          	0x00
+	setvertpos        	0
+#	imgol             	142 0 0 # Chalyb Engines (thingy\pscGlow.grp)
+	goto              	SkryrokorLocal00
+
+ChalybWarpIn:
+	imgol             	2340 0 0 # Chalyb Warp Flash (hl\fr\chalyb.grp)
+	goto              	ChalybWalkingToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2341 Circitor (hl\fr\circitor.grp)
+.headerstart
+IsId          	380
+Type          	21
+Init          	CircitorInit
+Death         	CircitorDeath
+GndAttkInit   	CircitorGndAttkInit
+AirAttkInit   	CircitorGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	CircitorGndAttkInit
+AirAttkRpt    	CircitorGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	CircitorGndAttkToIdle
+AirAttkToIdle 	CircitorGndAttkToIdle
+Unused2       	[NONE]
+Walking       	CircitorWalking
+WalkingToIdle 	CircitorWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	CircitorWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+CircitorInit:
+	imgulnextid			0 42 # Circitor Shadow (hl\fr\circitor.grp)
+CircitorGndAttkToIdle:
+	playfram          	0x00
+	goto              	CircitorWalkingToIdle
+
+CircitorWalkingToIdle:
+	setvertpos        	0
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	setvertpos        	-1
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	goto              	CircitorWalkingToIdle
+
+CircitorDeath:
+	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
+	wait              	1
+	end
+
+CircitorGndAttkInit:
+	wait				1
+	attack
+	wait				2
+	gotorepeatattk
+	ignorerest
+	goto              	SkryrokorLocal00
+
+CircitorWalking:
+	playfram          	0x00
+	setvertpos        	0
+#	imgol             	142 0 0 # Circitor Engines (thingy\pscGlow.grp)
+	goto              	SkryrokorLocal00
+
+CircitorWarpIn:
+	imgol             	2343 0 0 # Circitor Warp Flash (hl\fr\circitor.grp)
+	goto              	CircitorWalkingToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2344 Exigo (hl\fr\exigo.grp)
+.headerstart
+IsId          	381
+Type          	21
+Init          	ExigoInit
+Death         	ExigoDeath
+GndAttkInit   	ExigoGndAttkInit
+AirAttkInit   	ExigoGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	ExigoGndAttkInit
+AirAttkRpt    	ExigoGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	ExigoGndAttkToIdle
+AirAttkToIdle 	ExigoGndAttkToIdle
+Unused2       	[NONE]
+Walking       	ExigoWalking
+WalkingToIdle 	ExigoWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	ExigoWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ExigoInit:
+	imgulnextid			0 42 # Exigo Shadow (hl\fr\exigo.grp)
+ExigoGndAttkToIdle:
+	playfram          	0x00
+	goto              	ExigoWalkingToIdle
+
+ExigoWalkingToIdle:
+	setvertpos        	0
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	setvertpos        	-1
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	goto              	ExigoWalkingToIdle
+
+ExigoDeath:
+	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul          	1007 0 0 # Askosi Structure Rubble (Small) (cm\a\a-rubble-small.grp)
+	wait              	1
+	end
+
+ExigoGndAttkInit:
+	wait				1
+	attack
+	wait				6
+	attack
+	wait				2
+	gotorepeatattk
+	ignorerest
+	goto              	SkryrokorLocal00
+
+ExigoWalking:
+	playfram          	0x00
+	setvertpos        	0
+#	imgol             	142 0 0 # Exigo Engines (thingy\pscGlow.grp)
+	goto              	SkryrokorLocal00
+
+ExigoWarpIn:
+	imgol             	2346 0 0 # Exigo Warp Flash (hl\fr\exigo.grp)
+	goto              	ExigoWalkingToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2350 Vicere (hl\fr\vicere.grp)
+.headerstart
+IsId          	382
+Type          	21
+Init          	VicereInit
+Death         	VicereDeath
+GndAttkInit   	VicereGndAttkInit
+AirAttkInit   	VicereGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	VicereGndAttkInit
+AirAttkRpt    	VicereGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	VicereGndAttkToIdle
+AirAttkToIdle 	VicereGndAttkToIdle
+Unused2       	[NONE]
+Walking       	VicereWalking
+WalkingToIdle 	VicereWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	VicereWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+VicereInit:
+	imgulnextid			0 42 # Vicere Shadow (hl\fr\vicere.grp)
+VicereGndAttkToIdle:
+	playfram          	0x00
+	goto              	VicereWalkingToIdle
+
+VicereWalkingToIdle:
+	setvertpos        	0
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	setvertpos        	-1
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	goto              	VicereWalkingToIdle
+
+VicereDeath:
+	playsnd           	533 # Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul          	1007 0 0 # Askosi Structure Rubble (Small) (cm\a\a-rubble-small.grp)
+	wait              	1
+	end
+
+VicereGndAttkInit:
+	wait				1
+	attack
+	attack
+	wait				2
+	gotorepeatattk
+	ignorerest
+	goto              	SkryrokorLocal00
+
+VicereWalking:
+	playfram          	0x00
+	setvertpos        	0
+#	imgol             	142 0 0 # Vicere Engines (thingy\pscGlow.grp)
+	goto              	SkryrokorLocal00
+
+VicereWarpIn:
+	imgol             	2352 0 0 # Vicere Warp Flash (hl\fr\vicere.grp)
+	goto              	VicereWalkingToIdle
 	
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
 # 2347 Athla (hl\fr\athla.grp)
 .headerstart
-IsId          	379
+IsId          	383
 Type          	15
 Init          	AthlaInit
 Death         	AthlaDeath
@@ -4737,7 +5036,7 @@ AthlaLocal69:
 	goto              	AthlaLocal69
 
 AthlaDeath:
-	playsnd           	533 # Protoss\Ferrum\PScDth00.WAV
+	playsnd           	533 # Protoss\Scout\PScDth00.WAV
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul          	1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp)
@@ -4746,7 +5045,7 @@ AthlaDeath:
 	
 AthlaGndAttkInit:
 	wait				1
-	attack
+#	attack
 	wait				2
 	gotorepeatattk
 	ignorerest
@@ -4754,19 +5053,13 @@ AthlaGndAttkInit:
 
 AthlaWalking:
     setvertpos          0
-    playfram            0x20
-    wait                2
-    playfram            0x40
-    wait                2
-    playfram            0x60
-    wait                2
-    imgol               1079 0 0 # Athla Engines (hl\fr\athla-engine.grp)
+    playfram            0x00
+#	imgol             	142 0 0 # Athla Engines (thingy\pscGlow.grp)
     goto                SkryrokorLocal00
     
 AthlaWalkingToIdle:
 	playfram          	0x00
 	setvertpos        	0
-#	imgol             	142 0 0 # Forerunner Ferrum Engines (thingy\pscGlow.grp)
 	goto              	SkryrokorLocal00
 
 AthlaAlmostBuilt:
@@ -4794,7 +5087,7 @@ AthlaWarpIn:
 # This header is used by images.dat entries:
 # 2353 Machinamentum (hl\fr\machinamentum.grp)
 .headerstart
-IsId          	380
+IsId          	384
 Type          	27
 Init          	MachinamentumInit
 Death         	MachinamentumDeath
diff --git a/mpq/sound/cm/t/eidolon/windup-01.wav b/mpq/sound/cm/t/eidolon/windup-01.wav
index 0065a801..5a5424ba 100644
Binary files a/mpq/sound/cm/t/eidolon/windup-01.wav and b/mpq/sound/cm/t/eidolon/windup-01.wav differ
diff --git a/mpq/sound/cm/t/eidolon/windup-02.wav b/mpq/sound/cm/t/eidolon/windup-02.wav
index 09fe0376..94b60be3 100644
Binary files a/mpq/sound/cm/t/eidolon/windup-02.wav and b/mpq/sound/cm/t/eidolon/windup-02.wav differ
diff --git a/mpq/sound/cm/t/eidolon/windup-03.wav b/mpq/sound/cm/t/eidolon/windup-03.wav
index 16267883..24021806 100644
Binary files a/mpq/sound/cm/t/eidolon/windup-03.wav and b/mpq/sound/cm/t/eidolon/windup-03.wav differ
diff --git a/patchnotes.md b/patchnotes.md
index 74e84964..85295ea2 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -11,8 +11,6 @@
 ### *Notes in italics are from Pr0nogo*
 
 # Editor achievements
-- **Map-specific aiscripts** (c. DF)
-	- Documentation forthcoming.
 - **Custom resource areas:** (c. DF)
 	- You can now override default resource areas via this tech from DF! Instructions are below.
 		- Draw locations around resources.
diff --git a/plugins/aise.qdp b/plugins/aise.qdp
index 031609cd..d9991fd8 100644
Binary files a/plugins/aise.qdp and b/plugins/aise.qdp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 7f844407..209023b2 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ