diff --git a/Tupfile.lua b/Tupfile.lua
index 3237935e..754524ce 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -1,11 +1,11 @@
 
 -- Generate uniform size minisprites
 
-for canon in iter{"canonical", "noncanonical"} do 
+for canon in iter{"canonical", "cap"} do 
     for dir in iter{"asymmetrical", "custom", "misc", "pokemon"} do
         -- TODO fix this, tup hates git's quirk of not creating directories when
         -- there aren't any files
-        if canon == "noncanonical" and dir ~= "pokemon" then
+        if canon == "cap" and dir ~= "pokemon" then
             goto continue
         end
 
@@ -22,8 +22,8 @@ end
 -- PS spritesheet
 
 tup.rule(
-    {"build/gen6-minisprites-padded/canonical/pokemon/*", "build/gen6-minisprites-padded/noncanonical/pokemon/*"},
-    "node tools/sprites/ps.js build/gen6-minisprites-padded/canonical/pokemon/ build/gen6-minisprites-padded/noncanonical/pokemon/ --output-image build/ps/pokemonicons-sheet.png --output-metadata build/ps/pokemonicons.json",
+    {"build/gen6-minisprites-padded/canonical/pokemon/*", "build/gen6-minisprites-padded/cap/pokemon/*"},
+    "node tools/sprites/ps.js build/gen6-minisprites-padded/canonical/pokemon/ build/gen6-minisprites-padded/cap/pokemon/ --output-image build/ps/pokemonicons-sheet.png --output-metadata build/ps/pokemonicons.json",
     {"build/ps/pokemonicons-sheet.png", "build/ps/pokemonicons.json"}
 )
 
@@ -48,9 +48,9 @@ function twittersprite(input, output)
 end
 
 local files =
-    {"src/canonical/models/front/*", "src/noncanonical/models/front/*",
+    {"src/canonical/models/front/*", "src/cap/models/front/*",
      -- TODO: only pick noncanonical that aren't already in models/
-     "src/noncanonical/sprites/gen5/front/*"}
+     "src/cap/sprites/gen5/front/*"}
 
 fbsprite(files, "build/smogon/fbsprites/xy/%B.png")
 twittersprite(files, "build/smogon/twittersprites/xy/%B.png")
diff --git a/ps.deploy.js b/ps.deploy.js
index 871d96eb..f742a242 100644
--- a/ps.deploy.js
+++ b/ps.deploy.js
@@ -5,8 +5,8 @@ transform(toPSSpriteID, () => {
         "src/canonical/models/front",
         "src/canonical/models/front-cosmetic",
         "src/canonical/models/front-misc",
-        "src/noncanonical/models/front",
-        "src/noncanonical/sprites/gen5/front"
+        "src/cap/models/front",
+        "src/cap/sprites/gen5/front"
     );
     
     dest("ani-back");
@@ -14,8 +14,8 @@ transform(toPSSpriteID, () => {
         "src/canonical/models/back",
         "src/canonical/models/back-cosmetic",
         "src/canonical/models/back-misc",
-        "src/noncanonical/models/back",
-        "src/noncanonical/sprites/gen5/back"
+        "src/cap/models/back",
+        "src/cap/sprites/gen5/back"
     );
     
     dest("ani-shiny");
diff --git a/smogon.deploy.js b/smogon.deploy.js
index ddb40a02..b763280e 100644
--- a/smogon.deploy.js
+++ b/smogon.deploy.js
@@ -3,7 +3,7 @@ transform(toSmogonAlias, () => {
     dest("forumsprites");
     sel(
         "build/gen6-minisprites-padded/canonical/pokemon",
-        "build/gen6-minisprites-padded/noncanonical/pokemon"
+        "build/gen6-minisprites-padded/cap/pokemon"
     );
 
     dest("fbsprites/xy");
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Arghonaut.png b/src/cap/minisprites/gen5/pokemon/Arghonaut.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Arghonaut.png
rename to src/cap/minisprites/gen5/pokemon/Arghonaut.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Aurumoth.png b/src/cap/minisprites/gen5/pokemon/Aurumoth.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Aurumoth.png
rename to src/cap/minisprites/gen5/pokemon/Aurumoth.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Cawmodore.png b/src/cap/minisprites/gen5/pokemon/Cawmodore.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Cawmodore.png
rename to src/cap/minisprites/gen5/pokemon/Cawmodore.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Colossoil.png b/src/cap/minisprites/gen5/pokemon/Colossoil.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Colossoil.png
rename to src/cap/minisprites/gen5/pokemon/Colossoil.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Crucibelle--Mega.png b/src/cap/minisprites/gen5/pokemon/Crucibelle--Mega.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Crucibelle--Mega.png
rename to src/cap/minisprites/gen5/pokemon/Crucibelle--Mega.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Crucibelle.png b/src/cap/minisprites/gen5/pokemon/Crucibelle.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Crucibelle.png
rename to src/cap/minisprites/gen5/pokemon/Crucibelle.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Cyclohm.png b/src/cap/minisprites/gen5/pokemon/Cyclohm.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Cyclohm.png
rename to src/cap/minisprites/gen5/pokemon/Cyclohm.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Fidgit.png b/src/cap/minisprites/gen5/pokemon/Fidgit.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Fidgit.png
rename to src/cap/minisprites/gen5/pokemon/Fidgit.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Kerfluffle.png b/src/cap/minisprites/gen5/pokemon/Kerfluffle.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Kerfluffle.png
rename to src/cap/minisprites/gen5/pokemon/Kerfluffle.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Kitsunoh.png b/src/cap/minisprites/gen5/pokemon/Kitsunoh.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Kitsunoh.png
rename to src/cap/minisprites/gen5/pokemon/Kitsunoh.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Krilowatt.png b/src/cap/minisprites/gen5/pokemon/Krilowatt.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Krilowatt.png
rename to src/cap/minisprites/gen5/pokemon/Krilowatt.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Malaconda.png b/src/cap/minisprites/gen5/pokemon/Malaconda.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Malaconda.png
rename to src/cap/minisprites/gen5/pokemon/Malaconda.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Mollux.png b/src/cap/minisprites/gen5/pokemon/Mollux.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Mollux.png
rename to src/cap/minisprites/gen5/pokemon/Mollux.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Naviathan.png b/src/cap/minisprites/gen5/pokemon/Naviathan.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Naviathan.png
rename to src/cap/minisprites/gen5/pokemon/Naviathan.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Necturna.png b/src/cap/minisprites/gen5/pokemon/Necturna.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Necturna.png
rename to src/cap/minisprites/gen5/pokemon/Necturna.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Plasmanta.png b/src/cap/minisprites/gen5/pokemon/Plasmanta.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Plasmanta.png
rename to src/cap/minisprites/gen5/pokemon/Plasmanta.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Pyroak.png b/src/cap/minisprites/gen5/pokemon/Pyroak.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Pyroak.png
rename to src/cap/minisprites/gen5/pokemon/Pyroak.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Revenankh.png b/src/cap/minisprites/gen5/pokemon/Revenankh.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Revenankh.png
rename to src/cap/minisprites/gen5/pokemon/Revenankh.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Stratagem.png b/src/cap/minisprites/gen5/pokemon/Stratagem.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Stratagem.png
rename to src/cap/minisprites/gen5/pokemon/Stratagem.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Syclant.png b/src/cap/minisprites/gen5/pokemon/Syclant.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Syclant.png
rename to src/cap/minisprites/gen5/pokemon/Syclant.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Tomohawk.png b/src/cap/minisprites/gen5/pokemon/Tomohawk.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Tomohawk.png
rename to src/cap/minisprites/gen5/pokemon/Tomohawk.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Volkraken.png b/src/cap/minisprites/gen5/pokemon/Volkraken.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Volkraken.png
rename to src/cap/minisprites/gen5/pokemon/Volkraken.png
diff --git a/src/noncanonical/minisprites/gen5/pokemon/Voodoom.png b/src/cap/minisprites/gen5/pokemon/Voodoom.png
similarity index 100%
rename from src/noncanonical/minisprites/gen5/pokemon/Voodoom.png
rename to src/cap/minisprites/gen5/pokemon/Voodoom.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Argalis.png b/src/cap/minisprites/gen6/pokemon/Argalis.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Argalis.png
rename to src/cap/minisprites/gen6/pokemon/Argalis.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Arghonaut.png b/src/cap/minisprites/gen6/pokemon/Arghonaut.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Arghonaut.png
rename to src/cap/minisprites/gen6/pokemon/Arghonaut.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Aurumoth.png b/src/cap/minisprites/gen6/pokemon/Aurumoth.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Aurumoth.png
rename to src/cap/minisprites/gen6/pokemon/Aurumoth.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Brattler.png b/src/cap/minisprites/gen6/pokemon/Brattler.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Brattler.png
rename to src/cap/minisprites/gen6/pokemon/Brattler.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Breezi.png b/src/cap/minisprites/gen6/pokemon/Breezi.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Breezi.png
rename to src/cap/minisprites/gen6/pokemon/Breezi.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Caimanoe.png b/src/cap/minisprites/gen6/pokemon/Caimanoe.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Caimanoe.png
rename to src/cap/minisprites/gen6/pokemon/Caimanoe.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Caribolt.png b/src/cap/minisprites/gen6/pokemon/Caribolt.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Caribolt.png
rename to src/cap/minisprites/gen6/pokemon/Caribolt.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Cawdet.png b/src/cap/minisprites/gen6/pokemon/Cawdet.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Cawdet.png
rename to src/cap/minisprites/gen6/pokemon/Cawdet.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Cawmodore.png b/src/cap/minisprites/gen6/pokemon/Cawmodore.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Cawmodore.png
rename to src/cap/minisprites/gen6/pokemon/Cawmodore.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Colossoil.png b/src/cap/minisprites/gen6/pokemon/Colossoil.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Colossoil.png
rename to src/cap/minisprites/gen6/pokemon/Colossoil.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Coribalis.png b/src/cap/minisprites/gen6/pokemon/Coribalis.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Coribalis.png
rename to src/cap/minisprites/gen6/pokemon/Coribalis.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Crucibelle--Mega.png b/src/cap/minisprites/gen6/pokemon/Crucibelle--Mega.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Crucibelle--Mega.png
rename to src/cap/minisprites/gen6/pokemon/Crucibelle--Mega.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Crucibelle.png b/src/cap/minisprites/gen6/pokemon/Crucibelle.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Crucibelle.png
rename to src/cap/minisprites/gen6/pokemon/Crucibelle.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Cupra.png b/src/cap/minisprites/gen6/pokemon/Cupra.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Cupra.png
rename to src/cap/minisprites/gen6/pokemon/Cupra.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Cyclohm.png b/src/cap/minisprites/gen6/pokemon/Cyclohm.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Cyclohm.png
rename to src/cap/minisprites/gen6/pokemon/Cyclohm.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Electrelk.png b/src/cap/minisprites/gen6/pokemon/Electrelk.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Electrelk.png
rename to src/cap/minisprites/gen6/pokemon/Electrelk.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Embirch.png b/src/cap/minisprites/gen6/pokemon/Embirch.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Embirch.png
rename to src/cap/minisprites/gen6/pokemon/Embirch.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Equilibra.png b/src/cap/minisprites/gen6/pokemon/Equilibra.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Equilibra.png
rename to src/cap/minisprites/gen6/pokemon/Equilibra.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Fawnifer.png b/src/cap/minisprites/gen6/pokemon/Fawnifer.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Fawnifer.png
rename to src/cap/minisprites/gen6/pokemon/Fawnifer.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Fidgit.png b/src/cap/minisprites/gen6/pokemon/Fidgit.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Fidgit.png
rename to src/cap/minisprites/gen6/pokemon/Fidgit.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Flarelm.png b/src/cap/minisprites/gen6/pokemon/Flarelm.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Flarelm.png
rename to src/cap/minisprites/gen6/pokemon/Flarelm.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Floatoy.png b/src/cap/minisprites/gen6/pokemon/Floatoy.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Floatoy.png
rename to src/cap/minisprites/gen6/pokemon/Floatoy.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Jumbao.png b/src/cap/minisprites/gen6/pokemon/Jumbao.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Jumbao.png
rename to src/cap/minisprites/gen6/pokemon/Jumbao.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Kerfluffle.png b/src/cap/minisprites/gen6/pokemon/Kerfluffle.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Kerfluffle.png
rename to src/cap/minisprites/gen6/pokemon/Kerfluffle.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Kitsunoh.png b/src/cap/minisprites/gen6/pokemon/Kitsunoh.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Kitsunoh.png
rename to src/cap/minisprites/gen6/pokemon/Kitsunoh.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Krilowatt.png b/src/cap/minisprites/gen6/pokemon/Krilowatt.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Krilowatt.png
rename to src/cap/minisprites/gen6/pokemon/Krilowatt.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Malaconda.png b/src/cap/minisprites/gen6/pokemon/Malaconda.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Malaconda.png
rename to src/cap/minisprites/gen6/pokemon/Malaconda.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Mollux.png b/src/cap/minisprites/gen6/pokemon/Mollux.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Mollux.png
rename to src/cap/minisprites/gen6/pokemon/Mollux.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Mumbao.png b/src/cap/minisprites/gen6/pokemon/Mumbao.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Mumbao.png
rename to src/cap/minisprites/gen6/pokemon/Mumbao.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Naviathan.png b/src/cap/minisprites/gen6/pokemon/Naviathan.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Naviathan.png
rename to src/cap/minisprites/gen6/pokemon/Naviathan.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Necturine.png b/src/cap/minisprites/gen6/pokemon/Necturine.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Necturine.png
rename to src/cap/minisprites/gen6/pokemon/Necturine.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Necturna.png b/src/cap/minisprites/gen6/pokemon/Necturna.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Necturna.png
rename to src/cap/minisprites/gen6/pokemon/Necturna.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Pajantom.png b/src/cap/minisprites/gen6/pokemon/Pajantom.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Pajantom.png
rename to src/cap/minisprites/gen6/pokemon/Pajantom.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Plasmanta.png b/src/cap/minisprites/gen6/pokemon/Plasmanta.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Plasmanta.png
rename to src/cap/minisprites/gen6/pokemon/Plasmanta.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Pluffle.png b/src/cap/minisprites/gen6/pokemon/Pluffle.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Pluffle.png
rename to src/cap/minisprites/gen6/pokemon/Pluffle.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Privatyke.png b/src/cap/minisprites/gen6/pokemon/Privatyke.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Privatyke.png
rename to src/cap/minisprites/gen6/pokemon/Privatyke.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Pyroak.png b/src/cap/minisprites/gen6/pokemon/Pyroak.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Pyroak.png
rename to src/cap/minisprites/gen6/pokemon/Pyroak.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Rebble.png b/src/cap/minisprites/gen6/pokemon/Rebble.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Rebble.png
rename to src/cap/minisprites/gen6/pokemon/Rebble.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Revenankh.png b/src/cap/minisprites/gen6/pokemon/Revenankh.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Revenankh.png
rename to src/cap/minisprites/gen6/pokemon/Revenankh.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Scratchet.png b/src/cap/minisprites/gen6/pokemon/Scratchet.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Scratchet.png
rename to src/cap/minisprites/gen6/pokemon/Scratchet.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Smogecko.png b/src/cap/minisprites/gen6/pokemon/Smogecko.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Smogecko.png
rename to src/cap/minisprites/gen6/pokemon/Smogecko.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Smoguana.png b/src/cap/minisprites/gen6/pokemon/Smoguana.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Smoguana.png
rename to src/cap/minisprites/gen6/pokemon/Smoguana.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Smokomodo.png b/src/cap/minisprites/gen6/pokemon/Smokomodo.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Smokomodo.png
rename to src/cap/minisprites/gen6/pokemon/Smokomodo.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Snaelstrom.png b/src/cap/minisprites/gen6/pokemon/Snaelstrom.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Snaelstrom.png
rename to src/cap/minisprites/gen6/pokemon/Snaelstrom.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Snugglow.png b/src/cap/minisprites/gen6/pokemon/Snugglow.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Snugglow.png
rename to src/cap/minisprites/gen6/pokemon/Snugglow.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Stratagem.png b/src/cap/minisprites/gen6/pokemon/Stratagem.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Stratagem.png
rename to src/cap/minisprites/gen6/pokemon/Stratagem.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Swirlpool.png b/src/cap/minisprites/gen6/pokemon/Swirlpool.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Swirlpool.png
rename to src/cap/minisprites/gen6/pokemon/Swirlpool.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Syclant.png b/src/cap/minisprites/gen6/pokemon/Syclant.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Syclant.png
rename to src/cap/minisprites/gen6/pokemon/Syclant.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Syclar.png b/src/cap/minisprites/gen6/pokemon/Syclar.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Syclar.png
rename to src/cap/minisprites/gen6/pokemon/Syclar.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Tactite.png b/src/cap/minisprites/gen6/pokemon/Tactite.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Tactite.png
rename to src/cap/minisprites/gen6/pokemon/Tactite.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Tomohawk.png b/src/cap/minisprites/gen6/pokemon/Tomohawk.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Tomohawk.png
rename to src/cap/minisprites/gen6/pokemon/Tomohawk.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Volkraken.png b/src/cap/minisprites/gen6/pokemon/Volkraken.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Volkraken.png
rename to src/cap/minisprites/gen6/pokemon/Volkraken.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Volkritter.png b/src/cap/minisprites/gen6/pokemon/Volkritter.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Volkritter.png
rename to src/cap/minisprites/gen6/pokemon/Volkritter.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Voodoll.png b/src/cap/minisprites/gen6/pokemon/Voodoll.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Voodoll.png
rename to src/cap/minisprites/gen6/pokemon/Voodoll.png
diff --git a/src/noncanonical/minisprites/gen6/pokemon/Voodoom.png b/src/cap/minisprites/gen6/pokemon/Voodoom.png
similarity index 100%
rename from src/noncanonical/minisprites/gen6/pokemon/Voodoom.png
rename to src/cap/minisprites/gen6/pokemon/Voodoom.png
diff --git a/src/noncanonical/models/back/Aurumoth.gif b/src/cap/models/back/Aurumoth.gif
similarity index 100%
rename from src/noncanonical/models/back/Aurumoth.gif
rename to src/cap/models/back/Aurumoth.gif
diff --git a/src/noncanonical/models/back/Caribolt.gif b/src/cap/models/back/Caribolt.gif
similarity index 100%
rename from src/noncanonical/models/back/Caribolt.gif
rename to src/cap/models/back/Caribolt.gif
diff --git a/src/noncanonical/models/back/Cawmodore.gif b/src/cap/models/back/Cawmodore.gif
similarity index 100%
rename from src/noncanonical/models/back/Cawmodore.gif
rename to src/cap/models/back/Cawmodore.gif
diff --git a/src/noncanonical/models/back/Crucibelle--Mega.gif b/src/cap/models/back/Crucibelle--Mega.gif
similarity index 100%
rename from src/noncanonical/models/back/Crucibelle--Mega.gif
rename to src/cap/models/back/Crucibelle--Mega.gif
diff --git a/src/noncanonical/models/back/Crucibelle.gif b/src/cap/models/back/Crucibelle.gif
similarity index 100%
rename from src/noncanonical/models/back/Crucibelle.gif
rename to src/cap/models/back/Crucibelle.gif
diff --git a/src/noncanonical/models/back/Equilibra.gif b/src/cap/models/back/Equilibra.gif
similarity index 100%
rename from src/noncanonical/models/back/Equilibra.gif
rename to src/cap/models/back/Equilibra.gif
diff --git a/src/noncanonical/models/back/Fidgit.gif b/src/cap/models/back/Fidgit.gif
similarity index 100%
rename from src/noncanonical/models/back/Fidgit.gif
rename to src/cap/models/back/Fidgit.gif
diff --git a/src/noncanonical/models/back/Jumbao.gif b/src/cap/models/back/Jumbao.gif
similarity index 100%
rename from src/noncanonical/models/back/Jumbao.gif
rename to src/cap/models/back/Jumbao.gif
diff --git a/src/noncanonical/models/back/Kerfluffle.gif b/src/cap/models/back/Kerfluffle.gif
similarity index 100%
rename from src/noncanonical/models/back/Kerfluffle.gif
rename to src/cap/models/back/Kerfluffle.gif
diff --git a/src/noncanonical/models/back/Krilowatt.gif b/src/cap/models/back/Krilowatt.gif
similarity index 100%
rename from src/noncanonical/models/back/Krilowatt.gif
rename to src/cap/models/back/Krilowatt.gif
diff --git a/src/noncanonical/models/back/Mollux.gif b/src/cap/models/back/Mollux.gif
similarity index 100%
rename from src/noncanonical/models/back/Mollux.gif
rename to src/cap/models/back/Mollux.gif
diff --git a/src/noncanonical/models/back/Naviathan.gif b/src/cap/models/back/Naviathan.gif
similarity index 100%
rename from src/noncanonical/models/back/Naviathan.gif
rename to src/cap/models/back/Naviathan.gif
diff --git a/src/noncanonical/models/back/Pajantom.gif b/src/cap/models/back/Pajantom.gif
similarity index 100%
rename from src/noncanonical/models/back/Pajantom.gif
rename to src/cap/models/back/Pajantom.gif
diff --git a/src/noncanonical/models/back/Plasmanta.gif b/src/cap/models/back/Plasmanta.gif
similarity index 100%
rename from src/noncanonical/models/back/Plasmanta.gif
rename to src/cap/models/back/Plasmanta.gif
diff --git a/src/noncanonical/models/back/Pluffle.gif b/src/cap/models/back/Pluffle.gif
similarity index 100%
rename from src/noncanonical/models/back/Pluffle.gif
rename to src/cap/models/back/Pluffle.gif
diff --git a/src/noncanonical/models/back/Scratchet.gif b/src/cap/models/back/Scratchet.gif
similarity index 100%
rename from src/noncanonical/models/back/Scratchet.gif
rename to src/cap/models/back/Scratchet.gif
diff --git a/src/noncanonical/models/back/Smogecko.gif b/src/cap/models/back/Smogecko.gif
similarity index 100%
rename from src/noncanonical/models/back/Smogecko.gif
rename to src/cap/models/back/Smogecko.gif
diff --git a/src/noncanonical/models/back/Smokomodo.gif b/src/cap/models/back/Smokomodo.gif
similarity index 100%
rename from src/noncanonical/models/back/Smokomodo.gif
rename to src/cap/models/back/Smokomodo.gif
diff --git a/src/noncanonical/models/back/Snaelstrom.gif b/src/cap/models/back/Snaelstrom.gif
similarity index 100%
rename from src/noncanonical/models/back/Snaelstrom.gif
rename to src/cap/models/back/Snaelstrom.gif
diff --git a/src/noncanonical/models/back/Stratagem.gif b/src/cap/models/back/Stratagem.gif
similarity index 100%
rename from src/noncanonical/models/back/Stratagem.gif
rename to src/cap/models/back/Stratagem.gif
diff --git a/src/noncanonical/models/back/Tomohawk.gif b/src/cap/models/back/Tomohawk.gif
similarity index 100%
rename from src/noncanonical/models/back/Tomohawk.gif
rename to src/cap/models/back/Tomohawk.gif
diff --git a/src/noncanonical/models/back/Volkraken.gif b/src/cap/models/back/Volkraken.gif
similarity index 100%
rename from src/noncanonical/models/back/Volkraken.gif
rename to src/cap/models/back/Volkraken.gif
diff --git a/src/noncanonical/models/front/Aurumoth.gif b/src/cap/models/front/Aurumoth.gif
similarity index 100%
rename from src/noncanonical/models/front/Aurumoth.gif
rename to src/cap/models/front/Aurumoth.gif
diff --git a/src/noncanonical/models/front/Caribolt.gif b/src/cap/models/front/Caribolt.gif
similarity index 100%
rename from src/noncanonical/models/front/Caribolt.gif
rename to src/cap/models/front/Caribolt.gif
diff --git a/src/noncanonical/models/front/Cawmodore.gif b/src/cap/models/front/Cawmodore.gif
similarity index 100%
rename from src/noncanonical/models/front/Cawmodore.gif
rename to src/cap/models/front/Cawmodore.gif
diff --git a/src/noncanonical/models/front/Crucibelle--Mega.gif b/src/cap/models/front/Crucibelle--Mega.gif
similarity index 100%
rename from src/noncanonical/models/front/Crucibelle--Mega.gif
rename to src/cap/models/front/Crucibelle--Mega.gif
diff --git a/src/noncanonical/models/front/Crucibelle.gif b/src/cap/models/front/Crucibelle.gif
similarity index 100%
rename from src/noncanonical/models/front/Crucibelle.gif
rename to src/cap/models/front/Crucibelle.gif
diff --git a/src/noncanonical/models/front/Equilibra.gif b/src/cap/models/front/Equilibra.gif
similarity index 100%
rename from src/noncanonical/models/front/Equilibra.gif
rename to src/cap/models/front/Equilibra.gif
diff --git a/src/noncanonical/models/front/Fidgit.gif b/src/cap/models/front/Fidgit.gif
similarity index 100%
rename from src/noncanonical/models/front/Fidgit.gif
rename to src/cap/models/front/Fidgit.gif
diff --git a/src/noncanonical/models/front/Jumbao.gif b/src/cap/models/front/Jumbao.gif
similarity index 100%
rename from src/noncanonical/models/front/Jumbao.gif
rename to src/cap/models/front/Jumbao.gif
diff --git a/src/noncanonical/models/front/Kerfluffle.gif b/src/cap/models/front/Kerfluffle.gif
similarity index 100%
rename from src/noncanonical/models/front/Kerfluffle.gif
rename to src/cap/models/front/Kerfluffle.gif
diff --git a/src/noncanonical/models/front/Krilowatt.gif b/src/cap/models/front/Krilowatt.gif
similarity index 100%
rename from src/noncanonical/models/front/Krilowatt.gif
rename to src/cap/models/front/Krilowatt.gif
diff --git a/src/noncanonical/models/front/Mollux.gif b/src/cap/models/front/Mollux.gif
similarity index 100%
rename from src/noncanonical/models/front/Mollux.gif
rename to src/cap/models/front/Mollux.gif
diff --git a/src/noncanonical/models/front/Naviathan.gif b/src/cap/models/front/Naviathan.gif
similarity index 100%
rename from src/noncanonical/models/front/Naviathan.gif
rename to src/cap/models/front/Naviathan.gif
diff --git a/src/noncanonical/models/front/Pajantom.gif b/src/cap/models/front/Pajantom.gif
similarity index 100%
rename from src/noncanonical/models/front/Pajantom.gif
rename to src/cap/models/front/Pajantom.gif
diff --git a/src/noncanonical/models/front/Plasmanta.gif b/src/cap/models/front/Plasmanta.gif
similarity index 100%
rename from src/noncanonical/models/front/Plasmanta.gif
rename to src/cap/models/front/Plasmanta.gif
diff --git a/src/noncanonical/models/front/Pluffle.gif b/src/cap/models/front/Pluffle.gif
similarity index 100%
rename from src/noncanonical/models/front/Pluffle.gif
rename to src/cap/models/front/Pluffle.gif
diff --git a/src/noncanonical/models/front/Pyroak.gif b/src/cap/models/front/Pyroak.gif
similarity index 100%
rename from src/noncanonical/models/front/Pyroak.gif
rename to src/cap/models/front/Pyroak.gif
diff --git a/src/noncanonical/models/front/Scratchet.gif b/src/cap/models/front/Scratchet.gif
similarity index 100%
rename from src/noncanonical/models/front/Scratchet.gif
rename to src/cap/models/front/Scratchet.gif
diff --git a/src/noncanonical/models/front/Smogecko.gif b/src/cap/models/front/Smogecko.gif
similarity index 100%
rename from src/noncanonical/models/front/Smogecko.gif
rename to src/cap/models/front/Smogecko.gif
diff --git a/src/noncanonical/models/front/Smokomodo.gif b/src/cap/models/front/Smokomodo.gif
similarity index 100%
rename from src/noncanonical/models/front/Smokomodo.gif
rename to src/cap/models/front/Smokomodo.gif
diff --git a/src/noncanonical/models/front/Snaelstrom.gif b/src/cap/models/front/Snaelstrom.gif
similarity index 100%
rename from src/noncanonical/models/front/Snaelstrom.gif
rename to src/cap/models/front/Snaelstrom.gif
diff --git a/src/noncanonical/models/front/Stratagem.gif b/src/cap/models/front/Stratagem.gif
similarity index 100%
rename from src/noncanonical/models/front/Stratagem.gif
rename to src/cap/models/front/Stratagem.gif
diff --git a/src/noncanonical/models/front/Tomohawk.gif b/src/cap/models/front/Tomohawk.gif
similarity index 100%
rename from src/noncanonical/models/front/Tomohawk.gif
rename to src/cap/models/front/Tomohawk.gif
diff --git a/src/noncanonical/models/front/Volkraken.gif b/src/cap/models/front/Volkraken.gif
similarity index 100%
rename from src/noncanonical/models/front/Volkraken.gif
rename to src/cap/models/front/Volkraken.gif
diff --git a/src/noncanonical/sprites/gen5/back/Malaconda.gif b/src/cap/sprites/gen5/back/Malaconda.gif
similarity index 100%
rename from src/noncanonical/sprites/gen5/back/Malaconda.gif
rename to src/cap/sprites/gen5/back/Malaconda.gif
diff --git a/src/noncanonical/sprites/gen5/back/Necturna.gif b/src/cap/sprites/gen5/back/Necturna.gif
similarity index 100%
rename from src/noncanonical/sprites/gen5/back/Necturna.gif
rename to src/cap/sprites/gen5/back/Necturna.gif
diff --git a/src/noncanonical/sprites/gen5/front/Malaconda.gif b/src/cap/sprites/gen5/front/Malaconda.gif
similarity index 100%
rename from src/noncanonical/sprites/gen5/front/Malaconda.gif
rename to src/cap/sprites/gen5/front/Malaconda.gif
diff --git a/src/noncanonical/sprites/gen5/front/Necturna.gif b/src/cap/sprites/gen5/front/Necturna.gif
similarity index 100%
rename from src/noncanonical/sprites/gen5/front/Necturna.gif
rename to src/cap/sprites/gen5/front/Necturna.gif