diff --git a/Tupfile.lua b/Tupfile.lua
index c1fdde69..0759de94 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -40,22 +40,26 @@ tup.rule(
 
 -- PS models
 
-for file in iglob{"src/canonical/models/front/*", "src/canonical/models/front-cosmetic/*", "src/canonical/models/front-misc/*", "src/noncanonical/models/front/*"} do
+for file in iglob{"src/canonical/models/front/*", "src/canonical/models/front-cosmetic/*", "src/canonical/models/front-misc/*", "src/noncanonical/models/front/*",
+                  -- TODO: only pick noncanonical that aren't already in models/
+                  "src/noncanonical/sprites/gen5/front/*"} do
     local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file)
     symlink(file, "build/ps/ani/" .. output)
 end
 
-for file in iglob{"src/canonical/models/back/*", "src/canonical/models/back-cosmetic/*", "src/canonical/models/back-misc/*", "src/noncanonical/models/back/*"} do
+for file in iglob{"src/canonical/models/back/*", "src/canonical/models/back-cosmetic/*", "src/canonical/models/back-misc/*", "src/noncanonical/models/back/*",
+                  -- TODO: only pick noncanonical that aren't already in models/
+                  "src/noncanonical/sprites/gen5/back/*"} do
     local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file)
     symlink(file, "build/ps/ani-back/" .. output)
 end
 
-for file in iglob{"src/canonical/models/front-shiny/*", "src/canonical/models/front-shiny-cosmetic/*", "src/noncanonical/models/front-shiny/*"} do
+for file in iglob{"src/canonical/models/front-shiny/*", "src/canonical/models/front-shiny-cosmetic/*"} do
     local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file)
     symlink(file, "build/ps/ani-shiny/" .. output)
 end
 
-for file in iglob{"src/canonical/models/back-shiny/*", "src/canonical/models/back-shiny-cosmetic/*", "src/noncanonical/models/back-shiny/*"} do
+for file in iglob{"src/canonical/models/back-shiny/*", "src/canonical/models/back-shiny-cosmetic/*"} do
     local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file)
     symlink(file, "build/ps/ani-back-shiny/" .. output)
 end
@@ -78,7 +82,9 @@ function twittersprite(input, output)
     )
 end
 
-for file in iglob{"src/canonical/models/front/*", "src/noncanonical/models/front/*"} do
+for file in iglob{"src/canonical/models/front/*", "src/noncanonical/models/front/*",
+                  -- TODO: only pick noncanonical that aren't already in models/
+                  "src/noncanonical/sprites/gen5/front/*"} do
     local base = toSmogonAlias(decodeBase(file))
     symlink(file, "build/smogon/xy/" .. base .. ".%e")
     fbsprite(file, "build/smogon/fbsprites/xy/" .. base .. ".png")
diff --git a/src/noncanonical/models/back/Malaconda.gif b/src/noncanonical/sprites/gen5/back/Malaconda.gif
similarity index 100%
rename from src/noncanonical/models/back/Malaconda.gif
rename to src/noncanonical/sprites/gen5/back/Malaconda.gif
diff --git a/src/noncanonical/models/back/Necturna.gif b/src/noncanonical/sprites/gen5/back/Necturna.gif
similarity index 100%
rename from src/noncanonical/models/back/Necturna.gif
rename to src/noncanonical/sprites/gen5/back/Necturna.gif
diff --git a/src/noncanonical/models/front/Malaconda.gif b/src/noncanonical/sprites/gen5/front/Malaconda.gif
similarity index 100%
rename from src/noncanonical/models/front/Malaconda.gif
rename to src/noncanonical/sprites/gen5/front/Malaconda.gif
diff --git a/src/noncanonical/models/front/Necturna.gif b/src/noncanonical/sprites/gen5/front/Necturna.gif
similarity index 100%
rename from src/noncanonical/models/front/Necturna.gif
rename to src/noncanonical/sprites/gen5/front/Necturna.gif