diff --git a/graphics/pokemon/anim_front_pics/abra_front_pic.png b/graphics/pokemon/abra/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/abra_front_pic.png
rename to graphics/pokemon/abra/anim_front.png
diff --git a/graphics/pokemon/back_pics/abra_back_pic.png b/graphics/pokemon/abra/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/abra_back_pic.png
rename to graphics/pokemon/abra/back.png
diff --git a/graphics/pokemon/footprints/abra_footprint.png b/graphics/pokemon/abra/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/abra_footprint.png
rename to graphics/pokemon/abra/footprint.png
diff --git a/graphics/pokemon/front_pics/abra_still_front_pic.png b/graphics/pokemon/abra/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/abra_still_front_pic.png
rename to graphics/pokemon/abra/front.png
diff --git a/graphics/pokemon/icons/abra_icon.png b/graphics/pokemon/abra/icon.png
similarity index 100%
rename from graphics/pokemon/icons/abra_icon.png
rename to graphics/pokemon/abra/icon.png
diff --git a/graphics/pokemon/palettes/abra_palette.pal b/graphics/pokemon/abra/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/abra_palette.pal
rename to graphics/pokemon/abra/normal.pal
diff --git a/graphics/pokemon/palettes/abra_shiny_palette.pal b/graphics/pokemon/abra/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/abra_shiny_palette.pal
rename to graphics/pokemon/abra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/absol_front_pic.png b/graphics/pokemon/absol/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/absol_front_pic.png
rename to graphics/pokemon/absol/anim_front.png
diff --git a/graphics/pokemon/back_pics/absol_back_pic.png b/graphics/pokemon/absol/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/absol_back_pic.png
rename to graphics/pokemon/absol/back.png
diff --git a/graphics/pokemon/footprints/absol_footprint.png b/graphics/pokemon/absol/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/absol_footprint.png
rename to graphics/pokemon/absol/footprint.png
diff --git a/graphics/pokemon/front_pics/absol_still_front_pic.png b/graphics/pokemon/absol/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/absol_still_front_pic.png
rename to graphics/pokemon/absol/front.png
diff --git a/graphics/pokemon/icons/absol_icon.png b/graphics/pokemon/absol/icon.png
similarity index 100%
rename from graphics/pokemon/icons/absol_icon.png
rename to graphics/pokemon/absol/icon.png
diff --git a/graphics/pokemon/palettes/absol_palette.pal b/graphics/pokemon/absol/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/absol_palette.pal
rename to graphics/pokemon/absol/normal.pal
diff --git a/graphics/pokemon/palettes/absol_shiny_palette.pal b/graphics/pokemon/absol/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/absol_shiny_palette.pal
rename to graphics/pokemon/absol/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png b/graphics/pokemon/aerodactyl/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png
rename to graphics/pokemon/aerodactyl/anim_front.png
diff --git a/graphics/pokemon/back_pics/aerodactyl_back_pic.png b/graphics/pokemon/aerodactyl/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/aerodactyl_back_pic.png
rename to graphics/pokemon/aerodactyl/back.png
diff --git a/graphics/pokemon/footprints/aerodactyl_footprint.png b/graphics/pokemon/aerodactyl/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/aerodactyl_footprint.png
rename to graphics/pokemon/aerodactyl/footprint.png
diff --git a/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png b/graphics/pokemon/aerodactyl/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/aerodactyl_still_front_pic.png
rename to graphics/pokemon/aerodactyl/front.png
diff --git a/graphics/pokemon/icons/aerodactyl_icon.png b/graphics/pokemon/aerodactyl/icon.png
similarity index 100%
rename from graphics/pokemon/icons/aerodactyl_icon.png
rename to graphics/pokemon/aerodactyl/icon.png
diff --git a/graphics/pokemon/palettes/aerodactyl_palette.pal b/graphics/pokemon/aerodactyl/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/aerodactyl_palette.pal
rename to graphics/pokemon/aerodactyl/normal.pal
diff --git a/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal b/graphics/pokemon/aerodactyl/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/aerodactyl_shiny_palette.pal
rename to graphics/pokemon/aerodactyl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aggron_front_pic.png b/graphics/pokemon/aggron/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/aggron_front_pic.png
rename to graphics/pokemon/aggron/anim_front.png
diff --git a/graphics/pokemon/back_pics/aggron_back_pic.png b/graphics/pokemon/aggron/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/aggron_back_pic.png
rename to graphics/pokemon/aggron/back.png
diff --git a/graphics/pokemon/footprints/aggron_footprint.png b/graphics/pokemon/aggron/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/aggron_footprint.png
rename to graphics/pokemon/aggron/footprint.png
diff --git a/graphics/pokemon/front_pics/aggron_still_front_pic.png b/graphics/pokemon/aggron/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/aggron_still_front_pic.png
rename to graphics/pokemon/aggron/front.png
diff --git a/graphics/pokemon/icons/aggron_icon.png b/graphics/pokemon/aggron/icon.png
similarity index 100%
rename from graphics/pokemon/icons/aggron_icon.png
rename to graphics/pokemon/aggron/icon.png
diff --git a/graphics/pokemon/palettes/aggron_palette.pal b/graphics/pokemon/aggron/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/aggron_palette.pal
rename to graphics/pokemon/aggron/normal.pal
diff --git a/graphics/pokemon/palettes/aggron_shiny_palette.pal b/graphics/pokemon/aggron/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/aggron_shiny_palette.pal
rename to graphics/pokemon/aggron/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aipom_front_pic.png b/graphics/pokemon/aipom/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/aipom_front_pic.png
rename to graphics/pokemon/aipom/anim_front.png
diff --git a/graphics/pokemon/back_pics/aipom_back_pic.png b/graphics/pokemon/aipom/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/aipom_back_pic.png
rename to graphics/pokemon/aipom/back.png
diff --git a/graphics/pokemon/footprints/aipom_footprint.png b/graphics/pokemon/aipom/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/aipom_footprint.png
rename to graphics/pokemon/aipom/footprint.png
diff --git a/graphics/pokemon/front_pics/aipom_still_front_pic.png b/graphics/pokemon/aipom/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/aipom_still_front_pic.png
rename to graphics/pokemon/aipom/front.png
diff --git a/graphics/pokemon/icons/aipom_icon.png b/graphics/pokemon/aipom/icon.png
similarity index 100%
rename from graphics/pokemon/icons/aipom_icon.png
rename to graphics/pokemon/aipom/icon.png
diff --git a/graphics/pokemon/palettes/aipom_palette.pal b/graphics/pokemon/aipom/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/aipom_palette.pal
rename to graphics/pokemon/aipom/normal.pal
diff --git a/graphics/pokemon/palettes/aipom_shiny_palette.pal b/graphics/pokemon/aipom/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/aipom_shiny_palette.pal
rename to graphics/pokemon/aipom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/alakazam_front_pic.png b/graphics/pokemon/alakazam/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/alakazam_front_pic.png
rename to graphics/pokemon/alakazam/anim_front.png
diff --git a/graphics/pokemon/back_pics/alakazam_back_pic.png b/graphics/pokemon/alakazam/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/alakazam_back_pic.png
rename to graphics/pokemon/alakazam/back.png
diff --git a/graphics/pokemon/footprints/alakazam_footprint.png b/graphics/pokemon/alakazam/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/alakazam_footprint.png
rename to graphics/pokemon/alakazam/footprint.png
diff --git a/graphics/pokemon/front_pics/alakazam_still_front_pic.png b/graphics/pokemon/alakazam/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/alakazam_still_front_pic.png
rename to graphics/pokemon/alakazam/front.png
diff --git a/graphics/pokemon/icons/alakazam_icon.png b/graphics/pokemon/alakazam/icon.png
similarity index 100%
rename from graphics/pokemon/icons/alakazam_icon.png
rename to graphics/pokemon/alakazam/icon.png
diff --git a/graphics/pokemon/palettes/alakazam_palette.pal b/graphics/pokemon/alakazam/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/alakazam_palette.pal
rename to graphics/pokemon/alakazam/normal.pal
diff --git a/graphics/pokemon/palettes/alakazam_shiny_palette.pal b/graphics/pokemon/alakazam/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/alakazam_shiny_palette.pal
rename to graphics/pokemon/alakazam/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/altaria_front_pic.png b/graphics/pokemon/altaria/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/altaria_front_pic.png
rename to graphics/pokemon/altaria/anim_front.png
diff --git a/graphics/pokemon/back_pics/altaria_back_pic.png b/graphics/pokemon/altaria/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/altaria_back_pic.png
rename to graphics/pokemon/altaria/back.png
diff --git a/graphics/pokemon/footprints/altaria_footprint.png b/graphics/pokemon/altaria/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/altaria_footprint.png
rename to graphics/pokemon/altaria/footprint.png
diff --git a/graphics/pokemon/front_pics/altaria_still_front_pic.png b/graphics/pokemon/altaria/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/altaria_still_front_pic.png
rename to graphics/pokemon/altaria/front.png
diff --git a/graphics/pokemon/icons/altaria_icon.png b/graphics/pokemon/altaria/icon.png
similarity index 100%
rename from graphics/pokemon/icons/altaria_icon.png
rename to graphics/pokemon/altaria/icon.png
diff --git a/graphics/pokemon/palettes/altaria_palette.pal b/graphics/pokemon/altaria/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/altaria_palette.pal
rename to graphics/pokemon/altaria/normal.pal
diff --git a/graphics/pokemon/palettes/altaria_shiny_palette.pal b/graphics/pokemon/altaria/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/altaria_shiny_palette.pal
rename to graphics/pokemon/altaria/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ampharos_front_pic.png b/graphics/pokemon/ampharos/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ampharos_front_pic.png
rename to graphics/pokemon/ampharos/anim_front.png
diff --git a/graphics/pokemon/back_pics/ampharos_back_pic.png b/graphics/pokemon/ampharos/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ampharos_back_pic.png
rename to graphics/pokemon/ampharos/back.png
diff --git a/graphics/pokemon/footprints/ampharos_footprint.png b/graphics/pokemon/ampharos/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ampharos_footprint.png
rename to graphics/pokemon/ampharos/footprint.png
diff --git a/graphics/pokemon/front_pics/ampharos_still_front_pic.png b/graphics/pokemon/ampharos/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ampharos_still_front_pic.png
rename to graphics/pokemon/ampharos/front.png
diff --git a/graphics/pokemon/icons/ampharos_icon.png b/graphics/pokemon/ampharos/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ampharos_icon.png
rename to graphics/pokemon/ampharos/icon.png
diff --git a/graphics/pokemon/palettes/ampharos_palette.pal b/graphics/pokemon/ampharos/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ampharos_palette.pal
rename to graphics/pokemon/ampharos/normal.pal
diff --git a/graphics/pokemon/palettes/ampharos_shiny_palette.pal b/graphics/pokemon/ampharos/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ampharos_shiny_palette.pal
rename to graphics/pokemon/ampharos/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/anorith_front_pic.png b/graphics/pokemon/anorith/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/anorith_front_pic.png
rename to graphics/pokemon/anorith/anim_front.png
diff --git a/graphics/pokemon/back_pics/anorith_back_pic.png b/graphics/pokemon/anorith/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/anorith_back_pic.png
rename to graphics/pokemon/anorith/back.png
diff --git a/graphics/pokemon/footprints/anorith_footprint.png b/graphics/pokemon/anorith/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/anorith_footprint.png
rename to graphics/pokemon/anorith/footprint.png
diff --git a/graphics/pokemon/front_pics/anorith_still_front_pic.png b/graphics/pokemon/anorith/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/anorith_still_front_pic.png
rename to graphics/pokemon/anorith/front.png
diff --git a/graphics/pokemon/icons/anorith_icon.png b/graphics/pokemon/anorith/icon.png
similarity index 100%
rename from graphics/pokemon/icons/anorith_icon.png
rename to graphics/pokemon/anorith/icon.png
diff --git a/graphics/pokemon/palettes/anorith_palette.pal b/graphics/pokemon/anorith/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/anorith_palette.pal
rename to graphics/pokemon/anorith/normal.pal
diff --git a/graphics/pokemon/palettes/anorith_shiny_palette.pal b/graphics/pokemon/anorith/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/anorith_shiny_palette.pal
rename to graphics/pokemon/anorith/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/arbok_front_pic.png b/graphics/pokemon/arbok/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/arbok_front_pic.png
rename to graphics/pokemon/arbok/anim_front.png
diff --git a/graphics/pokemon/back_pics/arbok_back_pic.png b/graphics/pokemon/arbok/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/arbok_back_pic.png
rename to graphics/pokemon/arbok/back.png
diff --git a/graphics/pokemon/footprints/arbok_footprint.png b/graphics/pokemon/arbok/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/arbok_footprint.png
rename to graphics/pokemon/arbok/footprint.png
diff --git a/graphics/pokemon/front_pics/arbok_still_front_pic.png b/graphics/pokemon/arbok/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/arbok_still_front_pic.png
rename to graphics/pokemon/arbok/front.png
diff --git a/graphics/pokemon/icons/arbok_icon.png b/graphics/pokemon/arbok/icon.png
similarity index 100%
rename from graphics/pokemon/icons/arbok_icon.png
rename to graphics/pokemon/arbok/icon.png
diff --git a/graphics/pokemon/palettes/arbok_palette.pal b/graphics/pokemon/arbok/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/arbok_palette.pal
rename to graphics/pokemon/arbok/normal.pal
diff --git a/graphics/pokemon/palettes/arbok_shiny_palette.pal b/graphics/pokemon/arbok/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/arbok_shiny_palette.pal
rename to graphics/pokemon/arbok/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/arcanine_front_pic.png b/graphics/pokemon/arcanine/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/arcanine_front_pic.png
rename to graphics/pokemon/arcanine/anim_front.png
diff --git a/graphics/pokemon/back_pics/arcanine_back_pic.png b/graphics/pokemon/arcanine/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/arcanine_back_pic.png
rename to graphics/pokemon/arcanine/back.png
diff --git a/graphics/pokemon/footprints/arcanine_footprint.png b/graphics/pokemon/arcanine/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/arcanine_footprint.png
rename to graphics/pokemon/arcanine/footprint.png
diff --git a/graphics/pokemon/front_pics/arcanine_still_front_pic.png b/graphics/pokemon/arcanine/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/arcanine_still_front_pic.png
rename to graphics/pokemon/arcanine/front.png
diff --git a/graphics/pokemon/icons/arcanine_icon.png b/graphics/pokemon/arcanine/icon.png
similarity index 100%
rename from graphics/pokemon/icons/arcanine_icon.png
rename to graphics/pokemon/arcanine/icon.png
diff --git a/graphics/pokemon/palettes/arcanine_palette.pal b/graphics/pokemon/arcanine/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/arcanine_palette.pal
rename to graphics/pokemon/arcanine/normal.pal
diff --git a/graphics/pokemon/palettes/arcanine_shiny_palette.pal b/graphics/pokemon/arcanine/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/arcanine_shiny_palette.pal
rename to graphics/pokemon/arcanine/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ariados_front_pic.png b/graphics/pokemon/ariados/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ariados_front_pic.png
rename to graphics/pokemon/ariados/anim_front.png
diff --git a/graphics/pokemon/back_pics/ariados_back_pic.png b/graphics/pokemon/ariados/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ariados_back_pic.png
rename to graphics/pokemon/ariados/back.png
diff --git a/graphics/pokemon/footprints/ariados_footprint.png b/graphics/pokemon/ariados/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ariados_footprint.png
rename to graphics/pokemon/ariados/footprint.png
diff --git a/graphics/pokemon/front_pics/ariados_still_front_pic.png b/graphics/pokemon/ariados/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ariados_still_front_pic.png
rename to graphics/pokemon/ariados/front.png
diff --git a/graphics/pokemon/icons/ariados_icon.png b/graphics/pokemon/ariados/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ariados_icon.png
rename to graphics/pokemon/ariados/icon.png
diff --git a/graphics/pokemon/palettes/ariados_palette.pal b/graphics/pokemon/ariados/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ariados_palette.pal
rename to graphics/pokemon/ariados/normal.pal
diff --git a/graphics/pokemon/palettes/ariados_shiny_palette.pal b/graphics/pokemon/ariados/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ariados_shiny_palette.pal
rename to graphics/pokemon/ariados/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/armaldo_front_pic.png b/graphics/pokemon/armaldo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/armaldo_front_pic.png
rename to graphics/pokemon/armaldo/anim_front.png
diff --git a/graphics/pokemon/back_pics/armaldo_back_pic.png b/graphics/pokemon/armaldo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/armaldo_back_pic.png
rename to graphics/pokemon/armaldo/back.png
diff --git a/graphics/pokemon/footprints/armaldo_footprint.png b/graphics/pokemon/armaldo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/armaldo_footprint.png
rename to graphics/pokemon/armaldo/footprint.png
diff --git a/graphics/pokemon/front_pics/armaldo_still_front_pic.png b/graphics/pokemon/armaldo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/armaldo_still_front_pic.png
rename to graphics/pokemon/armaldo/front.png
diff --git a/graphics/pokemon/icons/armaldo_icon.png b/graphics/pokemon/armaldo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/armaldo_icon.png
rename to graphics/pokemon/armaldo/icon.png
diff --git a/graphics/pokemon/palettes/armaldo_palette.pal b/graphics/pokemon/armaldo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/armaldo_palette.pal
rename to graphics/pokemon/armaldo/normal.pal
diff --git a/graphics/pokemon/palettes/armaldo_shiny_palette.pal b/graphics/pokemon/armaldo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/armaldo_shiny_palette.pal
rename to graphics/pokemon/armaldo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aron_front_pic.png b/graphics/pokemon/aron/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/aron_front_pic.png
rename to graphics/pokemon/aron/anim_front.png
diff --git a/graphics/pokemon/back_pics/aron_back_pic.png b/graphics/pokemon/aron/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/aron_back_pic.png
rename to graphics/pokemon/aron/back.png
diff --git a/graphics/pokemon/footprints/aron_footprint.png b/graphics/pokemon/aron/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/aron_footprint.png
rename to graphics/pokemon/aron/footprint.png
diff --git a/graphics/pokemon/front_pics/aron_still_front_pic.png b/graphics/pokemon/aron/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/aron_still_front_pic.png
rename to graphics/pokemon/aron/front.png
diff --git a/graphics/pokemon/icons/aron_icon.png b/graphics/pokemon/aron/icon.png
similarity index 100%
rename from graphics/pokemon/icons/aron_icon.png
rename to graphics/pokemon/aron/icon.png
diff --git a/graphics/pokemon/palettes/aron_palette.pal b/graphics/pokemon/aron/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/aron_palette.pal
rename to graphics/pokemon/aron/normal.pal
diff --git a/graphics/pokemon/palettes/aron_shiny_palette.pal b/graphics/pokemon/aron/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/aron_shiny_palette.pal
rename to graphics/pokemon/aron/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/articuno_front_pic.png b/graphics/pokemon/articuno/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/articuno_front_pic.png
rename to graphics/pokemon/articuno/anim_front.png
diff --git a/graphics/pokemon/back_pics/articuno_back_pic.png b/graphics/pokemon/articuno/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/articuno_back_pic.png
rename to graphics/pokemon/articuno/back.png
diff --git a/graphics/pokemon/footprints/articuno_footprint.png b/graphics/pokemon/articuno/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/articuno_footprint.png
rename to graphics/pokemon/articuno/footprint.png
diff --git a/graphics/pokemon/front_pics/articuno_still_front_pic.png b/graphics/pokemon/articuno/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/articuno_still_front_pic.png
rename to graphics/pokemon/articuno/front.png
diff --git a/graphics/pokemon/icons/articuno_icon.png b/graphics/pokemon/articuno/icon.png
similarity index 100%
rename from graphics/pokemon/icons/articuno_icon.png
rename to graphics/pokemon/articuno/icon.png
diff --git a/graphics/pokemon/palettes/articuno_palette.pal b/graphics/pokemon/articuno/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/articuno_palette.pal
rename to graphics/pokemon/articuno/normal.pal
diff --git a/graphics/pokemon/palettes/articuno_shiny_palette.pal b/graphics/pokemon/articuno/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/articuno_shiny_palette.pal
rename to graphics/pokemon/articuno/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/azumarill_front_pic.png b/graphics/pokemon/azumarill/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/azumarill_front_pic.png
rename to graphics/pokemon/azumarill/anim_front.png
diff --git a/graphics/pokemon/back_pics/azumarill_back_pic.png b/graphics/pokemon/azumarill/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/azumarill_back_pic.png
rename to graphics/pokemon/azumarill/back.png
diff --git a/graphics/pokemon/footprints/azumarill_footprint.png b/graphics/pokemon/azumarill/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/azumarill_footprint.png
rename to graphics/pokemon/azumarill/footprint.png
diff --git a/graphics/pokemon/front_pics/azumarill_still_front_pic.png b/graphics/pokemon/azumarill/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/azumarill_still_front_pic.png
rename to graphics/pokemon/azumarill/front.png
diff --git a/graphics/pokemon/icons/azumarill_icon.png b/graphics/pokemon/azumarill/icon.png
similarity index 100%
rename from graphics/pokemon/icons/azumarill_icon.png
rename to graphics/pokemon/azumarill/icon.png
diff --git a/graphics/pokemon/palettes/azumarill_palette.pal b/graphics/pokemon/azumarill/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/azumarill_palette.pal
rename to graphics/pokemon/azumarill/normal.pal
diff --git a/graphics/pokemon/palettes/azumarill_shiny_palette.pal b/graphics/pokemon/azumarill/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/azumarill_shiny_palette.pal
rename to graphics/pokemon/azumarill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/azurill_front_pic.png b/graphics/pokemon/azurill/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/azurill_front_pic.png
rename to graphics/pokemon/azurill/anim_front.png
diff --git a/graphics/pokemon/back_pics/azurill_back_pic.png b/graphics/pokemon/azurill/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/azurill_back_pic.png
rename to graphics/pokemon/azurill/back.png
diff --git a/graphics/pokemon/footprints/azurill_footprint.png b/graphics/pokemon/azurill/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/azurill_footprint.png
rename to graphics/pokemon/azurill/footprint.png
diff --git a/graphics/pokemon/front_pics/azurill_still_front_pic.png b/graphics/pokemon/azurill/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/azurill_still_front_pic.png
rename to graphics/pokemon/azurill/front.png
diff --git a/graphics/pokemon/icons/azurill_icon.png b/graphics/pokemon/azurill/icon.png
similarity index 100%
rename from graphics/pokemon/icons/azurill_icon.png
rename to graphics/pokemon/azurill/icon.png
diff --git a/graphics/pokemon/palettes/azurill_palette.pal b/graphics/pokemon/azurill/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/azurill_palette.pal
rename to graphics/pokemon/azurill/normal.pal
diff --git a/graphics/pokemon/palettes/azurill_shiny_palette.pal b/graphics/pokemon/azurill/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/azurill_shiny_palette.pal
rename to graphics/pokemon/azurill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bagon_front_pic.png b/graphics/pokemon/bagon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/bagon_front_pic.png
rename to graphics/pokemon/bagon/anim_front.png
diff --git a/graphics/pokemon/back_pics/bagon_back_pic.png b/graphics/pokemon/bagon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/bagon_back_pic.png
rename to graphics/pokemon/bagon/back.png
diff --git a/graphics/pokemon/footprints/bagon_footprint.png b/graphics/pokemon/bagon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/bagon_footprint.png
rename to graphics/pokemon/bagon/footprint.png
diff --git a/graphics/pokemon/front_pics/bagon_still_front_pic.png b/graphics/pokemon/bagon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/bagon_still_front_pic.png
rename to graphics/pokemon/bagon/front.png
diff --git a/graphics/pokemon/icons/bagon_icon.png b/graphics/pokemon/bagon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/bagon_icon.png
rename to graphics/pokemon/bagon/icon.png
diff --git a/graphics/pokemon/palettes/bagon_palette.pal b/graphics/pokemon/bagon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/bagon_palette.pal
rename to graphics/pokemon/bagon/normal.pal
diff --git a/graphics/pokemon/palettes/bagon_shiny_palette.pal b/graphics/pokemon/bagon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/bagon_shiny_palette.pal
rename to graphics/pokemon/bagon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/baltoy_front_pic.png b/graphics/pokemon/baltoy/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/baltoy_front_pic.png
rename to graphics/pokemon/baltoy/anim_front.png
diff --git a/graphics/pokemon/back_pics/baltoy_back_pic.png b/graphics/pokemon/baltoy/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/baltoy_back_pic.png
rename to graphics/pokemon/baltoy/back.png
diff --git a/graphics/pokemon/footprints/baltoy_footprint.png b/graphics/pokemon/baltoy/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/baltoy_footprint.png
rename to graphics/pokemon/baltoy/footprint.png
diff --git a/graphics/pokemon/front_pics/baltoy_still_front_pic.png b/graphics/pokemon/baltoy/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/baltoy_still_front_pic.png
rename to graphics/pokemon/baltoy/front.png
diff --git a/graphics/pokemon/icons/baltoy_icon.png b/graphics/pokemon/baltoy/icon.png
similarity index 100%
rename from graphics/pokemon/icons/baltoy_icon.png
rename to graphics/pokemon/baltoy/icon.png
diff --git a/graphics/pokemon/palettes/baltoy_palette.pal b/graphics/pokemon/baltoy/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/baltoy_palette.pal
rename to graphics/pokemon/baltoy/normal.pal
diff --git a/graphics/pokemon/palettes/baltoy_shiny_palette.pal b/graphics/pokemon/baltoy/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/baltoy_shiny_palette.pal
rename to graphics/pokemon/baltoy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/banette_front_pic.png b/graphics/pokemon/banette/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/banette_front_pic.png
rename to graphics/pokemon/banette/anim_front.png
diff --git a/graphics/pokemon/back_pics/banette_back_pic.png b/graphics/pokemon/banette/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/banette_back_pic.png
rename to graphics/pokemon/banette/back.png
diff --git a/graphics/pokemon/footprints/banette_footprint.png b/graphics/pokemon/banette/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/banette_footprint.png
rename to graphics/pokemon/banette/footprint.png
diff --git a/graphics/pokemon/front_pics/banette_still_front_pic.png b/graphics/pokemon/banette/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/banette_still_front_pic.png
rename to graphics/pokemon/banette/front.png
diff --git a/graphics/pokemon/icons/banette_icon.png b/graphics/pokemon/banette/icon.png
similarity index 100%
rename from graphics/pokemon/icons/banette_icon.png
rename to graphics/pokemon/banette/icon.png
diff --git a/graphics/pokemon/palettes/banette_palette.pal b/graphics/pokemon/banette/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/banette_palette.pal
rename to graphics/pokemon/banette/normal.pal
diff --git a/graphics/pokemon/palettes/banette_shiny_palette.pal b/graphics/pokemon/banette/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/banette_shiny_palette.pal
rename to graphics/pokemon/banette/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/barboach_front_pic.png b/graphics/pokemon/barboach/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/barboach_front_pic.png
rename to graphics/pokemon/barboach/anim_front.png
diff --git a/graphics/pokemon/back_pics/barboach_back_pic.png b/graphics/pokemon/barboach/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/barboach_back_pic.png
rename to graphics/pokemon/barboach/back.png
diff --git a/graphics/pokemon/footprints/barboach_footprint.png b/graphics/pokemon/barboach/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/barboach_footprint.png
rename to graphics/pokemon/barboach/footprint.png
diff --git a/graphics/pokemon/front_pics/barboach_still_front_pic.png b/graphics/pokemon/barboach/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/barboach_still_front_pic.png
rename to graphics/pokemon/barboach/front.png
diff --git a/graphics/pokemon/icons/barboach_icon.png b/graphics/pokemon/barboach/icon.png
similarity index 100%
rename from graphics/pokemon/icons/barboach_icon.png
rename to graphics/pokemon/barboach/icon.png
diff --git a/graphics/pokemon/palettes/barboach_palette.pal b/graphics/pokemon/barboach/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/barboach_palette.pal
rename to graphics/pokemon/barboach/normal.pal
diff --git a/graphics/pokemon/palettes/barboach_shiny_palette.pal b/graphics/pokemon/barboach/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/barboach_shiny_palette.pal
rename to graphics/pokemon/barboach/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bayleef_front_pic.png b/graphics/pokemon/bayleef/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/bayleef_front_pic.png
rename to graphics/pokemon/bayleef/anim_front.png
diff --git a/graphics/pokemon/back_pics/bayleef_back_pic.png b/graphics/pokemon/bayleef/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/bayleef_back_pic.png
rename to graphics/pokemon/bayleef/back.png
diff --git a/graphics/pokemon/footprints/bayleef_footprint.png b/graphics/pokemon/bayleef/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/bayleef_footprint.png
rename to graphics/pokemon/bayleef/footprint.png
diff --git a/graphics/pokemon/front_pics/bayleef_still_front_pic.png b/graphics/pokemon/bayleef/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/bayleef_still_front_pic.png
rename to graphics/pokemon/bayleef/front.png
diff --git a/graphics/pokemon/icons/bayleef_icon.png b/graphics/pokemon/bayleef/icon.png
similarity index 100%
rename from graphics/pokemon/icons/bayleef_icon.png
rename to graphics/pokemon/bayleef/icon.png
diff --git a/graphics/pokemon/palettes/bayleef_palette.pal b/graphics/pokemon/bayleef/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/bayleef_palette.pal
rename to graphics/pokemon/bayleef/normal.pal
diff --git a/graphics/pokemon/palettes/bayleef_shiny_palette.pal b/graphics/pokemon/bayleef/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/bayleef_shiny_palette.pal
rename to graphics/pokemon/bayleef/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/beautifly_front_pic.png b/graphics/pokemon/beautifly/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/beautifly_front_pic.png
rename to graphics/pokemon/beautifly/anim_front.png
diff --git a/graphics/pokemon/back_pics/beautifly_back_pic.png b/graphics/pokemon/beautifly/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/beautifly_back_pic.png
rename to graphics/pokemon/beautifly/back.png
diff --git a/graphics/pokemon/footprints/beautifly_footprint.png b/graphics/pokemon/beautifly/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/beautifly_footprint.png
rename to graphics/pokemon/beautifly/footprint.png
diff --git a/graphics/pokemon/front_pics/beautifly_still_front_pic.png b/graphics/pokemon/beautifly/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/beautifly_still_front_pic.png
rename to graphics/pokemon/beautifly/front.png
diff --git a/graphics/pokemon/icons/beautifly_icon.png b/graphics/pokemon/beautifly/icon.png
similarity index 100%
rename from graphics/pokemon/icons/beautifly_icon.png
rename to graphics/pokemon/beautifly/icon.png
diff --git a/graphics/pokemon/palettes/beautifly_palette.pal b/graphics/pokemon/beautifly/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/beautifly_palette.pal
rename to graphics/pokemon/beautifly/normal.pal
diff --git a/graphics/pokemon/palettes/beautifly_shiny_palette.pal b/graphics/pokemon/beautifly/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/beautifly_shiny_palette.pal
rename to graphics/pokemon/beautifly/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/beedrill_front_pic.png b/graphics/pokemon/beedrill/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/beedrill_front_pic.png
rename to graphics/pokemon/beedrill/anim_front.png
diff --git a/graphics/pokemon/back_pics/beedrill_back_pic.png b/graphics/pokemon/beedrill/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/beedrill_back_pic.png
rename to graphics/pokemon/beedrill/back.png
diff --git a/graphics/pokemon/footprints/beedrill_footprint.png b/graphics/pokemon/beedrill/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/beedrill_footprint.png
rename to graphics/pokemon/beedrill/footprint.png
diff --git a/graphics/pokemon/front_pics/beedrill_still_front_pic.png b/graphics/pokemon/beedrill/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/beedrill_still_front_pic.png
rename to graphics/pokemon/beedrill/front.png
diff --git a/graphics/pokemon/icons/beedrill_icon.png b/graphics/pokemon/beedrill/icon.png
similarity index 100%
rename from graphics/pokemon/icons/beedrill_icon.png
rename to graphics/pokemon/beedrill/icon.png
diff --git a/graphics/pokemon/palettes/beedrill_palette.pal b/graphics/pokemon/beedrill/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/beedrill_palette.pal
rename to graphics/pokemon/beedrill/normal.pal
diff --git a/graphics/pokemon/palettes/beedrill_shiny_palette.pal b/graphics/pokemon/beedrill/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/beedrill_shiny_palette.pal
rename to graphics/pokemon/beedrill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/beldum_front_pic.png b/graphics/pokemon/beldum/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/beldum_front_pic.png
rename to graphics/pokemon/beldum/anim_front.png
diff --git a/graphics/pokemon/back_pics/beldum_back_pic.png b/graphics/pokemon/beldum/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/beldum_back_pic.png
rename to graphics/pokemon/beldum/back.png
diff --git a/graphics/pokemon/footprints/beldum_footprint.png b/graphics/pokemon/beldum/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/beldum_footprint.png
rename to graphics/pokemon/beldum/footprint.png
diff --git a/graphics/pokemon/front_pics/beldum_still_front_pic.png b/graphics/pokemon/beldum/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/beldum_still_front_pic.png
rename to graphics/pokemon/beldum/front.png
diff --git a/graphics/pokemon/icons/beldum_icon.png b/graphics/pokemon/beldum/icon.png
similarity index 100%
rename from graphics/pokemon/icons/beldum_icon.png
rename to graphics/pokemon/beldum/icon.png
diff --git a/graphics/pokemon/palettes/beldum_palette.pal b/graphics/pokemon/beldum/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/beldum_palette.pal
rename to graphics/pokemon/beldum/normal.pal
diff --git a/graphics/pokemon/palettes/beldum_shiny_palette.pal b/graphics/pokemon/beldum/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/beldum_shiny_palette.pal
rename to graphics/pokemon/beldum/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bellossom_front_pic.png b/graphics/pokemon/bellossom/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/bellossom_front_pic.png
rename to graphics/pokemon/bellossom/anim_front.png
diff --git a/graphics/pokemon/back_pics/bellossom_back_pic.png b/graphics/pokemon/bellossom/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/bellossom_back_pic.png
rename to graphics/pokemon/bellossom/back.png
diff --git a/graphics/pokemon/footprints/bellossom_footprint.png b/graphics/pokemon/bellossom/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/bellossom_footprint.png
rename to graphics/pokemon/bellossom/footprint.png
diff --git a/graphics/pokemon/front_pics/bellossom_still_front_pic.png b/graphics/pokemon/bellossom/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/bellossom_still_front_pic.png
rename to graphics/pokemon/bellossom/front.png
diff --git a/graphics/pokemon/icons/bellossom_icon.png b/graphics/pokemon/bellossom/icon.png
similarity index 100%
rename from graphics/pokemon/icons/bellossom_icon.png
rename to graphics/pokemon/bellossom/icon.png
diff --git a/graphics/pokemon/palettes/bellossom_palette.pal b/graphics/pokemon/bellossom/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/bellossom_palette.pal
rename to graphics/pokemon/bellossom/normal.pal
diff --git a/graphics/pokemon/palettes/bellossom_shiny_palette.pal b/graphics/pokemon/bellossom/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/bellossom_shiny_palette.pal
rename to graphics/pokemon/bellossom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bellsprout_front_pic.png b/graphics/pokemon/bellsprout/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/bellsprout_front_pic.png
rename to graphics/pokemon/bellsprout/anim_front.png
diff --git a/graphics/pokemon/back_pics/bellsprout_back_pic.png b/graphics/pokemon/bellsprout/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/bellsprout_back_pic.png
rename to graphics/pokemon/bellsprout/back.png
diff --git a/graphics/pokemon/footprints/bellsprout_footprint.png b/graphics/pokemon/bellsprout/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/bellsprout_footprint.png
rename to graphics/pokemon/bellsprout/footprint.png
diff --git a/graphics/pokemon/front_pics/bellsprout_still_front_pic.png b/graphics/pokemon/bellsprout/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/bellsprout_still_front_pic.png
rename to graphics/pokemon/bellsprout/front.png
diff --git a/graphics/pokemon/icons/bellsprout_icon.png b/graphics/pokemon/bellsprout/icon.png
similarity index 100%
rename from graphics/pokemon/icons/bellsprout_icon.png
rename to graphics/pokemon/bellsprout/icon.png
diff --git a/graphics/pokemon/palettes/bellsprout_palette.pal b/graphics/pokemon/bellsprout/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/bellsprout_palette.pal
rename to graphics/pokemon/bellsprout/normal.pal
diff --git a/graphics/pokemon/palettes/bellsprout_shiny_palette.pal b/graphics/pokemon/bellsprout/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/bellsprout_shiny_palette.pal
rename to graphics/pokemon/bellsprout/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/blastoise_front_pic.png b/graphics/pokemon/blastoise/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/blastoise_front_pic.png
rename to graphics/pokemon/blastoise/anim_front.png
diff --git a/graphics/pokemon/back_pics/blastoise_back_pic.png b/graphics/pokemon/blastoise/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/blastoise_back_pic.png
rename to graphics/pokemon/blastoise/back.png
diff --git a/graphics/pokemon/footprints/blastoise_footprint.png b/graphics/pokemon/blastoise/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/blastoise_footprint.png
rename to graphics/pokemon/blastoise/footprint.png
diff --git a/graphics/pokemon/front_pics/blastoise_still_front_pic.png b/graphics/pokemon/blastoise/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/blastoise_still_front_pic.png
rename to graphics/pokemon/blastoise/front.png
diff --git a/graphics/pokemon/icons/blastoise_icon.png b/graphics/pokemon/blastoise/icon.png
similarity index 100%
rename from graphics/pokemon/icons/blastoise_icon.png
rename to graphics/pokemon/blastoise/icon.png
diff --git a/graphics/pokemon/palettes/blastoise_palette.pal b/graphics/pokemon/blastoise/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/blastoise_palette.pal
rename to graphics/pokemon/blastoise/normal.pal
diff --git a/graphics/pokemon/palettes/blastoise_shiny_palette.pal b/graphics/pokemon/blastoise/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/blastoise_shiny_palette.pal
rename to graphics/pokemon/blastoise/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/blaziken_front_pic.png b/graphics/pokemon/blaziken/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/blaziken_front_pic.png
rename to graphics/pokemon/blaziken/anim_front.png
diff --git a/graphics/pokemon/back_pics/blaziken_back_pic.png b/graphics/pokemon/blaziken/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/blaziken_back_pic.png
rename to graphics/pokemon/blaziken/back.png
diff --git a/graphics/pokemon/footprints/blaziken_footprint.png b/graphics/pokemon/blaziken/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/blaziken_footprint.png
rename to graphics/pokemon/blaziken/footprint.png
diff --git a/graphics/pokemon/front_pics/blaziken_still_front_pic.png b/graphics/pokemon/blaziken/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/blaziken_still_front_pic.png
rename to graphics/pokemon/blaziken/front.png
diff --git a/graphics/pokemon/icons/blaziken_icon.png b/graphics/pokemon/blaziken/icon.png
similarity index 100%
rename from graphics/pokemon/icons/blaziken_icon.png
rename to graphics/pokemon/blaziken/icon.png
diff --git a/graphics/pokemon/palettes/blaziken_palette.pal b/graphics/pokemon/blaziken/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/blaziken_palette.pal
rename to graphics/pokemon/blaziken/normal.pal
diff --git a/graphics/pokemon/palettes/blaziken_shiny_palette.pal b/graphics/pokemon/blaziken/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/blaziken_shiny_palette.pal
rename to graphics/pokemon/blaziken/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/blissey_front_pic.png b/graphics/pokemon/blissey/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/blissey_front_pic.png
rename to graphics/pokemon/blissey/anim_front.png
diff --git a/graphics/pokemon/back_pics/blissey_back_pic.png b/graphics/pokemon/blissey/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/blissey_back_pic.png
rename to graphics/pokemon/blissey/back.png
diff --git a/graphics/pokemon/footprints/blissey_footprint.png b/graphics/pokemon/blissey/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/blissey_footprint.png
rename to graphics/pokemon/blissey/footprint.png
diff --git a/graphics/pokemon/front_pics/blissey_still_front_pic.png b/graphics/pokemon/blissey/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/blissey_still_front_pic.png
rename to graphics/pokemon/blissey/front.png
diff --git a/graphics/pokemon/icons/blissey_icon.png b/graphics/pokemon/blissey/icon.png
similarity index 100%
rename from graphics/pokemon/icons/blissey_icon.png
rename to graphics/pokemon/blissey/icon.png
diff --git a/graphics/pokemon/palettes/blissey_palette.pal b/graphics/pokemon/blissey/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/blissey_palette.pal
rename to graphics/pokemon/blissey/normal.pal
diff --git a/graphics/pokemon/palettes/blissey_shiny_palette.pal b/graphics/pokemon/blissey/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/blissey_shiny_palette.pal
rename to graphics/pokemon/blissey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/breloom_front_pic.png b/graphics/pokemon/breloom/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/breloom_front_pic.png
rename to graphics/pokemon/breloom/anim_front.png
diff --git a/graphics/pokemon/back_pics/breloom_back_pic.png b/graphics/pokemon/breloom/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/breloom_back_pic.png
rename to graphics/pokemon/breloom/back.png
diff --git a/graphics/pokemon/footprints/breloom_footprint.png b/graphics/pokemon/breloom/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/breloom_footprint.png
rename to graphics/pokemon/breloom/footprint.png
diff --git a/graphics/pokemon/front_pics/breloom_still_front_pic.png b/graphics/pokemon/breloom/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/breloom_still_front_pic.png
rename to graphics/pokemon/breloom/front.png
diff --git a/graphics/pokemon/icons/breloom_icon.png b/graphics/pokemon/breloom/icon.png
similarity index 100%
rename from graphics/pokemon/icons/breloom_icon.png
rename to graphics/pokemon/breloom/icon.png
diff --git a/graphics/pokemon/palettes/breloom_palette.pal b/graphics/pokemon/breloom/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/breloom_palette.pal
rename to graphics/pokemon/breloom/normal.pal
diff --git a/graphics/pokemon/palettes/breloom_shiny_palette.pal b/graphics/pokemon/breloom/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/breloom_shiny_palette.pal
rename to graphics/pokemon/breloom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bulbasaur_front_pic.png b/graphics/pokemon/bulbasaur/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/bulbasaur_front_pic.png
rename to graphics/pokemon/bulbasaur/anim_front.png
diff --git a/graphics/pokemon/back_pics/bulbasaur_back_pic.png b/graphics/pokemon/bulbasaur/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/bulbasaur_back_pic.png
rename to graphics/pokemon/bulbasaur/back.png
diff --git a/graphics/pokemon/footprints/bulbasaur_footprint.png b/graphics/pokemon/bulbasaur/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/bulbasaur_footprint.png
rename to graphics/pokemon/bulbasaur/footprint.png
diff --git a/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png b/graphics/pokemon/bulbasaur/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/bulbasaur_still_front_pic.png
rename to graphics/pokemon/bulbasaur/front.png
diff --git a/graphics/pokemon/icons/bulbasaur_icon.png b/graphics/pokemon/bulbasaur/icon.png
similarity index 100%
rename from graphics/pokemon/icons/bulbasaur_icon.png
rename to graphics/pokemon/bulbasaur/icon.png
diff --git a/graphics/pokemon/palettes/bulbasaur_palette.pal b/graphics/pokemon/bulbasaur/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/bulbasaur_palette.pal
rename to graphics/pokemon/bulbasaur/normal.pal
diff --git a/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal b/graphics/pokemon/bulbasaur/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/bulbasaur_shiny_palette.pal
rename to graphics/pokemon/bulbasaur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/butterfree_front_pic.png b/graphics/pokemon/butterfree/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/butterfree_front_pic.png
rename to graphics/pokemon/butterfree/anim_front.png
diff --git a/graphics/pokemon/back_pics/butterfree_back_pic.png b/graphics/pokemon/butterfree/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/butterfree_back_pic.png
rename to graphics/pokemon/butterfree/back.png
diff --git a/graphics/pokemon/footprints/butterfree_footprint.png b/graphics/pokemon/butterfree/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/butterfree_footprint.png
rename to graphics/pokemon/butterfree/footprint.png
diff --git a/graphics/pokemon/front_pics/butterfree_still_front_pic.png b/graphics/pokemon/butterfree/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/butterfree_still_front_pic.png
rename to graphics/pokemon/butterfree/front.png
diff --git a/graphics/pokemon/icons/butterfree_icon.png b/graphics/pokemon/butterfree/icon.png
similarity index 100%
rename from graphics/pokemon/icons/butterfree_icon.png
rename to graphics/pokemon/butterfree/icon.png
diff --git a/graphics/pokemon/palettes/butterfree_palette.pal b/graphics/pokemon/butterfree/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/butterfree_palette.pal
rename to graphics/pokemon/butterfree/normal.pal
diff --git a/graphics/pokemon/palettes/butterfree_shiny_palette.pal b/graphics/pokemon/butterfree/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/butterfree_shiny_palette.pal
rename to graphics/pokemon/butterfree/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cacnea_front_pic.png b/graphics/pokemon/cacnea/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cacnea_front_pic.png
rename to graphics/pokemon/cacnea/anim_front.png
diff --git a/graphics/pokemon/back_pics/cacnea_back_pic.png b/graphics/pokemon/cacnea/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cacnea_back_pic.png
rename to graphics/pokemon/cacnea/back.png
diff --git a/graphics/pokemon/footprints/cacnea_footprint.png b/graphics/pokemon/cacnea/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cacnea_footprint.png
rename to graphics/pokemon/cacnea/footprint.png
diff --git a/graphics/pokemon/front_pics/cacnea_still_front_pic.png b/graphics/pokemon/cacnea/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cacnea_still_front_pic.png
rename to graphics/pokemon/cacnea/front.png
diff --git a/graphics/pokemon/icons/cacnea_icon.png b/graphics/pokemon/cacnea/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cacnea_icon.png
rename to graphics/pokemon/cacnea/icon.png
diff --git a/graphics/pokemon/palettes/cacnea_palette.pal b/graphics/pokemon/cacnea/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cacnea_palette.pal
rename to graphics/pokemon/cacnea/normal.pal
diff --git a/graphics/pokemon/palettes/cacnea_shiny_palette.pal b/graphics/pokemon/cacnea/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cacnea_shiny_palette.pal
rename to graphics/pokemon/cacnea/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cacturne_front_pic.png b/graphics/pokemon/cacturne/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cacturne_front_pic.png
rename to graphics/pokemon/cacturne/anim_front.png
diff --git a/graphics/pokemon/back_pics/cacturne_back_pic.png b/graphics/pokemon/cacturne/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cacturne_back_pic.png
rename to graphics/pokemon/cacturne/back.png
diff --git a/graphics/pokemon/footprints/cacturne_footprint.png b/graphics/pokemon/cacturne/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cacturne_footprint.png
rename to graphics/pokemon/cacturne/footprint.png
diff --git a/graphics/pokemon/front_pics/cacturne_still_front_pic.png b/graphics/pokemon/cacturne/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cacturne_still_front_pic.png
rename to graphics/pokemon/cacturne/front.png
diff --git a/graphics/pokemon/icons/cacturne_icon.png b/graphics/pokemon/cacturne/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cacturne_icon.png
rename to graphics/pokemon/cacturne/icon.png
diff --git a/graphics/pokemon/palettes/cacturne_palette.pal b/graphics/pokemon/cacturne/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cacturne_palette.pal
rename to graphics/pokemon/cacturne/normal.pal
diff --git a/graphics/pokemon/palettes/cacturne_shiny_palette.pal b/graphics/pokemon/cacturne/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cacturne_shiny_palette.pal
rename to graphics/pokemon/cacturne/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/camerupt_front_pic.png b/graphics/pokemon/camerupt/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/camerupt_front_pic.png
rename to graphics/pokemon/camerupt/anim_front.png
diff --git a/graphics/pokemon/back_pics/camerupt_back_pic.png b/graphics/pokemon/camerupt/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/camerupt_back_pic.png
rename to graphics/pokemon/camerupt/back.png
diff --git a/graphics/pokemon/footprints/camerupt_footprint.png b/graphics/pokemon/camerupt/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/camerupt_footprint.png
rename to graphics/pokemon/camerupt/footprint.png
diff --git a/graphics/pokemon/front_pics/camerupt_still_front_pic.png b/graphics/pokemon/camerupt/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/camerupt_still_front_pic.png
rename to graphics/pokemon/camerupt/front.png
diff --git a/graphics/pokemon/icons/camerupt_icon.png b/graphics/pokemon/camerupt/icon.png
similarity index 100%
rename from graphics/pokemon/icons/camerupt_icon.png
rename to graphics/pokemon/camerupt/icon.png
diff --git a/graphics/pokemon/palettes/camerupt_palette.pal b/graphics/pokemon/camerupt/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/camerupt_palette.pal
rename to graphics/pokemon/camerupt/normal.pal
diff --git a/graphics/pokemon/palettes/camerupt_shiny_palette.pal b/graphics/pokemon/camerupt/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/camerupt_shiny_palette.pal
rename to graphics/pokemon/camerupt/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/carvanha_front_pic.png b/graphics/pokemon/carvanha/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/carvanha_front_pic.png
rename to graphics/pokemon/carvanha/anim_front.png
diff --git a/graphics/pokemon/back_pics/carvanha_back_pic.png b/graphics/pokemon/carvanha/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/carvanha_back_pic.png
rename to graphics/pokemon/carvanha/back.png
diff --git a/graphics/pokemon/footprints/carvanha_footprint.png b/graphics/pokemon/carvanha/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/carvanha_footprint.png
rename to graphics/pokemon/carvanha/footprint.png
diff --git a/graphics/pokemon/front_pics/carvanha_still_front_pic.png b/graphics/pokemon/carvanha/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/carvanha_still_front_pic.png
rename to graphics/pokemon/carvanha/front.png
diff --git a/graphics/pokemon/icons/carvanha_icon.png b/graphics/pokemon/carvanha/icon.png
similarity index 100%
rename from graphics/pokemon/icons/carvanha_icon.png
rename to graphics/pokemon/carvanha/icon.png
diff --git a/graphics/pokemon/palettes/carvanha_palette.pal b/graphics/pokemon/carvanha/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/carvanha_palette.pal
rename to graphics/pokemon/carvanha/normal.pal
diff --git a/graphics/pokemon/palettes/carvanha_shiny_palette.pal b/graphics/pokemon/carvanha/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/carvanha_shiny_palette.pal
rename to graphics/pokemon/carvanha/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cascoon_front_pic.png b/graphics/pokemon/cascoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cascoon_front_pic.png
rename to graphics/pokemon/cascoon/anim_front.png
diff --git a/graphics/pokemon/back_pics/cascoon_back_pic.png b/graphics/pokemon/cascoon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cascoon_back_pic.png
rename to graphics/pokemon/cascoon/back.png
diff --git a/graphics/pokemon/footprints/cascoon_footprint.png b/graphics/pokemon/cascoon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cascoon_footprint.png
rename to graphics/pokemon/cascoon/footprint.png
diff --git a/graphics/pokemon/front_pics/cascoon_still_front_pic.png b/graphics/pokemon/cascoon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cascoon_still_front_pic.png
rename to graphics/pokemon/cascoon/front.png
diff --git a/graphics/pokemon/icons/cascoon_icon.png b/graphics/pokemon/cascoon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cascoon_icon.png
rename to graphics/pokemon/cascoon/icon.png
diff --git a/graphics/pokemon/palettes/cascoon_palette.pal b/graphics/pokemon/cascoon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cascoon_palette.pal
rename to graphics/pokemon/cascoon/normal.pal
diff --git a/graphics/pokemon/palettes/cascoon_shiny_palette.pal b/graphics/pokemon/cascoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cascoon_shiny_palette.pal
rename to graphics/pokemon/cascoon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/castform_normal_form_front_pic.png b/graphics/pokemon/castform/anim_front_normal_form.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/castform_normal_form_front_pic.png
rename to graphics/pokemon/castform/anim_front_normal_form.png
diff --git a/graphics/pokemon/anim_front_pics/castform_rainy_form_front_pic.png b/graphics/pokemon/castform/anim_front_rainy_form.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/castform_rainy_form_front_pic.png
rename to graphics/pokemon/castform/anim_front_rainy_form.png
diff --git a/graphics/pokemon/anim_front_pics/castform_snowy_form_front_pic.png b/graphics/pokemon/castform/anim_front_snowy_form.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/castform_snowy_form_front_pic.png
rename to graphics/pokemon/castform/anim_front_snowy_form.png
diff --git a/graphics/pokemon/anim_front_pics/castform_sunny_form_front_pic.png b/graphics/pokemon/castform/anim_front_sunny_form.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/castform_sunny_form_front_pic.png
rename to graphics/pokemon/castform/anim_front_sunny_form.png
diff --git a/graphics/pokemon/back_pics/castform_normal_form_back_pic.png b/graphics/pokemon/castform/back_normal_form.png
similarity index 100%
rename from graphics/pokemon/back_pics/castform_normal_form_back_pic.png
rename to graphics/pokemon/castform/back_normal_form.png
diff --git a/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png b/graphics/pokemon/castform/back_rainy_form.png
similarity index 100%
rename from graphics/pokemon/back_pics/castform_rainy_form_back_pic.png
rename to graphics/pokemon/castform/back_rainy_form.png
diff --git a/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png b/graphics/pokemon/castform/back_snowy_form.png
similarity index 100%
rename from graphics/pokemon/back_pics/castform_snowy_form_back_pic.png
rename to graphics/pokemon/castform/back_snowy_form.png
diff --git a/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png b/graphics/pokemon/castform/back_sunny_form.png
similarity index 100%
rename from graphics/pokemon/back_pics/castform_sunny_form_back_pic.png
rename to graphics/pokemon/castform/back_sunny_form.png
diff --git a/graphics/pokemon/footprints/castform_footprint.png b/graphics/pokemon/castform/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/castform_footprint.png
rename to graphics/pokemon/castform/footprint.png
diff --git a/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png b/graphics/pokemon/castform/front_normal_form.png
similarity index 100%
rename from graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png
rename to graphics/pokemon/castform/front_normal_form.png
diff --git a/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png b/graphics/pokemon/castform/front_rainy_form.png
similarity index 100%
rename from graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png
rename to graphics/pokemon/castform/front_rainy_form.png
diff --git a/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png b/graphics/pokemon/castform/front_snowy_form.png
similarity index 100%
rename from graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png
rename to graphics/pokemon/castform/front_snowy_form.png
diff --git a/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png b/graphics/pokemon/castform/front_sunny_form.png
similarity index 100%
rename from graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png
rename to graphics/pokemon/castform/front_sunny_form.png
diff --git a/graphics/pokemon/icons/castform_icon.png b/graphics/pokemon/castform/icon.png
similarity index 100%
rename from graphics/pokemon/icons/castform_icon.png
rename to graphics/pokemon/castform/icon.png
diff --git a/graphics/pokemon/palettes/castform_normal_form_palette.pal b/graphics/pokemon/castform/normal_normal_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_normal_form_palette.pal
rename to graphics/pokemon/castform/normal_normal_form.pal
diff --git a/graphics/pokemon/palettes/castform_rainy_form_palette.pal b/graphics/pokemon/castform/normal_rainy_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_rainy_form_palette.pal
rename to graphics/pokemon/castform/normal_rainy_form.pal
diff --git a/graphics/pokemon/palettes/castform_snowy_form_palette.pal b/graphics/pokemon/castform/normal_snowy_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_snowy_form_palette.pal
rename to graphics/pokemon/castform/normal_snowy_form.pal
diff --git a/graphics/pokemon/palettes/castform_sunny_form_palette.pal b/graphics/pokemon/castform/normal_sunny_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_sunny_form_palette.pal
rename to graphics/pokemon/castform/normal_sunny_form.pal
diff --git a/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_normal_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal
rename to graphics/pokemon/castform/shiny_normal_form.pal
diff --git a/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_rainy_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal
rename to graphics/pokemon/castform/shiny_rainy_form.pal
diff --git a/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_snowy_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal
rename to graphics/pokemon/castform/shiny_snowy_form.pal
diff --git a/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_sunny_form.pal
similarity index 100%
rename from graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal
rename to graphics/pokemon/castform/shiny_sunny_form.pal
diff --git a/graphics/pokemon/anim_front_pics/caterpie_front_pic.png b/graphics/pokemon/caterpie/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/caterpie_front_pic.png
rename to graphics/pokemon/caterpie/anim_front.png
diff --git a/graphics/pokemon/back_pics/caterpie_back_pic.png b/graphics/pokemon/caterpie/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/caterpie_back_pic.png
rename to graphics/pokemon/caterpie/back.png
diff --git a/graphics/pokemon/footprints/caterpie_footprint.png b/graphics/pokemon/caterpie/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/caterpie_footprint.png
rename to graphics/pokemon/caterpie/footprint.png
diff --git a/graphics/pokemon/front_pics/caterpie_still_front_pic.png b/graphics/pokemon/caterpie/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/caterpie_still_front_pic.png
rename to graphics/pokemon/caterpie/front.png
diff --git a/graphics/pokemon/icons/caterpie_icon.png b/graphics/pokemon/caterpie/icon.png
similarity index 100%
rename from graphics/pokemon/icons/caterpie_icon.png
rename to graphics/pokemon/caterpie/icon.png
diff --git a/graphics/pokemon/palettes/caterpie_palette.pal b/graphics/pokemon/caterpie/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/caterpie_palette.pal
rename to graphics/pokemon/caterpie/normal.pal
diff --git a/graphics/pokemon/palettes/caterpie_shiny_palette.pal b/graphics/pokemon/caterpie/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/caterpie_shiny_palette.pal
rename to graphics/pokemon/caterpie/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/celebi_front_pic.png b/graphics/pokemon/celebi/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/celebi_front_pic.png
rename to graphics/pokemon/celebi/anim_front.png
diff --git a/graphics/pokemon/back_pics/celebi_back_pic.png b/graphics/pokemon/celebi/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/celebi_back_pic.png
rename to graphics/pokemon/celebi/back.png
diff --git a/graphics/pokemon/footprints/celebi_footprint.png b/graphics/pokemon/celebi/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/celebi_footprint.png
rename to graphics/pokemon/celebi/footprint.png
diff --git a/graphics/pokemon/front_pics/celebi_still_front_pic.png b/graphics/pokemon/celebi/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/celebi_still_front_pic.png
rename to graphics/pokemon/celebi/front.png
diff --git a/graphics/pokemon/icons/celebi_icon.png b/graphics/pokemon/celebi/icon.png
similarity index 100%
rename from graphics/pokemon/icons/celebi_icon.png
rename to graphics/pokemon/celebi/icon.png
diff --git a/graphics/pokemon/palettes/celebi_palette.pal b/graphics/pokemon/celebi/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/celebi_palette.pal
rename to graphics/pokemon/celebi/normal.pal
diff --git a/graphics/pokemon/palettes/celebi_shiny_palette.pal b/graphics/pokemon/celebi/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/celebi_shiny_palette.pal
rename to graphics/pokemon/celebi/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chansey_front_pic.png b/graphics/pokemon/chansey/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/chansey_front_pic.png
rename to graphics/pokemon/chansey/anim_front.png
diff --git a/graphics/pokemon/back_pics/chansey_back_pic.png b/graphics/pokemon/chansey/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/chansey_back_pic.png
rename to graphics/pokemon/chansey/back.png
diff --git a/graphics/pokemon/footprints/chansey_footprint.png b/graphics/pokemon/chansey/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/chansey_footprint.png
rename to graphics/pokemon/chansey/footprint.png
diff --git a/graphics/pokemon/front_pics/chansey_still_front_pic.png b/graphics/pokemon/chansey/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/chansey_still_front_pic.png
rename to graphics/pokemon/chansey/front.png
diff --git a/graphics/pokemon/icons/chansey_icon.png b/graphics/pokemon/chansey/icon.png
similarity index 100%
rename from graphics/pokemon/icons/chansey_icon.png
rename to graphics/pokemon/chansey/icon.png
diff --git a/graphics/pokemon/palettes/chansey_palette.pal b/graphics/pokemon/chansey/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/chansey_palette.pal
rename to graphics/pokemon/chansey/normal.pal
diff --git a/graphics/pokemon/palettes/chansey_shiny_palette.pal b/graphics/pokemon/chansey/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/chansey_shiny_palette.pal
rename to graphics/pokemon/chansey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/charizard_front_pic.png b/graphics/pokemon/charizard/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/charizard_front_pic.png
rename to graphics/pokemon/charizard/anim_front.png
diff --git a/graphics/pokemon/back_pics/charizard_back_pic.png b/graphics/pokemon/charizard/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/charizard_back_pic.png
rename to graphics/pokemon/charizard/back.png
diff --git a/graphics/pokemon/footprints/charizard_footprint.png b/graphics/pokemon/charizard/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/charizard_footprint.png
rename to graphics/pokemon/charizard/footprint.png
diff --git a/graphics/pokemon/front_pics/charizard_still_front_pic.png b/graphics/pokemon/charizard/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/charizard_still_front_pic.png
rename to graphics/pokemon/charizard/front.png
diff --git a/graphics/pokemon/icons/charizard_icon.png b/graphics/pokemon/charizard/icon.png
similarity index 100%
rename from graphics/pokemon/icons/charizard_icon.png
rename to graphics/pokemon/charizard/icon.png
diff --git a/graphics/pokemon/palettes/charizard_palette.pal b/graphics/pokemon/charizard/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/charizard_palette.pal
rename to graphics/pokemon/charizard/normal.pal
diff --git a/graphics/pokemon/palettes/charizard_shiny_palette.pal b/graphics/pokemon/charizard/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/charizard_shiny_palette.pal
rename to graphics/pokemon/charizard/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/charmander_front_pic.png b/graphics/pokemon/charmander/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/charmander_front_pic.png
rename to graphics/pokemon/charmander/anim_front.png
diff --git a/graphics/pokemon/back_pics/charmander_back_pic.png b/graphics/pokemon/charmander/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/charmander_back_pic.png
rename to graphics/pokemon/charmander/back.png
diff --git a/graphics/pokemon/footprints/charmander_footprint.png b/graphics/pokemon/charmander/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/charmander_footprint.png
rename to graphics/pokemon/charmander/footprint.png
diff --git a/graphics/pokemon/front_pics/charmander_still_front_pic.png b/graphics/pokemon/charmander/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/charmander_still_front_pic.png
rename to graphics/pokemon/charmander/front.png
diff --git a/graphics/pokemon/icons/charmander_icon.png b/graphics/pokemon/charmander/icon.png
similarity index 100%
rename from graphics/pokemon/icons/charmander_icon.png
rename to graphics/pokemon/charmander/icon.png
diff --git a/graphics/pokemon/palettes/charmander_palette.pal b/graphics/pokemon/charmander/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/charmander_palette.pal
rename to graphics/pokemon/charmander/normal.pal
diff --git a/graphics/pokemon/palettes/charmander_shiny_palette.pal b/graphics/pokemon/charmander/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/charmander_shiny_palette.pal
rename to graphics/pokemon/charmander/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/charmeleon_front_pic.png b/graphics/pokemon/charmeleon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/charmeleon_front_pic.png
rename to graphics/pokemon/charmeleon/anim_front.png
diff --git a/graphics/pokemon/back_pics/charmeleon_back_pic.png b/graphics/pokemon/charmeleon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/charmeleon_back_pic.png
rename to graphics/pokemon/charmeleon/back.png
diff --git a/graphics/pokemon/footprints/charmeleon_footprint.png b/graphics/pokemon/charmeleon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/charmeleon_footprint.png
rename to graphics/pokemon/charmeleon/footprint.png
diff --git a/graphics/pokemon/front_pics/charmeleon_still_front_pic.png b/graphics/pokemon/charmeleon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/charmeleon_still_front_pic.png
rename to graphics/pokemon/charmeleon/front.png
diff --git a/graphics/pokemon/icons/charmeleon_icon.png b/graphics/pokemon/charmeleon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/charmeleon_icon.png
rename to graphics/pokemon/charmeleon/icon.png
diff --git a/graphics/pokemon/palettes/charmeleon_palette.pal b/graphics/pokemon/charmeleon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/charmeleon_palette.pal
rename to graphics/pokemon/charmeleon/normal.pal
diff --git a/graphics/pokemon/palettes/charmeleon_shiny_palette.pal b/graphics/pokemon/charmeleon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/charmeleon_shiny_palette.pal
rename to graphics/pokemon/charmeleon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chikorita_front_pic.png b/graphics/pokemon/chikorita/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/chikorita_front_pic.png
rename to graphics/pokemon/chikorita/anim_front.png
diff --git a/graphics/pokemon/back_pics/chikorita_back_pic.png b/graphics/pokemon/chikorita/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/chikorita_back_pic.png
rename to graphics/pokemon/chikorita/back.png
diff --git a/graphics/pokemon/footprints/chikorita_footprint.png b/graphics/pokemon/chikorita/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/chikorita_footprint.png
rename to graphics/pokemon/chikorita/footprint.png
diff --git a/graphics/pokemon/front_pics/chikorita_still_front_pic.png b/graphics/pokemon/chikorita/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/chikorita_still_front_pic.png
rename to graphics/pokemon/chikorita/front.png
diff --git a/graphics/pokemon/icons/chikorita_icon.png b/graphics/pokemon/chikorita/icon.png
similarity index 100%
rename from graphics/pokemon/icons/chikorita_icon.png
rename to graphics/pokemon/chikorita/icon.png
diff --git a/graphics/pokemon/palettes/chikorita_palette.pal b/graphics/pokemon/chikorita/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/chikorita_palette.pal
rename to graphics/pokemon/chikorita/normal.pal
diff --git a/graphics/pokemon/palettes/chikorita_shiny_palette.pal b/graphics/pokemon/chikorita/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/chikorita_shiny_palette.pal
rename to graphics/pokemon/chikorita/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chimecho_front_pic.png b/graphics/pokemon/chimecho/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/chimecho_front_pic.png
rename to graphics/pokemon/chimecho/anim_front.png
diff --git a/graphics/pokemon/back_pics/chimecho_back_pic.png b/graphics/pokemon/chimecho/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/chimecho_back_pic.png
rename to graphics/pokemon/chimecho/back.png
diff --git a/graphics/pokemon/footprints/chimecho_footprint.png b/graphics/pokemon/chimecho/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/chimecho_footprint.png
rename to graphics/pokemon/chimecho/footprint.png
diff --git a/graphics/pokemon/front_pics/chimecho_still_front_pic.png b/graphics/pokemon/chimecho/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/chimecho_still_front_pic.png
rename to graphics/pokemon/chimecho/front.png
diff --git a/graphics/pokemon/icons/chimecho_icon.png b/graphics/pokemon/chimecho/icon.png
similarity index 100%
rename from graphics/pokemon/icons/chimecho_icon.png
rename to graphics/pokemon/chimecho/icon.png
diff --git a/graphics/pokemon/palettes/chimecho_palette.pal b/graphics/pokemon/chimecho/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/chimecho_palette.pal
rename to graphics/pokemon/chimecho/normal.pal
diff --git a/graphics/pokemon/palettes/chimecho_shiny_palette.pal b/graphics/pokemon/chimecho/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/chimecho_shiny_palette.pal
rename to graphics/pokemon/chimecho/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chinchou_front_pic.png b/graphics/pokemon/chinchou/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/chinchou_front_pic.png
rename to graphics/pokemon/chinchou/anim_front.png
diff --git a/graphics/pokemon/back_pics/chinchou_back_pic.png b/graphics/pokemon/chinchou/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/chinchou_back_pic.png
rename to graphics/pokemon/chinchou/back.png
diff --git a/graphics/pokemon/footprints/chinchou_footprint.png b/graphics/pokemon/chinchou/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/chinchou_footprint.png
rename to graphics/pokemon/chinchou/footprint.png
diff --git a/graphics/pokemon/front_pics/chinchou_still_front_pic.png b/graphics/pokemon/chinchou/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/chinchou_still_front_pic.png
rename to graphics/pokemon/chinchou/front.png
diff --git a/graphics/pokemon/icons/chinchou_icon.png b/graphics/pokemon/chinchou/icon.png
similarity index 100%
rename from graphics/pokemon/icons/chinchou_icon.png
rename to graphics/pokemon/chinchou/icon.png
diff --git a/graphics/pokemon/palettes/chinchou_palette.pal b/graphics/pokemon/chinchou/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/chinchou_palette.pal
rename to graphics/pokemon/chinchou/normal.pal
diff --git a/graphics/pokemon/palettes/chinchou_shiny_palette.pal b/graphics/pokemon/chinchou/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/chinchou_shiny_palette.pal
rename to graphics/pokemon/chinchou/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.png b/graphics/pokemon/circled_question_mark/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.png
rename to graphics/pokemon/circled_question_mark/anim_front.png
diff --git a/graphics/pokemon/back_pics/circled_question_mark_back_pic.png b/graphics/pokemon/circled_question_mark/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/circled_question_mark_back_pic.png
rename to graphics/pokemon/circled_question_mark/back.png
diff --git a/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png b/graphics/pokemon/circled_question_mark/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png
rename to graphics/pokemon/circled_question_mark/front.png
diff --git a/graphics/pokemon/palettes/circled_question_mark_palette.pal b/graphics/pokemon/circled_question_mark/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/circled_question_mark_palette.pal
rename to graphics/pokemon/circled_question_mark/normal.pal
diff --git a/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal b/graphics/pokemon/circled_question_mark/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal
rename to graphics/pokemon/circled_question_mark/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/clamperl_front_pic.png b/graphics/pokemon/clamperl/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/clamperl_front_pic.png
rename to graphics/pokemon/clamperl/anim_front.png
diff --git a/graphics/pokemon/back_pics/clamperl_back_pic.png b/graphics/pokemon/clamperl/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/clamperl_back_pic.png
rename to graphics/pokemon/clamperl/back.png
diff --git a/graphics/pokemon/footprints/clamperl_footprint.png b/graphics/pokemon/clamperl/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/clamperl_footprint.png
rename to graphics/pokemon/clamperl/footprint.png
diff --git a/graphics/pokemon/front_pics/clamperl_still_front_pic.png b/graphics/pokemon/clamperl/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/clamperl_still_front_pic.png
rename to graphics/pokemon/clamperl/front.png
diff --git a/graphics/pokemon/icons/clamperl_icon.png b/graphics/pokemon/clamperl/icon.png
similarity index 100%
rename from graphics/pokemon/icons/clamperl_icon.png
rename to graphics/pokemon/clamperl/icon.png
diff --git a/graphics/pokemon/palettes/clamperl_palette.pal b/graphics/pokemon/clamperl/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/clamperl_palette.pal
rename to graphics/pokemon/clamperl/normal.pal
diff --git a/graphics/pokemon/palettes/clamperl_shiny_palette.pal b/graphics/pokemon/clamperl/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/clamperl_shiny_palette.pal
rename to graphics/pokemon/clamperl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/claydol_front_pic.png b/graphics/pokemon/claydol/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/claydol_front_pic.png
rename to graphics/pokemon/claydol/anim_front.png
diff --git a/graphics/pokemon/back_pics/claydol_back_pic.png b/graphics/pokemon/claydol/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/claydol_back_pic.png
rename to graphics/pokemon/claydol/back.png
diff --git a/graphics/pokemon/footprints/claydol_footprint.png b/graphics/pokemon/claydol/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/claydol_footprint.png
rename to graphics/pokemon/claydol/footprint.png
diff --git a/graphics/pokemon/front_pics/claydol_still_front_pic.png b/graphics/pokemon/claydol/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/claydol_still_front_pic.png
rename to graphics/pokemon/claydol/front.png
diff --git a/graphics/pokemon/icons/claydol_icon.png b/graphics/pokemon/claydol/icon.png
similarity index 100%
rename from graphics/pokemon/icons/claydol_icon.png
rename to graphics/pokemon/claydol/icon.png
diff --git a/graphics/pokemon/palettes/claydol_palette.pal b/graphics/pokemon/claydol/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/claydol_palette.pal
rename to graphics/pokemon/claydol/normal.pal
diff --git a/graphics/pokemon/palettes/claydol_shiny_palette.pal b/graphics/pokemon/claydol/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/claydol_shiny_palette.pal
rename to graphics/pokemon/claydol/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/clefable_front_pic.png b/graphics/pokemon/clefable/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/clefable_front_pic.png
rename to graphics/pokemon/clefable/anim_front.png
diff --git a/graphics/pokemon/back_pics/clefable_back_pic.png b/graphics/pokemon/clefable/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/clefable_back_pic.png
rename to graphics/pokemon/clefable/back.png
diff --git a/graphics/pokemon/footprints/clefable_footprint.png b/graphics/pokemon/clefable/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/clefable_footprint.png
rename to graphics/pokemon/clefable/footprint.png
diff --git a/graphics/pokemon/front_pics/clefable_still_front_pic.png b/graphics/pokemon/clefable/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/clefable_still_front_pic.png
rename to graphics/pokemon/clefable/front.png
diff --git a/graphics/pokemon/icons/clefable_icon.png b/graphics/pokemon/clefable/icon.png
similarity index 100%
rename from graphics/pokemon/icons/clefable_icon.png
rename to graphics/pokemon/clefable/icon.png
diff --git a/graphics/pokemon/palettes/clefable_palette.pal b/graphics/pokemon/clefable/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/clefable_palette.pal
rename to graphics/pokemon/clefable/normal.pal
diff --git a/graphics/pokemon/palettes/clefable_shiny_palette.pal b/graphics/pokemon/clefable/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/clefable_shiny_palette.pal
rename to graphics/pokemon/clefable/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/clefairy_front_pic.png b/graphics/pokemon/clefairy/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/clefairy_front_pic.png
rename to graphics/pokemon/clefairy/anim_front.png
diff --git a/graphics/pokemon/back_pics/clefairy_back_pic.png b/graphics/pokemon/clefairy/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/clefairy_back_pic.png
rename to graphics/pokemon/clefairy/back.png
diff --git a/graphics/pokemon/footprints/clefairy_footprint.png b/graphics/pokemon/clefairy/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/clefairy_footprint.png
rename to graphics/pokemon/clefairy/footprint.png
diff --git a/graphics/pokemon/front_pics/clefairy_still_front_pic.png b/graphics/pokemon/clefairy/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/clefairy_still_front_pic.png
rename to graphics/pokemon/clefairy/front.png
diff --git a/graphics/pokemon/icons/clefairy_icon.png b/graphics/pokemon/clefairy/icon.png
similarity index 100%
rename from graphics/pokemon/icons/clefairy_icon.png
rename to graphics/pokemon/clefairy/icon.png
diff --git a/graphics/pokemon/palettes/clefairy_palette.pal b/graphics/pokemon/clefairy/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/clefairy_palette.pal
rename to graphics/pokemon/clefairy/normal.pal
diff --git a/graphics/pokemon/palettes/clefairy_shiny_palette.pal b/graphics/pokemon/clefairy/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/clefairy_shiny_palette.pal
rename to graphics/pokemon/clefairy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cleffa_front_pic.png b/graphics/pokemon/cleffa/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cleffa_front_pic.png
rename to graphics/pokemon/cleffa/anim_front.png
diff --git a/graphics/pokemon/back_pics/cleffa_back_pic.png b/graphics/pokemon/cleffa/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cleffa_back_pic.png
rename to graphics/pokemon/cleffa/back.png
diff --git a/graphics/pokemon/footprints/cleffa_footprint.png b/graphics/pokemon/cleffa/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cleffa_footprint.png
rename to graphics/pokemon/cleffa/footprint.png
diff --git a/graphics/pokemon/front_pics/cleffa_still_front_pic.png b/graphics/pokemon/cleffa/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cleffa_still_front_pic.png
rename to graphics/pokemon/cleffa/front.png
diff --git a/graphics/pokemon/icons/cleffa_icon.png b/graphics/pokemon/cleffa/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cleffa_icon.png
rename to graphics/pokemon/cleffa/icon.png
diff --git a/graphics/pokemon/palettes/cleffa_palette.pal b/graphics/pokemon/cleffa/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cleffa_palette.pal
rename to graphics/pokemon/cleffa/normal.pal
diff --git a/graphics/pokemon/palettes/cleffa_shiny_palette.pal b/graphics/pokemon/cleffa/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cleffa_shiny_palette.pal
rename to graphics/pokemon/cleffa/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cloyster_front_pic.png b/graphics/pokemon/cloyster/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cloyster_front_pic.png
rename to graphics/pokemon/cloyster/anim_front.png
diff --git a/graphics/pokemon/back_pics/cloyster_back_pic.png b/graphics/pokemon/cloyster/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cloyster_back_pic.png
rename to graphics/pokemon/cloyster/back.png
diff --git a/graphics/pokemon/footprints/cloyster_footprint.png b/graphics/pokemon/cloyster/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cloyster_footprint.png
rename to graphics/pokemon/cloyster/footprint.png
diff --git a/graphics/pokemon/front_pics/cloyster_still_front_pic.png b/graphics/pokemon/cloyster/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cloyster_still_front_pic.png
rename to graphics/pokemon/cloyster/front.png
diff --git a/graphics/pokemon/icons/cloyster_icon.png b/graphics/pokemon/cloyster/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cloyster_icon.png
rename to graphics/pokemon/cloyster/icon.png
diff --git a/graphics/pokemon/palettes/cloyster_palette.pal b/graphics/pokemon/cloyster/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cloyster_palette.pal
rename to graphics/pokemon/cloyster/normal.pal
diff --git a/graphics/pokemon/palettes/cloyster_shiny_palette.pal b/graphics/pokemon/cloyster/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cloyster_shiny_palette.pal
rename to graphics/pokemon/cloyster/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/combusken_front_pic.png b/graphics/pokemon/combusken/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/combusken_front_pic.png
rename to graphics/pokemon/combusken/anim_front.png
diff --git a/graphics/pokemon/back_pics/combusken_back_pic.png b/graphics/pokemon/combusken/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/combusken_back_pic.png
rename to graphics/pokemon/combusken/back.png
diff --git a/graphics/pokemon/footprints/combusken_footprint.png b/graphics/pokemon/combusken/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/combusken_footprint.png
rename to graphics/pokemon/combusken/footprint.png
diff --git a/graphics/pokemon/front_pics/combusken_still_front_pic.png b/graphics/pokemon/combusken/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/combusken_still_front_pic.png
rename to graphics/pokemon/combusken/front.png
diff --git a/graphics/pokemon/icons/combusken_icon.png b/graphics/pokemon/combusken/icon.png
similarity index 100%
rename from graphics/pokemon/icons/combusken_icon.png
rename to graphics/pokemon/combusken/icon.png
diff --git a/graphics/pokemon/palettes/combusken_palette.pal b/graphics/pokemon/combusken/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/combusken_palette.pal
rename to graphics/pokemon/combusken/normal.pal
diff --git a/graphics/pokemon/palettes/combusken_shiny_palette.pal b/graphics/pokemon/combusken/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/combusken_shiny_palette.pal
rename to graphics/pokemon/combusken/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/corphish_front_pic.png b/graphics/pokemon/corphish/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/corphish_front_pic.png
rename to graphics/pokemon/corphish/anim_front.png
diff --git a/graphics/pokemon/back_pics/corphish_back_pic.png b/graphics/pokemon/corphish/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/corphish_back_pic.png
rename to graphics/pokemon/corphish/back.png
diff --git a/graphics/pokemon/footprints/corphish_footprint.png b/graphics/pokemon/corphish/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/corphish_footprint.png
rename to graphics/pokemon/corphish/footprint.png
diff --git a/graphics/pokemon/front_pics/corphish_still_front_pic.png b/graphics/pokemon/corphish/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/corphish_still_front_pic.png
rename to graphics/pokemon/corphish/front.png
diff --git a/graphics/pokemon/icons/corphish_icon.png b/graphics/pokemon/corphish/icon.png
similarity index 100%
rename from graphics/pokemon/icons/corphish_icon.png
rename to graphics/pokemon/corphish/icon.png
diff --git a/graphics/pokemon/palettes/corphish_palette.pal b/graphics/pokemon/corphish/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/corphish_palette.pal
rename to graphics/pokemon/corphish/normal.pal
diff --git a/graphics/pokemon/palettes/corphish_shiny_palette.pal b/graphics/pokemon/corphish/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/corphish_shiny_palette.pal
rename to graphics/pokemon/corphish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/corsola_front_pic.png b/graphics/pokemon/corsola/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/corsola_front_pic.png
rename to graphics/pokemon/corsola/anim_front.png
diff --git a/graphics/pokemon/back_pics/corsola_back_pic.png b/graphics/pokemon/corsola/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/corsola_back_pic.png
rename to graphics/pokemon/corsola/back.png
diff --git a/graphics/pokemon/footprints/corsola_footprint.png b/graphics/pokemon/corsola/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/corsola_footprint.png
rename to graphics/pokemon/corsola/footprint.png
diff --git a/graphics/pokemon/front_pics/corsola_still_front_pic.png b/graphics/pokemon/corsola/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/corsola_still_front_pic.png
rename to graphics/pokemon/corsola/front.png
diff --git a/graphics/pokemon/icons/corsola_icon.png b/graphics/pokemon/corsola/icon.png
similarity index 100%
rename from graphics/pokemon/icons/corsola_icon.png
rename to graphics/pokemon/corsola/icon.png
diff --git a/graphics/pokemon/palettes/corsola_palette.pal b/graphics/pokemon/corsola/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/corsola_palette.pal
rename to graphics/pokemon/corsola/normal.pal
diff --git a/graphics/pokemon/palettes/corsola_shiny_palette.pal b/graphics/pokemon/corsola/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/corsola_shiny_palette.pal
rename to graphics/pokemon/corsola/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cradily_front_pic.png b/graphics/pokemon/cradily/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cradily_front_pic.png
rename to graphics/pokemon/cradily/anim_front.png
diff --git a/graphics/pokemon/back_pics/cradily_back_pic.png b/graphics/pokemon/cradily/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cradily_back_pic.png
rename to graphics/pokemon/cradily/back.png
diff --git a/graphics/pokemon/footprints/cradily_footprint.png b/graphics/pokemon/cradily/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cradily_footprint.png
rename to graphics/pokemon/cradily/footprint.png
diff --git a/graphics/pokemon/front_pics/cradily_still_front_pic.png b/graphics/pokemon/cradily/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cradily_still_front_pic.png
rename to graphics/pokemon/cradily/front.png
diff --git a/graphics/pokemon/icons/cradily_icon.png b/graphics/pokemon/cradily/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cradily_icon.png
rename to graphics/pokemon/cradily/icon.png
diff --git a/graphics/pokemon/palettes/cradily_palette.pal b/graphics/pokemon/cradily/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cradily_palette.pal
rename to graphics/pokemon/cradily/normal.pal
diff --git a/graphics/pokemon/palettes/cradily_shiny_palette.pal b/graphics/pokemon/cradily/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cradily_shiny_palette.pal
rename to graphics/pokemon/cradily/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/crawdaunt_front_pic.png b/graphics/pokemon/crawdaunt/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/crawdaunt_front_pic.png
rename to graphics/pokemon/crawdaunt/anim_front.png
diff --git a/graphics/pokemon/back_pics/crawdaunt_back_pic.png b/graphics/pokemon/crawdaunt/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/crawdaunt_back_pic.png
rename to graphics/pokemon/crawdaunt/back.png
diff --git a/graphics/pokemon/footprints/crawdaunt_footprint.png b/graphics/pokemon/crawdaunt/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/crawdaunt_footprint.png
rename to graphics/pokemon/crawdaunt/footprint.png
diff --git a/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png b/graphics/pokemon/crawdaunt/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/crawdaunt_still_front_pic.png
rename to graphics/pokemon/crawdaunt/front.png
diff --git a/graphics/pokemon/icons/crawdaunt_icon.png b/graphics/pokemon/crawdaunt/icon.png
similarity index 100%
rename from graphics/pokemon/icons/crawdaunt_icon.png
rename to graphics/pokemon/crawdaunt/icon.png
diff --git a/graphics/pokemon/palettes/crawdaunt_palette.pal b/graphics/pokemon/crawdaunt/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/crawdaunt_palette.pal
rename to graphics/pokemon/crawdaunt/normal.pal
diff --git a/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal b/graphics/pokemon/crawdaunt/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/crawdaunt_shiny_palette.pal
rename to graphics/pokemon/crawdaunt/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/crobat_front_pic.png b/graphics/pokemon/crobat/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/crobat_front_pic.png
rename to graphics/pokemon/crobat/anim_front.png
diff --git a/graphics/pokemon/back_pics/crobat_back_pic.png b/graphics/pokemon/crobat/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/crobat_back_pic.png
rename to graphics/pokemon/crobat/back.png
diff --git a/graphics/pokemon/footprints/crobat_footprint.png b/graphics/pokemon/crobat/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/crobat_footprint.png
rename to graphics/pokemon/crobat/footprint.png
diff --git a/graphics/pokemon/front_pics/crobat_still_front_pic.png b/graphics/pokemon/crobat/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/crobat_still_front_pic.png
rename to graphics/pokemon/crobat/front.png
diff --git a/graphics/pokemon/icons/crobat_icon.png b/graphics/pokemon/crobat/icon.png
similarity index 100%
rename from graphics/pokemon/icons/crobat_icon.png
rename to graphics/pokemon/crobat/icon.png
diff --git a/graphics/pokemon/palettes/crobat_palette.pal b/graphics/pokemon/crobat/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/crobat_palette.pal
rename to graphics/pokemon/crobat/normal.pal
diff --git a/graphics/pokemon/palettes/crobat_shiny_palette.pal b/graphics/pokemon/crobat/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/crobat_shiny_palette.pal
rename to graphics/pokemon/crobat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/croconaw_front_pic.png b/graphics/pokemon/croconaw/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/croconaw_front_pic.png
rename to graphics/pokemon/croconaw/anim_front.png
diff --git a/graphics/pokemon/back_pics/croconaw_back_pic.png b/graphics/pokemon/croconaw/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/croconaw_back_pic.png
rename to graphics/pokemon/croconaw/back.png
diff --git a/graphics/pokemon/footprints/croconaw_footprint.png b/graphics/pokemon/croconaw/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/croconaw_footprint.png
rename to graphics/pokemon/croconaw/footprint.png
diff --git a/graphics/pokemon/front_pics/croconaw_still_front_pic.png b/graphics/pokemon/croconaw/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/croconaw_still_front_pic.png
rename to graphics/pokemon/croconaw/front.png
diff --git a/graphics/pokemon/icons/croconaw_icon.png b/graphics/pokemon/croconaw/icon.png
similarity index 100%
rename from graphics/pokemon/icons/croconaw_icon.png
rename to graphics/pokemon/croconaw/icon.png
diff --git a/graphics/pokemon/palettes/croconaw_palette.pal b/graphics/pokemon/croconaw/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/croconaw_palette.pal
rename to graphics/pokemon/croconaw/normal.pal
diff --git a/graphics/pokemon/palettes/croconaw_shiny_palette.pal b/graphics/pokemon/croconaw/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/croconaw_shiny_palette.pal
rename to graphics/pokemon/croconaw/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cubone_front_pic.png b/graphics/pokemon/cubone/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cubone_front_pic.png
rename to graphics/pokemon/cubone/anim_front.png
diff --git a/graphics/pokemon/back_pics/cubone_back_pic.png b/graphics/pokemon/cubone/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cubone_back_pic.png
rename to graphics/pokemon/cubone/back.png
diff --git a/graphics/pokemon/footprints/cubone_footprint.png b/graphics/pokemon/cubone/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cubone_footprint.png
rename to graphics/pokemon/cubone/footprint.png
diff --git a/graphics/pokemon/front_pics/cubone_still_front_pic.png b/graphics/pokemon/cubone/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cubone_still_front_pic.png
rename to graphics/pokemon/cubone/front.png
diff --git a/graphics/pokemon/icons/cubone_icon.png b/graphics/pokemon/cubone/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cubone_icon.png
rename to graphics/pokemon/cubone/icon.png
diff --git a/graphics/pokemon/palettes/cubone_palette.pal b/graphics/pokemon/cubone/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cubone_palette.pal
rename to graphics/pokemon/cubone/normal.pal
diff --git a/graphics/pokemon/palettes/cubone_shiny_palette.pal b/graphics/pokemon/cubone/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cubone_shiny_palette.pal
rename to graphics/pokemon/cubone/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cyndaquil_front_pic.png b/graphics/pokemon/cyndaquil/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/cyndaquil_front_pic.png
rename to graphics/pokemon/cyndaquil/anim_front.png
diff --git a/graphics/pokemon/back_pics/cyndaquil_back_pic.png b/graphics/pokemon/cyndaquil/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/cyndaquil_back_pic.png
rename to graphics/pokemon/cyndaquil/back.png
diff --git a/graphics/pokemon/footprints/cyndaquil_footprint.png b/graphics/pokemon/cyndaquil/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/cyndaquil_footprint.png
rename to graphics/pokemon/cyndaquil/footprint.png
diff --git a/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png b/graphics/pokemon/cyndaquil/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/cyndaquil_still_front_pic.png
rename to graphics/pokemon/cyndaquil/front.png
diff --git a/graphics/pokemon/icons/cyndaquil_icon.png b/graphics/pokemon/cyndaquil/icon.png
similarity index 100%
rename from graphics/pokemon/icons/cyndaquil_icon.png
rename to graphics/pokemon/cyndaquil/icon.png
diff --git a/graphics/pokemon/palettes/cyndaquil_palette.pal b/graphics/pokemon/cyndaquil/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/cyndaquil_palette.pal
rename to graphics/pokemon/cyndaquil/normal.pal
diff --git a/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal b/graphics/pokemon/cyndaquil/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/cyndaquil_shiny_palette.pal
rename to graphics/pokemon/cyndaquil/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/delcatty_front_pic.png b/graphics/pokemon/delcatty/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/delcatty_front_pic.png
rename to graphics/pokemon/delcatty/anim_front.png
diff --git a/graphics/pokemon/back_pics/delcatty_back_pic.png b/graphics/pokemon/delcatty/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/delcatty_back_pic.png
rename to graphics/pokemon/delcatty/back.png
diff --git a/graphics/pokemon/footprints/delcatty_footprint.png b/graphics/pokemon/delcatty/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/delcatty_footprint.png
rename to graphics/pokemon/delcatty/footprint.png
diff --git a/graphics/pokemon/front_pics/delcatty_still_front_pic.png b/graphics/pokemon/delcatty/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/delcatty_still_front_pic.png
rename to graphics/pokemon/delcatty/front.png
diff --git a/graphics/pokemon/icons/delcatty_icon.png b/graphics/pokemon/delcatty/icon.png
similarity index 100%
rename from graphics/pokemon/icons/delcatty_icon.png
rename to graphics/pokemon/delcatty/icon.png
diff --git a/graphics/pokemon/palettes/delcatty_palette.pal b/graphics/pokemon/delcatty/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/delcatty_palette.pal
rename to graphics/pokemon/delcatty/normal.pal
diff --git a/graphics/pokemon/palettes/delcatty_shiny_palette.pal b/graphics/pokemon/delcatty/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/delcatty_shiny_palette.pal
rename to graphics/pokemon/delcatty/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/delibird_front_pic.png b/graphics/pokemon/delibird/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/delibird_front_pic.png
rename to graphics/pokemon/delibird/anim_front.png
diff --git a/graphics/pokemon/back_pics/delibird_back_pic.png b/graphics/pokemon/delibird/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/delibird_back_pic.png
rename to graphics/pokemon/delibird/back.png
diff --git a/graphics/pokemon/footprints/delibird_footprint.png b/graphics/pokemon/delibird/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/delibird_footprint.png
rename to graphics/pokemon/delibird/footprint.png
diff --git a/graphics/pokemon/front_pics/delibird_still_front_pic.png b/graphics/pokemon/delibird/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/delibird_still_front_pic.png
rename to graphics/pokemon/delibird/front.png
diff --git a/graphics/pokemon/icons/delibird_icon.png b/graphics/pokemon/delibird/icon.png
similarity index 100%
rename from graphics/pokemon/icons/delibird_icon.png
rename to graphics/pokemon/delibird/icon.png
diff --git a/graphics/pokemon/palettes/delibird_palette.pal b/graphics/pokemon/delibird/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/delibird_palette.pal
rename to graphics/pokemon/delibird/normal.pal
diff --git a/graphics/pokemon/palettes/delibird_shiny_palette.pal b/graphics/pokemon/delibird/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/delibird_shiny_palette.pal
rename to graphics/pokemon/delibird/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/deoxys_front_pic.png b/graphics/pokemon/deoxys/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/deoxys_front_pic.png
rename to graphics/pokemon/deoxys/anim_front.png
diff --git a/graphics/pokemon/back_pics/deoxys_back_pic.png b/graphics/pokemon/deoxys/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/deoxys_back_pic.png
rename to graphics/pokemon/deoxys/back.png
diff --git a/graphics/pokemon/footprints/deoxys_footprint.png b/graphics/pokemon/deoxys/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/deoxys_footprint.png
rename to graphics/pokemon/deoxys/footprint.png
diff --git a/graphics/pokemon/front_pics/deoxys_still_front_pic.png b/graphics/pokemon/deoxys/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/deoxys_still_front_pic.png
rename to graphics/pokemon/deoxys/front.png
diff --git a/graphics/pokemon/icons/deoxys_icon.png b/graphics/pokemon/deoxys/icon.png
similarity index 100%
rename from graphics/pokemon/icons/deoxys_icon.png
rename to graphics/pokemon/deoxys/icon.png
diff --git a/graphics/pokemon/icons/deoxys_speed_icon.png b/graphics/pokemon/deoxys/icon_speed.png
similarity index 100%
rename from graphics/pokemon/icons/deoxys_speed_icon.png
rename to graphics/pokemon/deoxys/icon_speed.png
diff --git a/graphics/pokemon/palettes/deoxys_palette.pal b/graphics/pokemon/deoxys/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/deoxys_palette.pal
rename to graphics/pokemon/deoxys/normal.pal
diff --git a/graphics/pokemon/palettes/deoxys_shiny_palette.pal b/graphics/pokemon/deoxys/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/deoxys_shiny_palette.pal
rename to graphics/pokemon/deoxys/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dewgong_front_pic.png b/graphics/pokemon/dewgong/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dewgong_front_pic.png
rename to graphics/pokemon/dewgong/anim_front.png
diff --git a/graphics/pokemon/back_pics/dewgong_back_pic.png b/graphics/pokemon/dewgong/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dewgong_back_pic.png
rename to graphics/pokemon/dewgong/back.png
diff --git a/graphics/pokemon/footprints/dewgong_footprint.png b/graphics/pokemon/dewgong/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dewgong_footprint.png
rename to graphics/pokemon/dewgong/footprint.png
diff --git a/graphics/pokemon/front_pics/dewgong_still_front_pic.png b/graphics/pokemon/dewgong/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dewgong_still_front_pic.png
rename to graphics/pokemon/dewgong/front.png
diff --git a/graphics/pokemon/icons/dewgong_icon.png b/graphics/pokemon/dewgong/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dewgong_icon.png
rename to graphics/pokemon/dewgong/icon.png
diff --git a/graphics/pokemon/palettes/dewgong_palette.pal b/graphics/pokemon/dewgong/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dewgong_palette.pal
rename to graphics/pokemon/dewgong/normal.pal
diff --git a/graphics/pokemon/palettes/dewgong_shiny_palette.pal b/graphics/pokemon/dewgong/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dewgong_shiny_palette.pal
rename to graphics/pokemon/dewgong/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/diglett_front_pic.png b/graphics/pokemon/diglett/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/diglett_front_pic.png
rename to graphics/pokemon/diglett/anim_front.png
diff --git a/graphics/pokemon/back_pics/diglett_back_pic.png b/graphics/pokemon/diglett/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/diglett_back_pic.png
rename to graphics/pokemon/diglett/back.png
diff --git a/graphics/pokemon/footprints/diglett_footprint.png b/graphics/pokemon/diglett/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/diglett_footprint.png
rename to graphics/pokemon/diglett/footprint.png
diff --git a/graphics/pokemon/front_pics/diglett_still_front_pic.png b/graphics/pokemon/diglett/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/diglett_still_front_pic.png
rename to graphics/pokemon/diglett/front.png
diff --git a/graphics/pokemon/icons/diglett_icon.png b/graphics/pokemon/diglett/icon.png
similarity index 100%
rename from graphics/pokemon/icons/diglett_icon.png
rename to graphics/pokemon/diglett/icon.png
diff --git a/graphics/pokemon/palettes/diglett_palette.pal b/graphics/pokemon/diglett/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/diglett_palette.pal
rename to graphics/pokemon/diglett/normal.pal
diff --git a/graphics/pokemon/palettes/diglett_shiny_palette.pal b/graphics/pokemon/diglett/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/diglett_shiny_palette.pal
rename to graphics/pokemon/diglett/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ditto_front_pic.png b/graphics/pokemon/ditto/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ditto_front_pic.png
rename to graphics/pokemon/ditto/anim_front.png
diff --git a/graphics/pokemon/back_pics/ditto_back_pic.png b/graphics/pokemon/ditto/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ditto_back_pic.png
rename to graphics/pokemon/ditto/back.png
diff --git a/graphics/pokemon/footprints/ditto_footprint.png b/graphics/pokemon/ditto/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ditto_footprint.png
rename to graphics/pokemon/ditto/footprint.png
diff --git a/graphics/pokemon/front_pics/ditto_still_front_pic.png b/graphics/pokemon/ditto/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ditto_still_front_pic.png
rename to graphics/pokemon/ditto/front.png
diff --git a/graphics/pokemon/icons/ditto_icon.png b/graphics/pokemon/ditto/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ditto_icon.png
rename to graphics/pokemon/ditto/icon.png
diff --git a/graphics/pokemon/palettes/ditto_palette.pal b/graphics/pokemon/ditto/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ditto_palette.pal
rename to graphics/pokemon/ditto/normal.pal
diff --git a/graphics/pokemon/palettes/ditto_shiny_palette.pal b/graphics/pokemon/ditto/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ditto_shiny_palette.pal
rename to graphics/pokemon/ditto/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dodrio_front_pic.png b/graphics/pokemon/dodrio/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dodrio_front_pic.png
rename to graphics/pokemon/dodrio/anim_front.png
diff --git a/graphics/pokemon/back_pics/dodrio_back_pic.png b/graphics/pokemon/dodrio/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dodrio_back_pic.png
rename to graphics/pokemon/dodrio/back.png
diff --git a/graphics/pokemon/footprints/dodrio_footprint.png b/graphics/pokemon/dodrio/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dodrio_footprint.png
rename to graphics/pokemon/dodrio/footprint.png
diff --git a/graphics/pokemon/front_pics/dodrio_still_front_pic.png b/graphics/pokemon/dodrio/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dodrio_still_front_pic.png
rename to graphics/pokemon/dodrio/front.png
diff --git a/graphics/pokemon/icons/dodrio_icon.png b/graphics/pokemon/dodrio/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dodrio_icon.png
rename to graphics/pokemon/dodrio/icon.png
diff --git a/graphics/pokemon/palettes/dodrio_palette.pal b/graphics/pokemon/dodrio/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dodrio_palette.pal
rename to graphics/pokemon/dodrio/normal.pal
diff --git a/graphics/pokemon/palettes/dodrio_shiny_palette.pal b/graphics/pokemon/dodrio/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dodrio_shiny_palette.pal
rename to graphics/pokemon/dodrio/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/doduo_front_pic.png b/graphics/pokemon/doduo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/doduo_front_pic.png
rename to graphics/pokemon/doduo/anim_front.png
diff --git a/graphics/pokemon/back_pics/doduo_back_pic.png b/graphics/pokemon/doduo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/doduo_back_pic.png
rename to graphics/pokemon/doduo/back.png
diff --git a/graphics/pokemon/footprints/doduo_footprint.png b/graphics/pokemon/doduo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/doduo_footprint.png
rename to graphics/pokemon/doduo/footprint.png
diff --git a/graphics/pokemon/front_pics/doduo_still_front_pic.png b/graphics/pokemon/doduo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/doduo_still_front_pic.png
rename to graphics/pokemon/doduo/front.png
diff --git a/graphics/pokemon/icons/doduo_icon.png b/graphics/pokemon/doduo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/doduo_icon.png
rename to graphics/pokemon/doduo/icon.png
diff --git a/graphics/pokemon/palettes/doduo_palette.pal b/graphics/pokemon/doduo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/doduo_palette.pal
rename to graphics/pokemon/doduo/normal.pal
diff --git a/graphics/pokemon/palettes/doduo_shiny_palette.pal b/graphics/pokemon/doduo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/doduo_shiny_palette.pal
rename to graphics/pokemon/doduo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/donphan_front_pic.png b/graphics/pokemon/donphan/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/donphan_front_pic.png
rename to graphics/pokemon/donphan/anim_front.png
diff --git a/graphics/pokemon/back_pics/donphan_back_pic.png b/graphics/pokemon/donphan/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/donphan_back_pic.png
rename to graphics/pokemon/donphan/back.png
diff --git a/graphics/pokemon/footprints/donphan_footprint.png b/graphics/pokemon/donphan/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/donphan_footprint.png
rename to graphics/pokemon/donphan/footprint.png
diff --git a/graphics/pokemon/front_pics/donphan_still_front_pic.png b/graphics/pokemon/donphan/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/donphan_still_front_pic.png
rename to graphics/pokemon/donphan/front.png
diff --git a/graphics/pokemon/icons/donphan_icon.png b/graphics/pokemon/donphan/icon.png
similarity index 100%
rename from graphics/pokemon/icons/donphan_icon.png
rename to graphics/pokemon/donphan/icon.png
diff --git a/graphics/pokemon/palettes/donphan_palette.pal b/graphics/pokemon/donphan/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/donphan_palette.pal
rename to graphics/pokemon/donphan/normal.pal
diff --git a/graphics/pokemon/palettes/donphan_shiny_palette.pal b/graphics/pokemon/donphan/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/donphan_shiny_palette.pal
rename to graphics/pokemon/donphan/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/double_question_mark_front_pic.png b/graphics/pokemon/double_question_mark/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/double_question_mark_front_pic.png
rename to graphics/pokemon/double_question_mark/anim_front.png
diff --git a/graphics/pokemon/back_pics/double_question_mark_back_pic.png b/graphics/pokemon/double_question_mark/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/double_question_mark_back_pic.png
rename to graphics/pokemon/double_question_mark/back.png
diff --git a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png b/graphics/pokemon/double_question_mark/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/double_question_mark_still_front_pic.png
rename to graphics/pokemon/double_question_mark/front.png
diff --git a/graphics/pokemon/palettes/double_question_mark_palette.pal b/graphics/pokemon/double_question_mark/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/double_question_mark_palette.pal
rename to graphics/pokemon/double_question_mark/normal.pal
diff --git a/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal b/graphics/pokemon/double_question_mark/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/double_question_mark_shiny_palette.pal
rename to graphics/pokemon/double_question_mark/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dragonair_front_pic.png b/graphics/pokemon/dragonair/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dragonair_front_pic.png
rename to graphics/pokemon/dragonair/anim_front.png
diff --git a/graphics/pokemon/back_pics/dragonair_back_pic.png b/graphics/pokemon/dragonair/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dragonair_back_pic.png
rename to graphics/pokemon/dragonair/back.png
diff --git a/graphics/pokemon/footprints/dragonair_footprint.png b/graphics/pokemon/dragonair/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dragonair_footprint.png
rename to graphics/pokemon/dragonair/footprint.png
diff --git a/graphics/pokemon/front_pics/dragonair_still_front_pic.png b/graphics/pokemon/dragonair/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dragonair_still_front_pic.png
rename to graphics/pokemon/dragonair/front.png
diff --git a/graphics/pokemon/icons/dragonair_icon.png b/graphics/pokemon/dragonair/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dragonair_icon.png
rename to graphics/pokemon/dragonair/icon.png
diff --git a/graphics/pokemon/palettes/dragonair_palette.pal b/graphics/pokemon/dragonair/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dragonair_palette.pal
rename to graphics/pokemon/dragonair/normal.pal
diff --git a/graphics/pokemon/palettes/dragonair_shiny_palette.pal b/graphics/pokemon/dragonair/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dragonair_shiny_palette.pal
rename to graphics/pokemon/dragonair/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dragonite_front_pic.png b/graphics/pokemon/dragonite/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dragonite_front_pic.png
rename to graphics/pokemon/dragonite/anim_front.png
diff --git a/graphics/pokemon/back_pics/dragonite_back_pic.png b/graphics/pokemon/dragonite/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dragonite_back_pic.png
rename to graphics/pokemon/dragonite/back.png
diff --git a/graphics/pokemon/footprints/dragonite_footprint.png b/graphics/pokemon/dragonite/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dragonite_footprint.png
rename to graphics/pokemon/dragonite/footprint.png
diff --git a/graphics/pokemon/front_pics/dragonite_still_front_pic.png b/graphics/pokemon/dragonite/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dragonite_still_front_pic.png
rename to graphics/pokemon/dragonite/front.png
diff --git a/graphics/pokemon/icons/dragonite_icon.png b/graphics/pokemon/dragonite/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dragonite_icon.png
rename to graphics/pokemon/dragonite/icon.png
diff --git a/graphics/pokemon/palettes/dragonite_palette.pal b/graphics/pokemon/dragonite/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dragonite_palette.pal
rename to graphics/pokemon/dragonite/normal.pal
diff --git a/graphics/pokemon/palettes/dragonite_shiny_palette.pal b/graphics/pokemon/dragonite/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dragonite_shiny_palette.pal
rename to graphics/pokemon/dragonite/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dratini_front_pic.png b/graphics/pokemon/dratini/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dratini_front_pic.png
rename to graphics/pokemon/dratini/anim_front.png
diff --git a/graphics/pokemon/back_pics/dratini_back_pic.png b/graphics/pokemon/dratini/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dratini_back_pic.png
rename to graphics/pokemon/dratini/back.png
diff --git a/graphics/pokemon/footprints/dratini_footprint.png b/graphics/pokemon/dratini/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dratini_footprint.png
rename to graphics/pokemon/dratini/footprint.png
diff --git a/graphics/pokemon/front_pics/dratini_still_front_pic.png b/graphics/pokemon/dratini/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dratini_still_front_pic.png
rename to graphics/pokemon/dratini/front.png
diff --git a/graphics/pokemon/icons/dratini_icon.png b/graphics/pokemon/dratini/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dratini_icon.png
rename to graphics/pokemon/dratini/icon.png
diff --git a/graphics/pokemon/palettes/dratini_palette.pal b/graphics/pokemon/dratini/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dratini_palette.pal
rename to graphics/pokemon/dratini/normal.pal
diff --git a/graphics/pokemon/palettes/dratini_shiny_palette.pal b/graphics/pokemon/dratini/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dratini_shiny_palette.pal
rename to graphics/pokemon/dratini/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/drowzee_front_pic.png b/graphics/pokemon/drowzee/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/drowzee_front_pic.png
rename to graphics/pokemon/drowzee/anim_front.png
diff --git a/graphics/pokemon/back_pics/drowzee_back_pic.png b/graphics/pokemon/drowzee/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/drowzee_back_pic.png
rename to graphics/pokemon/drowzee/back.png
diff --git a/graphics/pokemon/footprints/drowzee_footprint.png b/graphics/pokemon/drowzee/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/drowzee_footprint.png
rename to graphics/pokemon/drowzee/footprint.png
diff --git a/graphics/pokemon/front_pics/drowzee_still_front_pic.png b/graphics/pokemon/drowzee/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/drowzee_still_front_pic.png
rename to graphics/pokemon/drowzee/front.png
diff --git a/graphics/pokemon/icons/drowzee_icon.png b/graphics/pokemon/drowzee/icon.png
similarity index 100%
rename from graphics/pokemon/icons/drowzee_icon.png
rename to graphics/pokemon/drowzee/icon.png
diff --git a/graphics/pokemon/palettes/drowzee_palette.pal b/graphics/pokemon/drowzee/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/drowzee_palette.pal
rename to graphics/pokemon/drowzee/normal.pal
diff --git a/graphics/pokemon/palettes/drowzee_shiny_palette.pal b/graphics/pokemon/drowzee/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/drowzee_shiny_palette.pal
rename to graphics/pokemon/drowzee/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dugtrio_front_pic.png b/graphics/pokemon/dugtrio/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dugtrio_front_pic.png
rename to graphics/pokemon/dugtrio/anim_front.png
diff --git a/graphics/pokemon/back_pics/dugtrio_back_pic.png b/graphics/pokemon/dugtrio/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dugtrio_back_pic.png
rename to graphics/pokemon/dugtrio/back.png
diff --git a/graphics/pokemon/footprints/dugtrio_footprint.png b/graphics/pokemon/dugtrio/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dugtrio_footprint.png
rename to graphics/pokemon/dugtrio/footprint.png
diff --git a/graphics/pokemon/front_pics/dugtrio_still_front_pic.png b/graphics/pokemon/dugtrio/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dugtrio_still_front_pic.png
rename to graphics/pokemon/dugtrio/front.png
diff --git a/graphics/pokemon/icons/dugtrio_icon.png b/graphics/pokemon/dugtrio/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dugtrio_icon.png
rename to graphics/pokemon/dugtrio/icon.png
diff --git a/graphics/pokemon/palettes/dugtrio_palette.pal b/graphics/pokemon/dugtrio/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dugtrio_palette.pal
rename to graphics/pokemon/dugtrio/normal.pal
diff --git a/graphics/pokemon/palettes/dugtrio_shiny_palette.pal b/graphics/pokemon/dugtrio/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dugtrio_shiny_palette.pal
rename to graphics/pokemon/dugtrio/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dunsparce_front_pic.png b/graphics/pokemon/dunsparce/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dunsparce_front_pic.png
rename to graphics/pokemon/dunsparce/anim_front.png
diff --git a/graphics/pokemon/back_pics/dunsparce_back_pic.png b/graphics/pokemon/dunsparce/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dunsparce_back_pic.png
rename to graphics/pokemon/dunsparce/back.png
diff --git a/graphics/pokemon/footprints/dunsparce_footprint.png b/graphics/pokemon/dunsparce/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dunsparce_footprint.png
rename to graphics/pokemon/dunsparce/footprint.png
diff --git a/graphics/pokemon/front_pics/dunsparce_still_front_pic.png b/graphics/pokemon/dunsparce/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dunsparce_still_front_pic.png
rename to graphics/pokemon/dunsparce/front.png
diff --git a/graphics/pokemon/icons/dunsparce_icon.png b/graphics/pokemon/dunsparce/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dunsparce_icon.png
rename to graphics/pokemon/dunsparce/icon.png
diff --git a/graphics/pokemon/palettes/dunsparce_palette.pal b/graphics/pokemon/dunsparce/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dunsparce_palette.pal
rename to graphics/pokemon/dunsparce/normal.pal
diff --git a/graphics/pokemon/palettes/dunsparce_shiny_palette.pal b/graphics/pokemon/dunsparce/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dunsparce_shiny_palette.pal
rename to graphics/pokemon/dunsparce/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dusclops_front_pic.png b/graphics/pokemon/dusclops/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dusclops_front_pic.png
rename to graphics/pokemon/dusclops/anim_front.png
diff --git a/graphics/pokemon/back_pics/dusclops_back_pic.png b/graphics/pokemon/dusclops/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dusclops_back_pic.png
rename to graphics/pokemon/dusclops/back.png
diff --git a/graphics/pokemon/footprints/dusclops_footprint.png b/graphics/pokemon/dusclops/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dusclops_footprint.png
rename to graphics/pokemon/dusclops/footprint.png
diff --git a/graphics/pokemon/front_pics/dusclops_still_front_pic.png b/graphics/pokemon/dusclops/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dusclops_still_front_pic.png
rename to graphics/pokemon/dusclops/front.png
diff --git a/graphics/pokemon/icons/dusclops_icon.png b/graphics/pokemon/dusclops/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dusclops_icon.png
rename to graphics/pokemon/dusclops/icon.png
diff --git a/graphics/pokemon/palettes/dusclops_palette.pal b/graphics/pokemon/dusclops/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dusclops_palette.pal
rename to graphics/pokemon/dusclops/normal.pal
diff --git a/graphics/pokemon/palettes/dusclops_shiny_palette.pal b/graphics/pokemon/dusclops/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dusclops_shiny_palette.pal
rename to graphics/pokemon/dusclops/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/duskull_front_pic.png b/graphics/pokemon/duskull/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/duskull_front_pic.png
rename to graphics/pokemon/duskull/anim_front.png
diff --git a/graphics/pokemon/back_pics/duskull_back_pic.png b/graphics/pokemon/duskull/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/duskull_back_pic.png
rename to graphics/pokemon/duskull/back.png
diff --git a/graphics/pokemon/footprints/duskull_footprint.png b/graphics/pokemon/duskull/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/duskull_footprint.png
rename to graphics/pokemon/duskull/footprint.png
diff --git a/graphics/pokemon/front_pics/duskull_still_front_pic.png b/graphics/pokemon/duskull/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/duskull_still_front_pic.png
rename to graphics/pokemon/duskull/front.png
diff --git a/graphics/pokemon/icons/duskull_icon.png b/graphics/pokemon/duskull/icon.png
similarity index 100%
rename from graphics/pokemon/icons/duskull_icon.png
rename to graphics/pokemon/duskull/icon.png
diff --git a/graphics/pokemon/palettes/duskull_palette.pal b/graphics/pokemon/duskull/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/duskull_palette.pal
rename to graphics/pokemon/duskull/normal.pal
diff --git a/graphics/pokemon/palettes/duskull_shiny_palette.pal b/graphics/pokemon/duskull/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/duskull_shiny_palette.pal
rename to graphics/pokemon/duskull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dustox_front_pic.png b/graphics/pokemon/dustox/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/dustox_front_pic.png
rename to graphics/pokemon/dustox/anim_front.png
diff --git a/graphics/pokemon/back_pics/dustox_back_pic.png b/graphics/pokemon/dustox/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/dustox_back_pic.png
rename to graphics/pokemon/dustox/back.png
diff --git a/graphics/pokemon/footprints/dustox_footprint.png b/graphics/pokemon/dustox/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/dustox_footprint.png
rename to graphics/pokemon/dustox/footprint.png
diff --git a/graphics/pokemon/front_pics/dustox_still_front_pic.png b/graphics/pokemon/dustox/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/dustox_still_front_pic.png
rename to graphics/pokemon/dustox/front.png
diff --git a/graphics/pokemon/icons/dustox_icon.png b/graphics/pokemon/dustox/icon.png
similarity index 100%
rename from graphics/pokemon/icons/dustox_icon.png
rename to graphics/pokemon/dustox/icon.png
diff --git a/graphics/pokemon/palettes/dustox_palette.pal b/graphics/pokemon/dustox/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/dustox_palette.pal
rename to graphics/pokemon/dustox/normal.pal
diff --git a/graphics/pokemon/palettes/dustox_shiny_palette.pal b/graphics/pokemon/dustox/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/dustox_shiny_palette.pal
rename to graphics/pokemon/dustox/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/eevee_front_pic.png b/graphics/pokemon/eevee/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/eevee_front_pic.png
rename to graphics/pokemon/eevee/anim_front.png
diff --git a/graphics/pokemon/back_pics/eevee_back_pic.png b/graphics/pokemon/eevee/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/eevee_back_pic.png
rename to graphics/pokemon/eevee/back.png
diff --git a/graphics/pokemon/footprints/eevee_footprint.png b/graphics/pokemon/eevee/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/eevee_footprint.png
rename to graphics/pokemon/eevee/footprint.png
diff --git a/graphics/pokemon/front_pics/eevee_still_front_pic.png b/graphics/pokemon/eevee/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/eevee_still_front_pic.png
rename to graphics/pokemon/eevee/front.png
diff --git a/graphics/pokemon/icons/eevee_icon.png b/graphics/pokemon/eevee/icon.png
similarity index 100%
rename from graphics/pokemon/icons/eevee_icon.png
rename to graphics/pokemon/eevee/icon.png
diff --git a/graphics/pokemon/palettes/eevee_palette.pal b/graphics/pokemon/eevee/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/eevee_palette.pal
rename to graphics/pokemon/eevee/normal.pal
diff --git a/graphics/pokemon/palettes/eevee_shiny_palette.pal b/graphics/pokemon/eevee/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/eevee_shiny_palette.pal
rename to graphics/pokemon/eevee/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/egg_front_pic.png b/graphics/pokemon/egg/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/egg_front_pic.png
rename to graphics/pokemon/egg/anim_front.png
diff --git a/graphics/pokemon/front_pics/egg_still_front_pic.png b/graphics/pokemon/egg/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/egg_still_front_pic.png
rename to graphics/pokemon/egg/front.png
diff --git a/graphics/pokemon/icons/egg_icon.png b/graphics/pokemon/egg/icon.png
similarity index 100%
rename from graphics/pokemon/icons/egg_icon.png
rename to graphics/pokemon/egg/icon.png
diff --git a/graphics/pokemon/palettes/egg_palette.pal b/graphics/pokemon/egg/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/egg_palette.pal
rename to graphics/pokemon/egg/normal.pal
diff --git a/graphics/pokemon/anim_front_pics/ekans_front_pic.png b/graphics/pokemon/ekans/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ekans_front_pic.png
rename to graphics/pokemon/ekans/anim_front.png
diff --git a/graphics/pokemon/back_pics/ekans_back_pic.png b/graphics/pokemon/ekans/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ekans_back_pic.png
rename to graphics/pokemon/ekans/back.png
diff --git a/graphics/pokemon/footprints/ekans_footprint.png b/graphics/pokemon/ekans/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ekans_footprint.png
rename to graphics/pokemon/ekans/footprint.png
diff --git a/graphics/pokemon/front_pics/ekans_still_front_pic.png b/graphics/pokemon/ekans/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ekans_still_front_pic.png
rename to graphics/pokemon/ekans/front.png
diff --git a/graphics/pokemon/icons/ekans_icon.png b/graphics/pokemon/ekans/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ekans_icon.png
rename to graphics/pokemon/ekans/icon.png
diff --git a/graphics/pokemon/palettes/ekans_palette.pal b/graphics/pokemon/ekans/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ekans_palette.pal
rename to graphics/pokemon/ekans/normal.pal
diff --git a/graphics/pokemon/palettes/ekans_shiny_palette.pal b/graphics/pokemon/ekans/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ekans_shiny_palette.pal
rename to graphics/pokemon/ekans/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/electabuzz_front_pic.png b/graphics/pokemon/electabuzz/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/electabuzz_front_pic.png
rename to graphics/pokemon/electabuzz/anim_front.png
diff --git a/graphics/pokemon/back_pics/electabuzz_back_pic.png b/graphics/pokemon/electabuzz/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/electabuzz_back_pic.png
rename to graphics/pokemon/electabuzz/back.png
diff --git a/graphics/pokemon/footprints/electabuzz_footprint.png b/graphics/pokemon/electabuzz/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/electabuzz_footprint.png
rename to graphics/pokemon/electabuzz/footprint.png
diff --git a/graphics/pokemon/front_pics/electabuzz_still_front_pic.png b/graphics/pokemon/electabuzz/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/electabuzz_still_front_pic.png
rename to graphics/pokemon/electabuzz/front.png
diff --git a/graphics/pokemon/icons/electabuzz_icon.png b/graphics/pokemon/electabuzz/icon.png
similarity index 100%
rename from graphics/pokemon/icons/electabuzz_icon.png
rename to graphics/pokemon/electabuzz/icon.png
diff --git a/graphics/pokemon/palettes/electabuzz_palette.pal b/graphics/pokemon/electabuzz/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/electabuzz_palette.pal
rename to graphics/pokemon/electabuzz/normal.pal
diff --git a/graphics/pokemon/palettes/electabuzz_shiny_palette.pal b/graphics/pokemon/electabuzz/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/electabuzz_shiny_palette.pal
rename to graphics/pokemon/electabuzz/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/electrike_front_pic.png b/graphics/pokemon/electrike/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/electrike_front_pic.png
rename to graphics/pokemon/electrike/anim_front.png
diff --git a/graphics/pokemon/back_pics/electrike_back_pic.png b/graphics/pokemon/electrike/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/electrike_back_pic.png
rename to graphics/pokemon/electrike/back.png
diff --git a/graphics/pokemon/footprints/electrike_footprint.png b/graphics/pokemon/electrike/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/electrike_footprint.png
rename to graphics/pokemon/electrike/footprint.png
diff --git a/graphics/pokemon/front_pics/electrike_still_front_pic.png b/graphics/pokemon/electrike/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/electrike_still_front_pic.png
rename to graphics/pokemon/electrike/front.png
diff --git a/graphics/pokemon/icons/electrike_icon.png b/graphics/pokemon/electrike/icon.png
similarity index 100%
rename from graphics/pokemon/icons/electrike_icon.png
rename to graphics/pokemon/electrike/icon.png
diff --git a/graphics/pokemon/palettes/electrike_palette.pal b/graphics/pokemon/electrike/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/electrike_palette.pal
rename to graphics/pokemon/electrike/normal.pal
diff --git a/graphics/pokemon/palettes/electrike_shiny_palette.pal b/graphics/pokemon/electrike/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/electrike_shiny_palette.pal
rename to graphics/pokemon/electrike/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/electrode_front_pic.png b/graphics/pokemon/electrode/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/electrode_front_pic.png
rename to graphics/pokemon/electrode/anim_front.png
diff --git a/graphics/pokemon/back_pics/electrode_back_pic.png b/graphics/pokemon/electrode/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/electrode_back_pic.png
rename to graphics/pokemon/electrode/back.png
diff --git a/graphics/pokemon/footprints/electrode_footprint.png b/graphics/pokemon/electrode/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/electrode_footprint.png
rename to graphics/pokemon/electrode/footprint.png
diff --git a/graphics/pokemon/front_pics/electrode_still_front_pic.png b/graphics/pokemon/electrode/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/electrode_still_front_pic.png
rename to graphics/pokemon/electrode/front.png
diff --git a/graphics/pokemon/icons/electrode_icon.png b/graphics/pokemon/electrode/icon.png
similarity index 100%
rename from graphics/pokemon/icons/electrode_icon.png
rename to graphics/pokemon/electrode/icon.png
diff --git a/graphics/pokemon/palettes/electrode_palette.pal b/graphics/pokemon/electrode/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/electrode_palette.pal
rename to graphics/pokemon/electrode/normal.pal
diff --git a/graphics/pokemon/palettes/electrode_shiny_palette.pal b/graphics/pokemon/electrode/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/electrode_shiny_palette.pal
rename to graphics/pokemon/electrode/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/elekid_front_pic.png b/graphics/pokemon/elekid/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/elekid_front_pic.png
rename to graphics/pokemon/elekid/anim_front.png
diff --git a/graphics/pokemon/back_pics/elekid_back_pic.png b/graphics/pokemon/elekid/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/elekid_back_pic.png
rename to graphics/pokemon/elekid/back.png
diff --git a/graphics/pokemon/footprints/elekid_footprint.png b/graphics/pokemon/elekid/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/elekid_footprint.png
rename to graphics/pokemon/elekid/footprint.png
diff --git a/graphics/pokemon/front_pics/elekid_still_front_pic.png b/graphics/pokemon/elekid/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/elekid_still_front_pic.png
rename to graphics/pokemon/elekid/front.png
diff --git a/graphics/pokemon/icons/elekid_icon.png b/graphics/pokemon/elekid/icon.png
similarity index 100%
rename from graphics/pokemon/icons/elekid_icon.png
rename to graphics/pokemon/elekid/icon.png
diff --git a/graphics/pokemon/palettes/elekid_palette.pal b/graphics/pokemon/elekid/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/elekid_palette.pal
rename to graphics/pokemon/elekid/normal.pal
diff --git a/graphics/pokemon/palettes/elekid_shiny_palette.pal b/graphics/pokemon/elekid/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/elekid_shiny_palette.pal
rename to graphics/pokemon/elekid/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/entei_front_pic.png b/graphics/pokemon/entei/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/entei_front_pic.png
rename to graphics/pokemon/entei/anim_front.png
diff --git a/graphics/pokemon/back_pics/entei_back_pic.png b/graphics/pokemon/entei/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/entei_back_pic.png
rename to graphics/pokemon/entei/back.png
diff --git a/graphics/pokemon/footprints/entei_footprint.png b/graphics/pokemon/entei/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/entei_footprint.png
rename to graphics/pokemon/entei/footprint.png
diff --git a/graphics/pokemon/front_pics/entei_still_front_pic.png b/graphics/pokemon/entei/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/entei_still_front_pic.png
rename to graphics/pokemon/entei/front.png
diff --git a/graphics/pokemon/icons/entei_icon.png b/graphics/pokemon/entei/icon.png
similarity index 100%
rename from graphics/pokemon/icons/entei_icon.png
rename to graphics/pokemon/entei/icon.png
diff --git a/graphics/pokemon/palettes/entei_palette.pal b/graphics/pokemon/entei/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/entei_palette.pal
rename to graphics/pokemon/entei/normal.pal
diff --git a/graphics/pokemon/palettes/entei_shiny_palette.pal b/graphics/pokemon/entei/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/entei_shiny_palette.pal
rename to graphics/pokemon/entei/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/espeon_front_pic.png b/graphics/pokemon/espeon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/espeon_front_pic.png
rename to graphics/pokemon/espeon/anim_front.png
diff --git a/graphics/pokemon/back_pics/espeon_back_pic.png b/graphics/pokemon/espeon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/espeon_back_pic.png
rename to graphics/pokemon/espeon/back.png
diff --git a/graphics/pokemon/footprints/espeon_footprint.png b/graphics/pokemon/espeon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/espeon_footprint.png
rename to graphics/pokemon/espeon/footprint.png
diff --git a/graphics/pokemon/front_pics/espeon_still_front_pic.png b/graphics/pokemon/espeon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/espeon_still_front_pic.png
rename to graphics/pokemon/espeon/front.png
diff --git a/graphics/pokemon/icons/espeon_icon.png b/graphics/pokemon/espeon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/espeon_icon.png
rename to graphics/pokemon/espeon/icon.png
diff --git a/graphics/pokemon/palettes/espeon_palette.pal b/graphics/pokemon/espeon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/espeon_palette.pal
rename to graphics/pokemon/espeon/normal.pal
diff --git a/graphics/pokemon/palettes/espeon_shiny_palette.pal b/graphics/pokemon/espeon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/espeon_shiny_palette.pal
rename to graphics/pokemon/espeon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/exeggcute_front_pic.png b/graphics/pokemon/exeggcute/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/exeggcute_front_pic.png
rename to graphics/pokemon/exeggcute/anim_front.png
diff --git a/graphics/pokemon/back_pics/exeggcute_back_pic.png b/graphics/pokemon/exeggcute/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/exeggcute_back_pic.png
rename to graphics/pokemon/exeggcute/back.png
diff --git a/graphics/pokemon/footprints/exeggcute_footprint.png b/graphics/pokemon/exeggcute/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/exeggcute_footprint.png
rename to graphics/pokemon/exeggcute/footprint.png
diff --git a/graphics/pokemon/front_pics/exeggcute_still_front_pic.png b/graphics/pokemon/exeggcute/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/exeggcute_still_front_pic.png
rename to graphics/pokemon/exeggcute/front.png
diff --git a/graphics/pokemon/icons/exeggcute_icon.png b/graphics/pokemon/exeggcute/icon.png
similarity index 100%
rename from graphics/pokemon/icons/exeggcute_icon.png
rename to graphics/pokemon/exeggcute/icon.png
diff --git a/graphics/pokemon/palettes/exeggcute_palette.pal b/graphics/pokemon/exeggcute/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/exeggcute_palette.pal
rename to graphics/pokemon/exeggcute/normal.pal
diff --git a/graphics/pokemon/palettes/exeggcute_shiny_palette.pal b/graphics/pokemon/exeggcute/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/exeggcute_shiny_palette.pal
rename to graphics/pokemon/exeggcute/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/exeggutor_front_pic.png b/graphics/pokemon/exeggutor/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/exeggutor_front_pic.png
rename to graphics/pokemon/exeggutor/anim_front.png
diff --git a/graphics/pokemon/back_pics/exeggutor_back_pic.png b/graphics/pokemon/exeggutor/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/exeggutor_back_pic.png
rename to graphics/pokemon/exeggutor/back.png
diff --git a/graphics/pokemon/footprints/exeggutor_footprint.png b/graphics/pokemon/exeggutor/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/exeggutor_footprint.png
rename to graphics/pokemon/exeggutor/footprint.png
diff --git a/graphics/pokemon/front_pics/exeggutor_still_front_pic.png b/graphics/pokemon/exeggutor/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/exeggutor_still_front_pic.png
rename to graphics/pokemon/exeggutor/front.png
diff --git a/graphics/pokemon/icons/exeggutor_icon.png b/graphics/pokemon/exeggutor/icon.png
similarity index 100%
rename from graphics/pokemon/icons/exeggutor_icon.png
rename to graphics/pokemon/exeggutor/icon.png
diff --git a/graphics/pokemon/palettes/exeggutor_palette.pal b/graphics/pokemon/exeggutor/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/exeggutor_palette.pal
rename to graphics/pokemon/exeggutor/normal.pal
diff --git a/graphics/pokemon/palettes/exeggutor_shiny_palette.pal b/graphics/pokemon/exeggutor/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/exeggutor_shiny_palette.pal
rename to graphics/pokemon/exeggutor/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/exploud_front_pic.png b/graphics/pokemon/exploud/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/exploud_front_pic.png
rename to graphics/pokemon/exploud/anim_front.png
diff --git a/graphics/pokemon/back_pics/exploud_back_pic.png b/graphics/pokemon/exploud/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/exploud_back_pic.png
rename to graphics/pokemon/exploud/back.png
diff --git a/graphics/pokemon/footprints/exploud_footprint.png b/graphics/pokemon/exploud/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/exploud_footprint.png
rename to graphics/pokemon/exploud/footprint.png
diff --git a/graphics/pokemon/front_pics/exploud_still_front_pic.png b/graphics/pokemon/exploud/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/exploud_still_front_pic.png
rename to graphics/pokemon/exploud/front.png
diff --git a/graphics/pokemon/icons/exploud_icon.png b/graphics/pokemon/exploud/icon.png
similarity index 100%
rename from graphics/pokemon/icons/exploud_icon.png
rename to graphics/pokemon/exploud/icon.png
diff --git a/graphics/pokemon/palettes/exploud_palette.pal b/graphics/pokemon/exploud/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/exploud_palette.pal
rename to graphics/pokemon/exploud/normal.pal
diff --git a/graphics/pokemon/palettes/exploud_shiny_palette.pal b/graphics/pokemon/exploud/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/exploud_shiny_palette.pal
rename to graphics/pokemon/exploud/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/farfetch_d_front_pic.png b/graphics/pokemon/farfetch_d/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/farfetch_d_front_pic.png
rename to graphics/pokemon/farfetch_d/anim_front.png
diff --git a/graphics/pokemon/back_pics/farfetch_d_back_pic.png b/graphics/pokemon/farfetch_d/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/farfetch_d_back_pic.png
rename to graphics/pokemon/farfetch_d/back.png
diff --git a/graphics/pokemon/footprints/farfetch_d_footprint.png b/graphics/pokemon/farfetch_d/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/farfetch_d_footprint.png
rename to graphics/pokemon/farfetch_d/footprint.png
diff --git a/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png b/graphics/pokemon/farfetch_d/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/farfetch_d_still_front_pic.png
rename to graphics/pokemon/farfetch_d/front.png
diff --git a/graphics/pokemon/icons/farfetch_d_icon.png b/graphics/pokemon/farfetch_d/icon.png
similarity index 100%
rename from graphics/pokemon/icons/farfetch_d_icon.png
rename to graphics/pokemon/farfetch_d/icon.png
diff --git a/graphics/pokemon/palettes/farfetch_d_palette.pal b/graphics/pokemon/farfetch_d/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/farfetch_d_palette.pal
rename to graphics/pokemon/farfetch_d/normal.pal
diff --git a/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal b/graphics/pokemon/farfetch_d/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/farfetch_d_shiny_palette.pal
rename to graphics/pokemon/farfetch_d/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/fearow_front_pic.png b/graphics/pokemon/fearow/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/fearow_front_pic.png
rename to graphics/pokemon/fearow/anim_front.png
diff --git a/graphics/pokemon/back_pics/fearow_back_pic.png b/graphics/pokemon/fearow/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/fearow_back_pic.png
rename to graphics/pokemon/fearow/back.png
diff --git a/graphics/pokemon/footprints/fearow_footprint.png b/graphics/pokemon/fearow/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/fearow_footprint.png
rename to graphics/pokemon/fearow/footprint.png
diff --git a/graphics/pokemon/front_pics/fearow_still_front_pic.png b/graphics/pokemon/fearow/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/fearow_still_front_pic.png
rename to graphics/pokemon/fearow/front.png
diff --git a/graphics/pokemon/icons/fearow_icon.png b/graphics/pokemon/fearow/icon.png
similarity index 100%
rename from graphics/pokemon/icons/fearow_icon.png
rename to graphics/pokemon/fearow/icon.png
diff --git a/graphics/pokemon/palettes/fearow_palette.pal b/graphics/pokemon/fearow/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/fearow_palette.pal
rename to graphics/pokemon/fearow/normal.pal
diff --git a/graphics/pokemon/palettes/fearow_shiny_palette.pal b/graphics/pokemon/fearow/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/fearow_shiny_palette.pal
rename to graphics/pokemon/fearow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/feebas_front_pic.png b/graphics/pokemon/feebas/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/feebas_front_pic.png
rename to graphics/pokemon/feebas/anim_front.png
diff --git a/graphics/pokemon/back_pics/feebas_back_pic.png b/graphics/pokemon/feebas/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/feebas_back_pic.png
rename to graphics/pokemon/feebas/back.png
diff --git a/graphics/pokemon/footprints/feebas_footprint.png b/graphics/pokemon/feebas/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/feebas_footprint.png
rename to graphics/pokemon/feebas/footprint.png
diff --git a/graphics/pokemon/front_pics/feebas_still_front_pic.png b/graphics/pokemon/feebas/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/feebas_still_front_pic.png
rename to graphics/pokemon/feebas/front.png
diff --git a/graphics/pokemon/icons/feebas_icon.png b/graphics/pokemon/feebas/icon.png
similarity index 100%
rename from graphics/pokemon/icons/feebas_icon.png
rename to graphics/pokemon/feebas/icon.png
diff --git a/graphics/pokemon/palettes/feebas_palette.pal b/graphics/pokemon/feebas/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/feebas_palette.pal
rename to graphics/pokemon/feebas/normal.pal
diff --git a/graphics/pokemon/palettes/feebas_shiny_palette.pal b/graphics/pokemon/feebas/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/feebas_shiny_palette.pal
rename to graphics/pokemon/feebas/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/feraligatr_front_pic.png b/graphics/pokemon/feraligatr/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/feraligatr_front_pic.png
rename to graphics/pokemon/feraligatr/anim_front.png
diff --git a/graphics/pokemon/back_pics/feraligatr_back_pic.png b/graphics/pokemon/feraligatr/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/feraligatr_back_pic.png
rename to graphics/pokemon/feraligatr/back.png
diff --git a/graphics/pokemon/footprints/feraligatr_footprint.png b/graphics/pokemon/feraligatr/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/feraligatr_footprint.png
rename to graphics/pokemon/feraligatr/footprint.png
diff --git a/graphics/pokemon/front_pics/feraligatr_still_front_pic.png b/graphics/pokemon/feraligatr/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/feraligatr_still_front_pic.png
rename to graphics/pokemon/feraligatr/front.png
diff --git a/graphics/pokemon/icons/feraligatr_icon.png b/graphics/pokemon/feraligatr/icon.png
similarity index 100%
rename from graphics/pokemon/icons/feraligatr_icon.png
rename to graphics/pokemon/feraligatr/icon.png
diff --git a/graphics/pokemon/palettes/feraligatr_palette.pal b/graphics/pokemon/feraligatr/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/feraligatr_palette.pal
rename to graphics/pokemon/feraligatr/normal.pal
diff --git a/graphics/pokemon/palettes/feraligatr_shiny_palette.pal b/graphics/pokemon/feraligatr/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/feraligatr_shiny_palette.pal
rename to graphics/pokemon/feraligatr/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/flaaffy_front_pic.png b/graphics/pokemon/flaaffy/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/flaaffy_front_pic.png
rename to graphics/pokemon/flaaffy/anim_front.png
diff --git a/graphics/pokemon/back_pics/flaaffy_back_pic.png b/graphics/pokemon/flaaffy/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/flaaffy_back_pic.png
rename to graphics/pokemon/flaaffy/back.png
diff --git a/graphics/pokemon/footprints/flaaffy_footprint.png b/graphics/pokemon/flaaffy/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/flaaffy_footprint.png
rename to graphics/pokemon/flaaffy/footprint.png
diff --git a/graphics/pokemon/front_pics/flaaffy_still_front_pic.png b/graphics/pokemon/flaaffy/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/flaaffy_still_front_pic.png
rename to graphics/pokemon/flaaffy/front.png
diff --git a/graphics/pokemon/icons/flaaffy_icon.png b/graphics/pokemon/flaaffy/icon.png
similarity index 100%
rename from graphics/pokemon/icons/flaaffy_icon.png
rename to graphics/pokemon/flaaffy/icon.png
diff --git a/graphics/pokemon/palettes/flaaffy_palette.pal b/graphics/pokemon/flaaffy/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/flaaffy_palette.pal
rename to graphics/pokemon/flaaffy/normal.pal
diff --git a/graphics/pokemon/palettes/flaaffy_shiny_palette.pal b/graphics/pokemon/flaaffy/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/flaaffy_shiny_palette.pal
rename to graphics/pokemon/flaaffy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/flareon_front_pic.png b/graphics/pokemon/flareon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/flareon_front_pic.png
rename to graphics/pokemon/flareon/anim_front.png
diff --git a/graphics/pokemon/back_pics/flareon_back_pic.png b/graphics/pokemon/flareon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/flareon_back_pic.png
rename to graphics/pokemon/flareon/back.png
diff --git a/graphics/pokemon/footprints/flareon_footprint.png b/graphics/pokemon/flareon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/flareon_footprint.png
rename to graphics/pokemon/flareon/footprint.png
diff --git a/graphics/pokemon/front_pics/flareon_still_front_pic.png b/graphics/pokemon/flareon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/flareon_still_front_pic.png
rename to graphics/pokemon/flareon/front.png
diff --git a/graphics/pokemon/icons/flareon_icon.png b/graphics/pokemon/flareon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/flareon_icon.png
rename to graphics/pokemon/flareon/icon.png
diff --git a/graphics/pokemon/palettes/flareon_palette.pal b/graphics/pokemon/flareon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/flareon_palette.pal
rename to graphics/pokemon/flareon/normal.pal
diff --git a/graphics/pokemon/palettes/flareon_shiny_palette.pal b/graphics/pokemon/flareon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/flareon_shiny_palette.pal
rename to graphics/pokemon/flareon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/flygon_front_pic.png b/graphics/pokemon/flygon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/flygon_front_pic.png
rename to graphics/pokemon/flygon/anim_front.png
diff --git a/graphics/pokemon/back_pics/flygon_back_pic.png b/graphics/pokemon/flygon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/flygon_back_pic.png
rename to graphics/pokemon/flygon/back.png
diff --git a/graphics/pokemon/footprints/flygon_footprint.png b/graphics/pokemon/flygon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/flygon_footprint.png
rename to graphics/pokemon/flygon/footprint.png
diff --git a/graphics/pokemon/front_pics/flygon_still_front_pic.png b/graphics/pokemon/flygon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/flygon_still_front_pic.png
rename to graphics/pokemon/flygon/front.png
diff --git a/graphics/pokemon/icons/flygon_icon.png b/graphics/pokemon/flygon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/flygon_icon.png
rename to graphics/pokemon/flygon/icon.png
diff --git a/graphics/pokemon/palettes/flygon_palette.pal b/graphics/pokemon/flygon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/flygon_palette.pal
rename to graphics/pokemon/flygon/normal.pal
diff --git a/graphics/pokemon/palettes/flygon_shiny_palette.pal b/graphics/pokemon/flygon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/flygon_shiny_palette.pal
rename to graphics/pokemon/flygon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/forretress_front_pic.png b/graphics/pokemon/forretress/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/forretress_front_pic.png
rename to graphics/pokemon/forretress/anim_front.png
diff --git a/graphics/pokemon/back_pics/forretress_back_pic.png b/graphics/pokemon/forretress/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/forretress_back_pic.png
rename to graphics/pokemon/forretress/back.png
diff --git a/graphics/pokemon/footprints/forretress_footprint.png b/graphics/pokemon/forretress/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/forretress_footprint.png
rename to graphics/pokemon/forretress/footprint.png
diff --git a/graphics/pokemon/front_pics/forretress_still_front_pic.png b/graphics/pokemon/forretress/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/forretress_still_front_pic.png
rename to graphics/pokemon/forretress/front.png
diff --git a/graphics/pokemon/icons/forretress_icon.png b/graphics/pokemon/forretress/icon.png
similarity index 100%
rename from graphics/pokemon/icons/forretress_icon.png
rename to graphics/pokemon/forretress/icon.png
diff --git a/graphics/pokemon/palettes/forretress_palette.pal b/graphics/pokemon/forretress/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/forretress_palette.pal
rename to graphics/pokemon/forretress/normal.pal
diff --git a/graphics/pokemon/palettes/forretress_shiny_palette.pal b/graphics/pokemon/forretress/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/forretress_shiny_palette.pal
rename to graphics/pokemon/forretress/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/furret_front_pic.png b/graphics/pokemon/furret/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/furret_front_pic.png
rename to graphics/pokemon/furret/anim_front.png
diff --git a/graphics/pokemon/back_pics/furret_back_pic.png b/graphics/pokemon/furret/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/furret_back_pic.png
rename to graphics/pokemon/furret/back.png
diff --git a/graphics/pokemon/footprints/furret_footprint.png b/graphics/pokemon/furret/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/furret_footprint.png
rename to graphics/pokemon/furret/footprint.png
diff --git a/graphics/pokemon/front_pics/furret_still_front_pic.png b/graphics/pokemon/furret/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/furret_still_front_pic.png
rename to graphics/pokemon/furret/front.png
diff --git a/graphics/pokemon/icons/furret_icon.png b/graphics/pokemon/furret/icon.png
similarity index 100%
rename from graphics/pokemon/icons/furret_icon.png
rename to graphics/pokemon/furret/icon.png
diff --git a/graphics/pokemon/palettes/furret_palette.pal b/graphics/pokemon/furret/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/furret_palette.pal
rename to graphics/pokemon/furret/normal.pal
diff --git a/graphics/pokemon/palettes/furret_shiny_palette.pal b/graphics/pokemon/furret/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/furret_shiny_palette.pal
rename to graphics/pokemon/furret/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gardevoir_front_pic.png b/graphics/pokemon/gardevoir/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gardevoir_front_pic.png
rename to graphics/pokemon/gardevoir/anim_front.png
diff --git a/graphics/pokemon/back_pics/gardevoir_back_pic.png b/graphics/pokemon/gardevoir/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gardevoir_back_pic.png
rename to graphics/pokemon/gardevoir/back.png
diff --git a/graphics/pokemon/footprints/gardevoir_footprint.png b/graphics/pokemon/gardevoir/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gardevoir_footprint.png
rename to graphics/pokemon/gardevoir/footprint.png
diff --git a/graphics/pokemon/front_pics/gardevoir_still_front_pic.png b/graphics/pokemon/gardevoir/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gardevoir_still_front_pic.png
rename to graphics/pokemon/gardevoir/front.png
diff --git a/graphics/pokemon/icons/gardevoir_icon.png b/graphics/pokemon/gardevoir/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gardevoir_icon.png
rename to graphics/pokemon/gardevoir/icon.png
diff --git a/graphics/pokemon/palettes/gardevoir_palette.pal b/graphics/pokemon/gardevoir/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gardevoir_palette.pal
rename to graphics/pokemon/gardevoir/normal.pal
diff --git a/graphics/pokemon/palettes/gardevoir_shiny_palette.pal b/graphics/pokemon/gardevoir/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gardevoir_shiny_palette.pal
rename to graphics/pokemon/gardevoir/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gastly_front_pic.png b/graphics/pokemon/gastly/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gastly_front_pic.png
rename to graphics/pokemon/gastly/anim_front.png
diff --git a/graphics/pokemon/back_pics/gastly_back_pic.png b/graphics/pokemon/gastly/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gastly_back_pic.png
rename to graphics/pokemon/gastly/back.png
diff --git a/graphics/pokemon/footprints/gastly_footprint.png b/graphics/pokemon/gastly/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gastly_footprint.png
rename to graphics/pokemon/gastly/footprint.png
diff --git a/graphics/pokemon/front_pics/gastly_still_front_pic.png b/graphics/pokemon/gastly/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gastly_still_front_pic.png
rename to graphics/pokemon/gastly/front.png
diff --git a/graphics/pokemon/icons/gastly_icon.png b/graphics/pokemon/gastly/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gastly_icon.png
rename to graphics/pokemon/gastly/icon.png
diff --git a/graphics/pokemon/palettes/gastly_palette.pal b/graphics/pokemon/gastly/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gastly_palette.pal
rename to graphics/pokemon/gastly/normal.pal
diff --git a/graphics/pokemon/palettes/gastly_shiny_palette.pal b/graphics/pokemon/gastly/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gastly_shiny_palette.pal
rename to graphics/pokemon/gastly/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gengar_front_pic.png b/graphics/pokemon/gengar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gengar_front_pic.png
rename to graphics/pokemon/gengar/anim_front.png
diff --git a/graphics/pokemon/back_pics/gengar_back_pic.png b/graphics/pokemon/gengar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gengar_back_pic.png
rename to graphics/pokemon/gengar/back.png
diff --git a/graphics/pokemon/footprints/gengar_footprint.png b/graphics/pokemon/gengar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gengar_footprint.png
rename to graphics/pokemon/gengar/footprint.png
diff --git a/graphics/pokemon/front_pics/gengar_still_front_pic.png b/graphics/pokemon/gengar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gengar_still_front_pic.png
rename to graphics/pokemon/gengar/front.png
diff --git a/graphics/pokemon/icons/gengar_icon.png b/graphics/pokemon/gengar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gengar_icon.png
rename to graphics/pokemon/gengar/icon.png
diff --git a/graphics/pokemon/palettes/gengar_palette.pal b/graphics/pokemon/gengar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gengar_palette.pal
rename to graphics/pokemon/gengar/normal.pal
diff --git a/graphics/pokemon/palettes/gengar_shiny_palette.pal b/graphics/pokemon/gengar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gengar_shiny_palette.pal
rename to graphics/pokemon/gengar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/geodude_front_pic.png b/graphics/pokemon/geodude/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/geodude_front_pic.png
rename to graphics/pokemon/geodude/anim_front.png
diff --git a/graphics/pokemon/back_pics/geodude_back_pic.png b/graphics/pokemon/geodude/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/geodude_back_pic.png
rename to graphics/pokemon/geodude/back.png
diff --git a/graphics/pokemon/footprints/geodude_footprint.png b/graphics/pokemon/geodude/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/geodude_footprint.png
rename to graphics/pokemon/geodude/footprint.png
diff --git a/graphics/pokemon/front_pics/geodude_still_front_pic.png b/graphics/pokemon/geodude/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/geodude_still_front_pic.png
rename to graphics/pokemon/geodude/front.png
diff --git a/graphics/pokemon/icons/geodude_icon.png b/graphics/pokemon/geodude/icon.png
similarity index 100%
rename from graphics/pokemon/icons/geodude_icon.png
rename to graphics/pokemon/geodude/icon.png
diff --git a/graphics/pokemon/palettes/geodude_palette.pal b/graphics/pokemon/geodude/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/geodude_palette.pal
rename to graphics/pokemon/geodude/normal.pal
diff --git a/graphics/pokemon/palettes/geodude_shiny_palette.pal b/graphics/pokemon/geodude/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/geodude_shiny_palette.pal
rename to graphics/pokemon/geodude/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/girafarig_front_pic.png b/graphics/pokemon/girafarig/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/girafarig_front_pic.png
rename to graphics/pokemon/girafarig/anim_front.png
diff --git a/graphics/pokemon/back_pics/girafarig_back_pic.png b/graphics/pokemon/girafarig/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/girafarig_back_pic.png
rename to graphics/pokemon/girafarig/back.png
diff --git a/graphics/pokemon/footprints/girafarig_footprint.png b/graphics/pokemon/girafarig/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/girafarig_footprint.png
rename to graphics/pokemon/girafarig/footprint.png
diff --git a/graphics/pokemon/front_pics/girafarig_still_front_pic.png b/graphics/pokemon/girafarig/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/girafarig_still_front_pic.png
rename to graphics/pokemon/girafarig/front.png
diff --git a/graphics/pokemon/icons/girafarig_icon.png b/graphics/pokemon/girafarig/icon.png
similarity index 100%
rename from graphics/pokemon/icons/girafarig_icon.png
rename to graphics/pokemon/girafarig/icon.png
diff --git a/graphics/pokemon/palettes/girafarig_palette.pal b/graphics/pokemon/girafarig/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/girafarig_palette.pal
rename to graphics/pokemon/girafarig/normal.pal
diff --git a/graphics/pokemon/palettes/girafarig_shiny_palette.pal b/graphics/pokemon/girafarig/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/girafarig_shiny_palette.pal
rename to graphics/pokemon/girafarig/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/glalie_front_pic.png b/graphics/pokemon/glalie/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/glalie_front_pic.png
rename to graphics/pokemon/glalie/anim_front.png
diff --git a/graphics/pokemon/back_pics/glalie_back_pic.png b/graphics/pokemon/glalie/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/glalie_back_pic.png
rename to graphics/pokemon/glalie/back.png
diff --git a/graphics/pokemon/footprints/glalie_footprint.png b/graphics/pokemon/glalie/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/glalie_footprint.png
rename to graphics/pokemon/glalie/footprint.png
diff --git a/graphics/pokemon/front_pics/glalie_still_front_pic.png b/graphics/pokemon/glalie/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/glalie_still_front_pic.png
rename to graphics/pokemon/glalie/front.png
diff --git a/graphics/pokemon/icons/glalie_icon.png b/graphics/pokemon/glalie/icon.png
similarity index 100%
rename from graphics/pokemon/icons/glalie_icon.png
rename to graphics/pokemon/glalie/icon.png
diff --git a/graphics/pokemon/palettes/glalie_palette.pal b/graphics/pokemon/glalie/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/glalie_palette.pal
rename to graphics/pokemon/glalie/normal.pal
diff --git a/graphics/pokemon/palettes/glalie_shiny_palette.pal b/graphics/pokemon/glalie/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/glalie_shiny_palette.pal
rename to graphics/pokemon/glalie/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gligar_front_pic.png b/graphics/pokemon/gligar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gligar_front_pic.png
rename to graphics/pokemon/gligar/anim_front.png
diff --git a/graphics/pokemon/back_pics/gligar_back_pic.png b/graphics/pokemon/gligar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gligar_back_pic.png
rename to graphics/pokemon/gligar/back.png
diff --git a/graphics/pokemon/footprints/gligar_footprint.png b/graphics/pokemon/gligar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gligar_footprint.png
rename to graphics/pokemon/gligar/footprint.png
diff --git a/graphics/pokemon/front_pics/gligar_still_front_pic.png b/graphics/pokemon/gligar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gligar_still_front_pic.png
rename to graphics/pokemon/gligar/front.png
diff --git a/graphics/pokemon/icons/gligar_icon.png b/graphics/pokemon/gligar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gligar_icon.png
rename to graphics/pokemon/gligar/icon.png
diff --git a/graphics/pokemon/palettes/gligar_palette.pal b/graphics/pokemon/gligar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gligar_palette.pal
rename to graphics/pokemon/gligar/normal.pal
diff --git a/graphics/pokemon/palettes/gligar_shiny_palette.pal b/graphics/pokemon/gligar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gligar_shiny_palette.pal
rename to graphics/pokemon/gligar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gloom_front_pic.png b/graphics/pokemon/gloom/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gloom_front_pic.png
rename to graphics/pokemon/gloom/anim_front.png
diff --git a/graphics/pokemon/back_pics/gloom_back_pic.png b/graphics/pokemon/gloom/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gloom_back_pic.png
rename to graphics/pokemon/gloom/back.png
diff --git a/graphics/pokemon/footprints/gloom_footprint.png b/graphics/pokemon/gloom/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gloom_footprint.png
rename to graphics/pokemon/gloom/footprint.png
diff --git a/graphics/pokemon/front_pics/gloom_still_front_pic.png b/graphics/pokemon/gloom/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gloom_still_front_pic.png
rename to graphics/pokemon/gloom/front.png
diff --git a/graphics/pokemon/icons/gloom_icon.png b/graphics/pokemon/gloom/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gloom_icon.png
rename to graphics/pokemon/gloom/icon.png
diff --git a/graphics/pokemon/palettes/gloom_palette.pal b/graphics/pokemon/gloom/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gloom_palette.pal
rename to graphics/pokemon/gloom/normal.pal
diff --git a/graphics/pokemon/palettes/gloom_shiny_palette.pal b/graphics/pokemon/gloom/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gloom_shiny_palette.pal
rename to graphics/pokemon/gloom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/golbat_front_pic.png b/graphics/pokemon/golbat/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/golbat_front_pic.png
rename to graphics/pokemon/golbat/anim_front.png
diff --git a/graphics/pokemon/back_pics/golbat_back_pic.png b/graphics/pokemon/golbat/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/golbat_back_pic.png
rename to graphics/pokemon/golbat/back.png
diff --git a/graphics/pokemon/footprints/golbat_footprint.png b/graphics/pokemon/golbat/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/golbat_footprint.png
rename to graphics/pokemon/golbat/footprint.png
diff --git a/graphics/pokemon/front_pics/golbat_still_front_pic.png b/graphics/pokemon/golbat/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/golbat_still_front_pic.png
rename to graphics/pokemon/golbat/front.png
diff --git a/graphics/pokemon/icons/golbat_icon.png b/graphics/pokemon/golbat/icon.png
similarity index 100%
rename from graphics/pokemon/icons/golbat_icon.png
rename to graphics/pokemon/golbat/icon.png
diff --git a/graphics/pokemon/palettes/golbat_palette.pal b/graphics/pokemon/golbat/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/golbat_palette.pal
rename to graphics/pokemon/golbat/normal.pal
diff --git a/graphics/pokemon/palettes/golbat_shiny_palette.pal b/graphics/pokemon/golbat/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/golbat_shiny_palette.pal
rename to graphics/pokemon/golbat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/goldeen_front_pic.png b/graphics/pokemon/goldeen/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/goldeen_front_pic.png
rename to graphics/pokemon/goldeen/anim_front.png
diff --git a/graphics/pokemon/back_pics/goldeen_back_pic.png b/graphics/pokemon/goldeen/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/goldeen_back_pic.png
rename to graphics/pokemon/goldeen/back.png
diff --git a/graphics/pokemon/footprints/goldeen_footprint.png b/graphics/pokemon/goldeen/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/goldeen_footprint.png
rename to graphics/pokemon/goldeen/footprint.png
diff --git a/graphics/pokemon/front_pics/goldeen_still_front_pic.png b/graphics/pokemon/goldeen/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/goldeen_still_front_pic.png
rename to graphics/pokemon/goldeen/front.png
diff --git a/graphics/pokemon/icons/goldeen_icon.png b/graphics/pokemon/goldeen/icon.png
similarity index 100%
rename from graphics/pokemon/icons/goldeen_icon.png
rename to graphics/pokemon/goldeen/icon.png
diff --git a/graphics/pokemon/palettes/goldeen_palette.pal b/graphics/pokemon/goldeen/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/goldeen_palette.pal
rename to graphics/pokemon/goldeen/normal.pal
diff --git a/graphics/pokemon/palettes/goldeen_shiny_palette.pal b/graphics/pokemon/goldeen/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/goldeen_shiny_palette.pal
rename to graphics/pokemon/goldeen/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/golduck_front_pic.png b/graphics/pokemon/golduck/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/golduck_front_pic.png
rename to graphics/pokemon/golduck/anim_front.png
diff --git a/graphics/pokemon/back_pics/golduck_back_pic.png b/graphics/pokemon/golduck/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/golduck_back_pic.png
rename to graphics/pokemon/golduck/back.png
diff --git a/graphics/pokemon/footprints/golduck_footprint.png b/graphics/pokemon/golduck/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/golduck_footprint.png
rename to graphics/pokemon/golduck/footprint.png
diff --git a/graphics/pokemon/front_pics/golduck_still_front_pic.png b/graphics/pokemon/golduck/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/golduck_still_front_pic.png
rename to graphics/pokemon/golduck/front.png
diff --git a/graphics/pokemon/icons/golduck_icon.png b/graphics/pokemon/golduck/icon.png
similarity index 100%
rename from graphics/pokemon/icons/golduck_icon.png
rename to graphics/pokemon/golduck/icon.png
diff --git a/graphics/pokemon/palettes/golduck_palette.pal b/graphics/pokemon/golduck/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/golduck_palette.pal
rename to graphics/pokemon/golduck/normal.pal
diff --git a/graphics/pokemon/palettes/golduck_shiny_palette.pal b/graphics/pokemon/golduck/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/golduck_shiny_palette.pal
rename to graphics/pokemon/golduck/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/golem_front_pic.png b/graphics/pokemon/golem/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/golem_front_pic.png
rename to graphics/pokemon/golem/anim_front.png
diff --git a/graphics/pokemon/back_pics/golem_back_pic.png b/graphics/pokemon/golem/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/golem_back_pic.png
rename to graphics/pokemon/golem/back.png
diff --git a/graphics/pokemon/footprints/golem_footprint.png b/graphics/pokemon/golem/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/golem_footprint.png
rename to graphics/pokemon/golem/footprint.png
diff --git a/graphics/pokemon/front_pics/golem_still_front_pic.png b/graphics/pokemon/golem/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/golem_still_front_pic.png
rename to graphics/pokemon/golem/front.png
diff --git a/graphics/pokemon/icons/golem_icon.png b/graphics/pokemon/golem/icon.png
similarity index 100%
rename from graphics/pokemon/icons/golem_icon.png
rename to graphics/pokemon/golem/icon.png
diff --git a/graphics/pokemon/palettes/golem_palette.pal b/graphics/pokemon/golem/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/golem_palette.pal
rename to graphics/pokemon/golem/normal.pal
diff --git a/graphics/pokemon/palettes/golem_shiny_palette.pal b/graphics/pokemon/golem/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/golem_shiny_palette.pal
rename to graphics/pokemon/golem/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gorebyss_front_pic.png b/graphics/pokemon/gorebyss/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gorebyss_front_pic.png
rename to graphics/pokemon/gorebyss/anim_front.png
diff --git a/graphics/pokemon/back_pics/gorebyss_back_pic.png b/graphics/pokemon/gorebyss/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gorebyss_back_pic.png
rename to graphics/pokemon/gorebyss/back.png
diff --git a/graphics/pokemon/footprints/gorebyss_footprint.png b/graphics/pokemon/gorebyss/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gorebyss_footprint.png
rename to graphics/pokemon/gorebyss/footprint.png
diff --git a/graphics/pokemon/front_pics/gorebyss_still_front_pic.png b/graphics/pokemon/gorebyss/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gorebyss_still_front_pic.png
rename to graphics/pokemon/gorebyss/front.png
diff --git a/graphics/pokemon/icons/gorebyss_icon.png b/graphics/pokemon/gorebyss/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gorebyss_icon.png
rename to graphics/pokemon/gorebyss/icon.png
diff --git a/graphics/pokemon/palettes/gorebyss_palette.pal b/graphics/pokemon/gorebyss/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gorebyss_palette.pal
rename to graphics/pokemon/gorebyss/normal.pal
diff --git a/graphics/pokemon/palettes/gorebyss_shiny_palette.pal b/graphics/pokemon/gorebyss/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gorebyss_shiny_palette.pal
rename to graphics/pokemon/gorebyss/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/granbull_front_pic.png b/graphics/pokemon/granbull/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/granbull_front_pic.png
rename to graphics/pokemon/granbull/anim_front.png
diff --git a/graphics/pokemon/back_pics/granbull_back_pic.png b/graphics/pokemon/granbull/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/granbull_back_pic.png
rename to graphics/pokemon/granbull/back.png
diff --git a/graphics/pokemon/footprints/granbull_footprint.png b/graphics/pokemon/granbull/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/granbull_footprint.png
rename to graphics/pokemon/granbull/footprint.png
diff --git a/graphics/pokemon/front_pics/granbull_still_front_pic.png b/graphics/pokemon/granbull/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/granbull_still_front_pic.png
rename to graphics/pokemon/granbull/front.png
diff --git a/graphics/pokemon/icons/granbull_icon.png b/graphics/pokemon/granbull/icon.png
similarity index 100%
rename from graphics/pokemon/icons/granbull_icon.png
rename to graphics/pokemon/granbull/icon.png
diff --git a/graphics/pokemon/palettes/granbull_palette.pal b/graphics/pokemon/granbull/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/granbull_palette.pal
rename to graphics/pokemon/granbull/normal.pal
diff --git a/graphics/pokemon/palettes/granbull_shiny_palette.pal b/graphics/pokemon/granbull/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/granbull_shiny_palette.pal
rename to graphics/pokemon/granbull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/graveler_front_pic.png b/graphics/pokemon/graveler/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/graveler_front_pic.png
rename to graphics/pokemon/graveler/anim_front.png
diff --git a/graphics/pokemon/back_pics/graveler_back_pic.png b/graphics/pokemon/graveler/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/graveler_back_pic.png
rename to graphics/pokemon/graveler/back.png
diff --git a/graphics/pokemon/footprints/graveler_footprint.png b/graphics/pokemon/graveler/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/graveler_footprint.png
rename to graphics/pokemon/graveler/footprint.png
diff --git a/graphics/pokemon/front_pics/graveler_still_front_pic.png b/graphics/pokemon/graveler/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/graveler_still_front_pic.png
rename to graphics/pokemon/graveler/front.png
diff --git a/graphics/pokemon/icons/graveler_icon.png b/graphics/pokemon/graveler/icon.png
similarity index 100%
rename from graphics/pokemon/icons/graveler_icon.png
rename to graphics/pokemon/graveler/icon.png
diff --git a/graphics/pokemon/palettes/graveler_palette.pal b/graphics/pokemon/graveler/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/graveler_palette.pal
rename to graphics/pokemon/graveler/normal.pal
diff --git a/graphics/pokemon/palettes/graveler_shiny_palette.pal b/graphics/pokemon/graveler/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/graveler_shiny_palette.pal
rename to graphics/pokemon/graveler/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/grimer_front_pic.png b/graphics/pokemon/grimer/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/grimer_front_pic.png
rename to graphics/pokemon/grimer/anim_front.png
diff --git a/graphics/pokemon/back_pics/grimer_back_pic.png b/graphics/pokemon/grimer/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/grimer_back_pic.png
rename to graphics/pokemon/grimer/back.png
diff --git a/graphics/pokemon/footprints/grimer_footprint.png b/graphics/pokemon/grimer/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/grimer_footprint.png
rename to graphics/pokemon/grimer/footprint.png
diff --git a/graphics/pokemon/front_pics/grimer_still_front_pic.png b/graphics/pokemon/grimer/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/grimer_still_front_pic.png
rename to graphics/pokemon/grimer/front.png
diff --git a/graphics/pokemon/icons/grimer_icon.png b/graphics/pokemon/grimer/icon.png
similarity index 100%
rename from graphics/pokemon/icons/grimer_icon.png
rename to graphics/pokemon/grimer/icon.png
diff --git a/graphics/pokemon/palettes/grimer_palette.pal b/graphics/pokemon/grimer/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/grimer_palette.pal
rename to graphics/pokemon/grimer/normal.pal
diff --git a/graphics/pokemon/palettes/grimer_shiny_palette.pal b/graphics/pokemon/grimer/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/grimer_shiny_palette.pal
rename to graphics/pokemon/grimer/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/groudon_front_pic.png b/graphics/pokemon/groudon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/groudon_front_pic.png
rename to graphics/pokemon/groudon/anim_front.png
diff --git a/graphics/pokemon/back_pics/groudon_back_pic.png b/graphics/pokemon/groudon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/groudon_back_pic.png
rename to graphics/pokemon/groudon/back.png
diff --git a/graphics/pokemon/footprints/groudon_footprint.png b/graphics/pokemon/groudon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/groudon_footprint.png
rename to graphics/pokemon/groudon/footprint.png
diff --git a/graphics/pokemon/front_pics/groudon_still_front_pic.png b/graphics/pokemon/groudon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/groudon_still_front_pic.png
rename to graphics/pokemon/groudon/front.png
diff --git a/graphics/pokemon/icons/groudon_icon.png b/graphics/pokemon/groudon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/groudon_icon.png
rename to graphics/pokemon/groudon/icon.png
diff --git a/graphics/pokemon/palettes/groudon_palette.pal b/graphics/pokemon/groudon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/groudon_palette.pal
rename to graphics/pokemon/groudon/normal.pal
diff --git a/graphics/pokemon/palettes/groudon_shiny_palette.pal b/graphics/pokemon/groudon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/groudon_shiny_palette.pal
rename to graphics/pokemon/groudon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/grovyle_front_pic.png b/graphics/pokemon/grovyle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/grovyle_front_pic.png
rename to graphics/pokemon/grovyle/anim_front.png
diff --git a/graphics/pokemon/back_pics/grovyle_back_pic.png b/graphics/pokemon/grovyle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/grovyle_back_pic.png
rename to graphics/pokemon/grovyle/back.png
diff --git a/graphics/pokemon/footprints/grovyle_footprint.png b/graphics/pokemon/grovyle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/grovyle_footprint.png
rename to graphics/pokemon/grovyle/footprint.png
diff --git a/graphics/pokemon/front_pics/grovyle_still_front_pic.png b/graphics/pokemon/grovyle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/grovyle_still_front_pic.png
rename to graphics/pokemon/grovyle/front.png
diff --git a/graphics/pokemon/icons/grovyle_icon.png b/graphics/pokemon/grovyle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/grovyle_icon.png
rename to graphics/pokemon/grovyle/icon.png
diff --git a/graphics/pokemon/palettes/grovyle_palette.pal b/graphics/pokemon/grovyle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/grovyle_palette.pal
rename to graphics/pokemon/grovyle/normal.pal
diff --git a/graphics/pokemon/palettes/grovyle_shiny_palette.pal b/graphics/pokemon/grovyle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/grovyle_shiny_palette.pal
rename to graphics/pokemon/grovyle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/growlithe_front_pic.png b/graphics/pokemon/growlithe/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/growlithe_front_pic.png
rename to graphics/pokemon/growlithe/anim_front.png
diff --git a/graphics/pokemon/back_pics/growlithe_back_pic.png b/graphics/pokemon/growlithe/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/growlithe_back_pic.png
rename to graphics/pokemon/growlithe/back.png
diff --git a/graphics/pokemon/footprints/growlithe_footprint.png b/graphics/pokemon/growlithe/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/growlithe_footprint.png
rename to graphics/pokemon/growlithe/footprint.png
diff --git a/graphics/pokemon/front_pics/growlithe_still_front_pic.png b/graphics/pokemon/growlithe/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/growlithe_still_front_pic.png
rename to graphics/pokemon/growlithe/front.png
diff --git a/graphics/pokemon/icons/growlithe_icon.png b/graphics/pokemon/growlithe/icon.png
similarity index 100%
rename from graphics/pokemon/icons/growlithe_icon.png
rename to graphics/pokemon/growlithe/icon.png
diff --git a/graphics/pokemon/palettes/growlithe_palette.pal b/graphics/pokemon/growlithe/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/growlithe_palette.pal
rename to graphics/pokemon/growlithe/normal.pal
diff --git a/graphics/pokemon/palettes/growlithe_shiny_palette.pal b/graphics/pokemon/growlithe/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/growlithe_shiny_palette.pal
rename to graphics/pokemon/growlithe/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/grumpig_front_pic.png b/graphics/pokemon/grumpig/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/grumpig_front_pic.png
rename to graphics/pokemon/grumpig/anim_front.png
diff --git a/graphics/pokemon/back_pics/grumpig_back_pic.png b/graphics/pokemon/grumpig/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/grumpig_back_pic.png
rename to graphics/pokemon/grumpig/back.png
diff --git a/graphics/pokemon/footprints/grumpig_footprint.png b/graphics/pokemon/grumpig/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/grumpig_footprint.png
rename to graphics/pokemon/grumpig/footprint.png
diff --git a/graphics/pokemon/front_pics/grumpig_still_front_pic.png b/graphics/pokemon/grumpig/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/grumpig_still_front_pic.png
rename to graphics/pokemon/grumpig/front.png
diff --git a/graphics/pokemon/icons/grumpig_icon.png b/graphics/pokemon/grumpig/icon.png
similarity index 100%
rename from graphics/pokemon/icons/grumpig_icon.png
rename to graphics/pokemon/grumpig/icon.png
diff --git a/graphics/pokemon/palettes/grumpig_palette.pal b/graphics/pokemon/grumpig/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/grumpig_palette.pal
rename to graphics/pokemon/grumpig/normal.pal
diff --git a/graphics/pokemon/palettes/grumpig_shiny_palette.pal b/graphics/pokemon/grumpig/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/grumpig_shiny_palette.pal
rename to graphics/pokemon/grumpig/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gulpin_front_pic.png b/graphics/pokemon/gulpin/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gulpin_front_pic.png
rename to graphics/pokemon/gulpin/anim_front.png
diff --git a/graphics/pokemon/back_pics/gulpin_back_pic.png b/graphics/pokemon/gulpin/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gulpin_back_pic.png
rename to graphics/pokemon/gulpin/back.png
diff --git a/graphics/pokemon/footprints/gulpin_footprint.png b/graphics/pokemon/gulpin/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gulpin_footprint.png
rename to graphics/pokemon/gulpin/footprint.png
diff --git a/graphics/pokemon/front_pics/gulpin_still_front_pic.png b/graphics/pokemon/gulpin/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gulpin_still_front_pic.png
rename to graphics/pokemon/gulpin/front.png
diff --git a/graphics/pokemon/icons/gulpin_icon.png b/graphics/pokemon/gulpin/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gulpin_icon.png
rename to graphics/pokemon/gulpin/icon.png
diff --git a/graphics/pokemon/palettes/gulpin_palette.pal b/graphics/pokemon/gulpin/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gulpin_palette.pal
rename to graphics/pokemon/gulpin/normal.pal
diff --git a/graphics/pokemon/palettes/gulpin_shiny_palette.pal b/graphics/pokemon/gulpin/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gulpin_shiny_palette.pal
rename to graphics/pokemon/gulpin/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gyarados_front_pic.png b/graphics/pokemon/gyarados/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/gyarados_front_pic.png
rename to graphics/pokemon/gyarados/anim_front.png
diff --git a/graphics/pokemon/back_pics/gyarados_back_pic.png b/graphics/pokemon/gyarados/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/gyarados_back_pic.png
rename to graphics/pokemon/gyarados/back.png
diff --git a/graphics/pokemon/footprints/gyarados_footprint.png b/graphics/pokemon/gyarados/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/gyarados_footprint.png
rename to graphics/pokemon/gyarados/footprint.png
diff --git a/graphics/pokemon/front_pics/gyarados_still_front_pic.png b/graphics/pokemon/gyarados/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/gyarados_still_front_pic.png
rename to graphics/pokemon/gyarados/front.png
diff --git a/graphics/pokemon/icons/gyarados_icon.png b/graphics/pokemon/gyarados/icon.png
similarity index 100%
rename from graphics/pokemon/icons/gyarados_icon.png
rename to graphics/pokemon/gyarados/icon.png
diff --git a/graphics/pokemon/palettes/gyarados_palette.pal b/graphics/pokemon/gyarados/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/gyarados_palette.pal
rename to graphics/pokemon/gyarados/normal.pal
diff --git a/graphics/pokemon/palettes/gyarados_shiny_palette.pal b/graphics/pokemon/gyarados/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/gyarados_shiny_palette.pal
rename to graphics/pokemon/gyarados/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hariyama_front_pic.png b/graphics/pokemon/hariyama/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hariyama_front_pic.png
rename to graphics/pokemon/hariyama/anim_front.png
diff --git a/graphics/pokemon/back_pics/hariyama_back_pic.png b/graphics/pokemon/hariyama/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hariyama_back_pic.png
rename to graphics/pokemon/hariyama/back.png
diff --git a/graphics/pokemon/footprints/hariyama_footprint.png b/graphics/pokemon/hariyama/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hariyama_footprint.png
rename to graphics/pokemon/hariyama/footprint.png
diff --git a/graphics/pokemon/front_pics/hariyama_still_front_pic.png b/graphics/pokemon/hariyama/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hariyama_still_front_pic.png
rename to graphics/pokemon/hariyama/front.png
diff --git a/graphics/pokemon/icons/hariyama_icon.png b/graphics/pokemon/hariyama/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hariyama_icon.png
rename to graphics/pokemon/hariyama/icon.png
diff --git a/graphics/pokemon/palettes/hariyama_palette.pal b/graphics/pokemon/hariyama/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hariyama_palette.pal
rename to graphics/pokemon/hariyama/normal.pal
diff --git a/graphics/pokemon/palettes/hariyama_shiny_palette.pal b/graphics/pokemon/hariyama/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hariyama_shiny_palette.pal
rename to graphics/pokemon/hariyama/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/haunter_front_pic.png b/graphics/pokemon/haunter/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/haunter_front_pic.png
rename to graphics/pokemon/haunter/anim_front.png
diff --git a/graphics/pokemon/back_pics/haunter_back_pic.png b/graphics/pokemon/haunter/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/haunter_back_pic.png
rename to graphics/pokemon/haunter/back.png
diff --git a/graphics/pokemon/footprints/haunter_footprint.png b/graphics/pokemon/haunter/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/haunter_footprint.png
rename to graphics/pokemon/haunter/footprint.png
diff --git a/graphics/pokemon/front_pics/haunter_still_front_pic.png b/graphics/pokemon/haunter/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/haunter_still_front_pic.png
rename to graphics/pokemon/haunter/front.png
diff --git a/graphics/pokemon/icons/haunter_icon.png b/graphics/pokemon/haunter/icon.png
similarity index 100%
rename from graphics/pokemon/icons/haunter_icon.png
rename to graphics/pokemon/haunter/icon.png
diff --git a/graphics/pokemon/palettes/haunter_palette.pal b/graphics/pokemon/haunter/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/haunter_palette.pal
rename to graphics/pokemon/haunter/normal.pal
diff --git a/graphics/pokemon/palettes/haunter_shiny_palette.pal b/graphics/pokemon/haunter/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/haunter_shiny_palette.pal
rename to graphics/pokemon/haunter/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/heracross_front_pic.png b/graphics/pokemon/heracross/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/heracross_front_pic.png
rename to graphics/pokemon/heracross/anim_front.png
diff --git a/graphics/pokemon/back_pics/heracross_back_pic.png b/graphics/pokemon/heracross/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/heracross_back_pic.png
rename to graphics/pokemon/heracross/back.png
diff --git a/graphics/pokemon/footprints/heracross_footprint.png b/graphics/pokemon/heracross/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/heracross_footprint.png
rename to graphics/pokemon/heracross/footprint.png
diff --git a/graphics/pokemon/front_pics/heracross_still_front_pic.png b/graphics/pokemon/heracross/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/heracross_still_front_pic.png
rename to graphics/pokemon/heracross/front.png
diff --git a/graphics/pokemon/icons/heracross_icon.png b/graphics/pokemon/heracross/icon.png
similarity index 100%
rename from graphics/pokemon/icons/heracross_icon.png
rename to graphics/pokemon/heracross/icon.png
diff --git a/graphics/pokemon/palettes/heracross_palette.pal b/graphics/pokemon/heracross/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/heracross_palette.pal
rename to graphics/pokemon/heracross/normal.pal
diff --git a/graphics/pokemon/palettes/heracross_shiny_palette.pal b/graphics/pokemon/heracross/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/heracross_shiny_palette.pal
rename to graphics/pokemon/heracross/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hitmonchan_front_pic.png b/graphics/pokemon/hitmonchan/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hitmonchan_front_pic.png
rename to graphics/pokemon/hitmonchan/anim_front.png
diff --git a/graphics/pokemon/back_pics/hitmonchan_back_pic.png b/graphics/pokemon/hitmonchan/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hitmonchan_back_pic.png
rename to graphics/pokemon/hitmonchan/back.png
diff --git a/graphics/pokemon/footprints/hitmonchan_footprint.png b/graphics/pokemon/hitmonchan/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hitmonchan_footprint.png
rename to graphics/pokemon/hitmonchan/footprint.png
diff --git a/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png b/graphics/pokemon/hitmonchan/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hitmonchan_still_front_pic.png
rename to graphics/pokemon/hitmonchan/front.png
diff --git a/graphics/pokemon/icons/hitmonchan_icon.png b/graphics/pokemon/hitmonchan/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hitmonchan_icon.png
rename to graphics/pokemon/hitmonchan/icon.png
diff --git a/graphics/pokemon/palettes/hitmonchan_palette.pal b/graphics/pokemon/hitmonchan/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hitmonchan_palette.pal
rename to graphics/pokemon/hitmonchan/normal.pal
diff --git a/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal b/graphics/pokemon/hitmonchan/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hitmonchan_shiny_palette.pal
rename to graphics/pokemon/hitmonchan/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hitmonlee_front_pic.png b/graphics/pokemon/hitmonlee/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hitmonlee_front_pic.png
rename to graphics/pokemon/hitmonlee/anim_front.png
diff --git a/graphics/pokemon/back_pics/hitmonlee_back_pic.png b/graphics/pokemon/hitmonlee/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hitmonlee_back_pic.png
rename to graphics/pokemon/hitmonlee/back.png
diff --git a/graphics/pokemon/footprints/hitmonlee_footprint.png b/graphics/pokemon/hitmonlee/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hitmonlee_footprint.png
rename to graphics/pokemon/hitmonlee/footprint.png
diff --git a/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png b/graphics/pokemon/hitmonlee/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hitmonlee_still_front_pic.png
rename to graphics/pokemon/hitmonlee/front.png
diff --git a/graphics/pokemon/icons/hitmonlee_icon.png b/graphics/pokemon/hitmonlee/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hitmonlee_icon.png
rename to graphics/pokemon/hitmonlee/icon.png
diff --git a/graphics/pokemon/palettes/hitmonlee_palette.pal b/graphics/pokemon/hitmonlee/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hitmonlee_palette.pal
rename to graphics/pokemon/hitmonlee/normal.pal
diff --git a/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal b/graphics/pokemon/hitmonlee/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hitmonlee_shiny_palette.pal
rename to graphics/pokemon/hitmonlee/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hitmontop_front_pic.png b/graphics/pokemon/hitmontop/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hitmontop_front_pic.png
rename to graphics/pokemon/hitmontop/anim_front.png
diff --git a/graphics/pokemon/back_pics/hitmontop_back_pic.png b/graphics/pokemon/hitmontop/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hitmontop_back_pic.png
rename to graphics/pokemon/hitmontop/back.png
diff --git a/graphics/pokemon/footprints/hitmontop_footprint.png b/graphics/pokemon/hitmontop/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hitmontop_footprint.png
rename to graphics/pokemon/hitmontop/footprint.png
diff --git a/graphics/pokemon/front_pics/hitmontop_still_front_pic.png b/graphics/pokemon/hitmontop/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hitmontop_still_front_pic.png
rename to graphics/pokemon/hitmontop/front.png
diff --git a/graphics/pokemon/icons/hitmontop_icon.png b/graphics/pokemon/hitmontop/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hitmontop_icon.png
rename to graphics/pokemon/hitmontop/icon.png
diff --git a/graphics/pokemon/palettes/hitmontop_palette.pal b/graphics/pokemon/hitmontop/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hitmontop_palette.pal
rename to graphics/pokemon/hitmontop/normal.pal
diff --git a/graphics/pokemon/palettes/hitmontop_shiny_palette.pal b/graphics/pokemon/hitmontop/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hitmontop_shiny_palette.pal
rename to graphics/pokemon/hitmontop/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ho_oh_front_pic.png b/graphics/pokemon/ho_oh/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ho_oh_front_pic.png
rename to graphics/pokemon/ho_oh/anim_front.png
diff --git a/graphics/pokemon/back_pics/ho_oh_back_pic.png b/graphics/pokemon/ho_oh/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ho_oh_back_pic.png
rename to graphics/pokemon/ho_oh/back.png
diff --git a/graphics/pokemon/footprints/ho_oh_footprint.png b/graphics/pokemon/ho_oh/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ho_oh_footprint.png
rename to graphics/pokemon/ho_oh/footprint.png
diff --git a/graphics/pokemon/front_pics/ho_oh_still_front_pic.png b/graphics/pokemon/ho_oh/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ho_oh_still_front_pic.png
rename to graphics/pokemon/ho_oh/front.png
diff --git a/graphics/pokemon/icons/ho_oh_icon.png b/graphics/pokemon/ho_oh/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ho_oh_icon.png
rename to graphics/pokemon/ho_oh/icon.png
diff --git a/graphics/pokemon/palettes/ho_oh_palette.pal b/graphics/pokemon/ho_oh/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ho_oh_palette.pal
rename to graphics/pokemon/ho_oh/normal.pal
diff --git a/graphics/pokemon/palettes/ho_oh_shiny_palette.pal b/graphics/pokemon/ho_oh/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ho_oh_shiny_palette.pal
rename to graphics/pokemon/ho_oh/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hoothoot_front_pic.png b/graphics/pokemon/hoothoot/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hoothoot_front_pic.png
rename to graphics/pokemon/hoothoot/anim_front.png
diff --git a/graphics/pokemon/back_pics/hoothoot_back_pic.png b/graphics/pokemon/hoothoot/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hoothoot_back_pic.png
rename to graphics/pokemon/hoothoot/back.png
diff --git a/graphics/pokemon/footprints/hoothoot_footprint.png b/graphics/pokemon/hoothoot/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hoothoot_footprint.png
rename to graphics/pokemon/hoothoot/footprint.png
diff --git a/graphics/pokemon/front_pics/hoothoot_still_front_pic.png b/graphics/pokemon/hoothoot/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hoothoot_still_front_pic.png
rename to graphics/pokemon/hoothoot/front.png
diff --git a/graphics/pokemon/icons/hoothoot_icon.png b/graphics/pokemon/hoothoot/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hoothoot_icon.png
rename to graphics/pokemon/hoothoot/icon.png
diff --git a/graphics/pokemon/palettes/hoothoot_palette.pal b/graphics/pokemon/hoothoot/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hoothoot_palette.pal
rename to graphics/pokemon/hoothoot/normal.pal
diff --git a/graphics/pokemon/palettes/hoothoot_shiny_palette.pal b/graphics/pokemon/hoothoot/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hoothoot_shiny_palette.pal
rename to graphics/pokemon/hoothoot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hoppip_front_pic.png b/graphics/pokemon/hoppip/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hoppip_front_pic.png
rename to graphics/pokemon/hoppip/anim_front.png
diff --git a/graphics/pokemon/back_pics/hoppip_back_pic.png b/graphics/pokemon/hoppip/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hoppip_back_pic.png
rename to graphics/pokemon/hoppip/back.png
diff --git a/graphics/pokemon/footprints/hoppip_footprint.png b/graphics/pokemon/hoppip/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hoppip_footprint.png
rename to graphics/pokemon/hoppip/footprint.png
diff --git a/graphics/pokemon/front_pics/hoppip_still_front_pic.png b/graphics/pokemon/hoppip/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hoppip_still_front_pic.png
rename to graphics/pokemon/hoppip/front.png
diff --git a/graphics/pokemon/icons/hoppip_icon.png b/graphics/pokemon/hoppip/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hoppip_icon.png
rename to graphics/pokemon/hoppip/icon.png
diff --git a/graphics/pokemon/palettes/hoppip_palette.pal b/graphics/pokemon/hoppip/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hoppip_palette.pal
rename to graphics/pokemon/hoppip/normal.pal
diff --git a/graphics/pokemon/palettes/hoppip_shiny_palette.pal b/graphics/pokemon/hoppip/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hoppip_shiny_palette.pal
rename to graphics/pokemon/hoppip/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/horsea_front_pic.png b/graphics/pokemon/horsea/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/horsea_front_pic.png
rename to graphics/pokemon/horsea/anim_front.png
diff --git a/graphics/pokemon/back_pics/horsea_back_pic.png b/graphics/pokemon/horsea/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/horsea_back_pic.png
rename to graphics/pokemon/horsea/back.png
diff --git a/graphics/pokemon/footprints/horsea_footprint.png b/graphics/pokemon/horsea/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/horsea_footprint.png
rename to graphics/pokemon/horsea/footprint.png
diff --git a/graphics/pokemon/front_pics/horsea_still_front_pic.png b/graphics/pokemon/horsea/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/horsea_still_front_pic.png
rename to graphics/pokemon/horsea/front.png
diff --git a/graphics/pokemon/icons/horsea_icon.png b/graphics/pokemon/horsea/icon.png
similarity index 100%
rename from graphics/pokemon/icons/horsea_icon.png
rename to graphics/pokemon/horsea/icon.png
diff --git a/graphics/pokemon/palettes/horsea_palette.pal b/graphics/pokemon/horsea/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/horsea_palette.pal
rename to graphics/pokemon/horsea/normal.pal
diff --git a/graphics/pokemon/palettes/horsea_shiny_palette.pal b/graphics/pokemon/horsea/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/horsea_shiny_palette.pal
rename to graphics/pokemon/horsea/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/houndoom_front_pic.png b/graphics/pokemon/houndoom/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/houndoom_front_pic.png
rename to graphics/pokemon/houndoom/anim_front.png
diff --git a/graphics/pokemon/back_pics/houndoom_back_pic.png b/graphics/pokemon/houndoom/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/houndoom_back_pic.png
rename to graphics/pokemon/houndoom/back.png
diff --git a/graphics/pokemon/footprints/houndoom_footprint.png b/graphics/pokemon/houndoom/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/houndoom_footprint.png
rename to graphics/pokemon/houndoom/footprint.png
diff --git a/graphics/pokemon/front_pics/houndoom_still_front_pic.png b/graphics/pokemon/houndoom/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/houndoom_still_front_pic.png
rename to graphics/pokemon/houndoom/front.png
diff --git a/graphics/pokemon/icons/houndoom_icon.png b/graphics/pokemon/houndoom/icon.png
similarity index 100%
rename from graphics/pokemon/icons/houndoom_icon.png
rename to graphics/pokemon/houndoom/icon.png
diff --git a/graphics/pokemon/palettes/houndoom_palette.pal b/graphics/pokemon/houndoom/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/houndoom_palette.pal
rename to graphics/pokemon/houndoom/normal.pal
diff --git a/graphics/pokemon/palettes/houndoom_shiny_palette.pal b/graphics/pokemon/houndoom/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/houndoom_shiny_palette.pal
rename to graphics/pokemon/houndoom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/houndour_front_pic.png b/graphics/pokemon/houndour/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/houndour_front_pic.png
rename to graphics/pokemon/houndour/anim_front.png
diff --git a/graphics/pokemon/back_pics/houndour_back_pic.png b/graphics/pokemon/houndour/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/houndour_back_pic.png
rename to graphics/pokemon/houndour/back.png
diff --git a/graphics/pokemon/footprints/houndour_footprint.png b/graphics/pokemon/houndour/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/houndour_footprint.png
rename to graphics/pokemon/houndour/footprint.png
diff --git a/graphics/pokemon/front_pics/houndour_still_front_pic.png b/graphics/pokemon/houndour/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/houndour_still_front_pic.png
rename to graphics/pokemon/houndour/front.png
diff --git a/graphics/pokemon/icons/houndour_icon.png b/graphics/pokemon/houndour/icon.png
similarity index 100%
rename from graphics/pokemon/icons/houndour_icon.png
rename to graphics/pokemon/houndour/icon.png
diff --git a/graphics/pokemon/palettes/houndour_palette.pal b/graphics/pokemon/houndour/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/houndour_palette.pal
rename to graphics/pokemon/houndour/normal.pal
diff --git a/graphics/pokemon/palettes/houndour_shiny_palette.pal b/graphics/pokemon/houndour/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/houndour_shiny_palette.pal
rename to graphics/pokemon/houndour/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/huntail_front_pic.png b/graphics/pokemon/huntail/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/huntail_front_pic.png
rename to graphics/pokemon/huntail/anim_front.png
diff --git a/graphics/pokemon/back_pics/huntail_back_pic.png b/graphics/pokemon/huntail/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/huntail_back_pic.png
rename to graphics/pokemon/huntail/back.png
diff --git a/graphics/pokemon/footprints/huntail_footprint.png b/graphics/pokemon/huntail/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/huntail_footprint.png
rename to graphics/pokemon/huntail/footprint.png
diff --git a/graphics/pokemon/front_pics/huntail_still_front_pic.png b/graphics/pokemon/huntail/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/huntail_still_front_pic.png
rename to graphics/pokemon/huntail/front.png
diff --git a/graphics/pokemon/icons/huntail_icon.png b/graphics/pokemon/huntail/icon.png
similarity index 100%
rename from graphics/pokemon/icons/huntail_icon.png
rename to graphics/pokemon/huntail/icon.png
diff --git a/graphics/pokemon/palettes/huntail_palette.pal b/graphics/pokemon/huntail/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/huntail_palette.pal
rename to graphics/pokemon/huntail/normal.pal
diff --git a/graphics/pokemon/palettes/huntail_shiny_palette.pal b/graphics/pokemon/huntail/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/huntail_shiny_palette.pal
rename to graphics/pokemon/huntail/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hypno_front_pic.png b/graphics/pokemon/hypno/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/hypno_front_pic.png
rename to graphics/pokemon/hypno/anim_front.png
diff --git a/graphics/pokemon/back_pics/hypno_back_pic.png b/graphics/pokemon/hypno/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/hypno_back_pic.png
rename to graphics/pokemon/hypno/back.png
diff --git a/graphics/pokemon/footprints/hypno_footprint.png b/graphics/pokemon/hypno/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/hypno_footprint.png
rename to graphics/pokemon/hypno/footprint.png
diff --git a/graphics/pokemon/front_pics/hypno_still_front_pic.png b/graphics/pokemon/hypno/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/hypno_still_front_pic.png
rename to graphics/pokemon/hypno/front.png
diff --git a/graphics/pokemon/icons/hypno_icon.png b/graphics/pokemon/hypno/icon.png
similarity index 100%
rename from graphics/pokemon/icons/hypno_icon.png
rename to graphics/pokemon/hypno/icon.png
diff --git a/graphics/pokemon/palettes/hypno_palette.pal b/graphics/pokemon/hypno/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/hypno_palette.pal
rename to graphics/pokemon/hypno/normal.pal
diff --git a/graphics/pokemon/palettes/hypno_shiny_palette.pal b/graphics/pokemon/hypno/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/hypno_shiny_palette.pal
rename to graphics/pokemon/hypno/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/igglybuff_front_pic.png b/graphics/pokemon/igglybuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/igglybuff_front_pic.png
rename to graphics/pokemon/igglybuff/anim_front.png
diff --git a/graphics/pokemon/back_pics/igglybuff_back_pic.png b/graphics/pokemon/igglybuff/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/igglybuff_back_pic.png
rename to graphics/pokemon/igglybuff/back.png
diff --git a/graphics/pokemon/footprints/igglybuff_footprint.png b/graphics/pokemon/igglybuff/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/igglybuff_footprint.png
rename to graphics/pokemon/igglybuff/footprint.png
diff --git a/graphics/pokemon/front_pics/igglybuff_still_front_pic.png b/graphics/pokemon/igglybuff/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/igglybuff_still_front_pic.png
rename to graphics/pokemon/igglybuff/front.png
diff --git a/graphics/pokemon/icons/igglybuff_icon.png b/graphics/pokemon/igglybuff/icon.png
similarity index 100%
rename from graphics/pokemon/icons/igglybuff_icon.png
rename to graphics/pokemon/igglybuff/icon.png
diff --git a/graphics/pokemon/palettes/igglybuff_palette.pal b/graphics/pokemon/igglybuff/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/igglybuff_palette.pal
rename to graphics/pokemon/igglybuff/normal.pal
diff --git a/graphics/pokemon/palettes/igglybuff_shiny_palette.pal b/graphics/pokemon/igglybuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/igglybuff_shiny_palette.pal
rename to graphics/pokemon/igglybuff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/illumise_front_pic.png b/graphics/pokemon/illumise/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/illumise_front_pic.png
rename to graphics/pokemon/illumise/anim_front.png
diff --git a/graphics/pokemon/back_pics/illumise_back_pic.png b/graphics/pokemon/illumise/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/illumise_back_pic.png
rename to graphics/pokemon/illumise/back.png
diff --git a/graphics/pokemon/footprints/illumise_footprint.png b/graphics/pokemon/illumise/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/illumise_footprint.png
rename to graphics/pokemon/illumise/footprint.png
diff --git a/graphics/pokemon/front_pics/illumise_still_front_pic.png b/graphics/pokemon/illumise/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/illumise_still_front_pic.png
rename to graphics/pokemon/illumise/front.png
diff --git a/graphics/pokemon/icons/illumise_icon.png b/graphics/pokemon/illumise/icon.png
similarity index 100%
rename from graphics/pokemon/icons/illumise_icon.png
rename to graphics/pokemon/illumise/icon.png
diff --git a/graphics/pokemon/palettes/illumise_palette.pal b/graphics/pokemon/illumise/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/illumise_palette.pal
rename to graphics/pokemon/illumise/normal.pal
diff --git a/graphics/pokemon/palettes/illumise_shiny_palette.pal b/graphics/pokemon/illumise/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/illumise_shiny_palette.pal
rename to graphics/pokemon/illumise/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ivysaur_front_pic.png b/graphics/pokemon/ivysaur/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ivysaur_front_pic.png
rename to graphics/pokemon/ivysaur/anim_front.png
diff --git a/graphics/pokemon/back_pics/ivysaur_back_pic.png b/graphics/pokemon/ivysaur/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ivysaur_back_pic.png
rename to graphics/pokemon/ivysaur/back.png
diff --git a/graphics/pokemon/footprints/ivysaur_footprint.png b/graphics/pokemon/ivysaur/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ivysaur_footprint.png
rename to graphics/pokemon/ivysaur/footprint.png
diff --git a/graphics/pokemon/front_pics/ivysaur_still_front_pic.png b/graphics/pokemon/ivysaur/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ivysaur_still_front_pic.png
rename to graphics/pokemon/ivysaur/front.png
diff --git a/graphics/pokemon/icons/ivysaur_icon.png b/graphics/pokemon/ivysaur/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ivysaur_icon.png
rename to graphics/pokemon/ivysaur/icon.png
diff --git a/graphics/pokemon/palettes/ivysaur_palette.pal b/graphics/pokemon/ivysaur/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ivysaur_palette.pal
rename to graphics/pokemon/ivysaur/normal.pal
diff --git a/graphics/pokemon/palettes/ivysaur_shiny_palette.pal b/graphics/pokemon/ivysaur/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ivysaur_shiny_palette.pal
rename to graphics/pokemon/ivysaur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jigglypuff_front_pic.png b/graphics/pokemon/jigglypuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/jigglypuff_front_pic.png
rename to graphics/pokemon/jigglypuff/anim_front.png
diff --git a/graphics/pokemon/back_pics/jigglypuff_back_pic.png b/graphics/pokemon/jigglypuff/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/jigglypuff_back_pic.png
rename to graphics/pokemon/jigglypuff/back.png
diff --git a/graphics/pokemon/footprints/jigglypuff_footprint.png b/graphics/pokemon/jigglypuff/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/jigglypuff_footprint.png
rename to graphics/pokemon/jigglypuff/footprint.png
diff --git a/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png b/graphics/pokemon/jigglypuff/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/jigglypuff_still_front_pic.png
rename to graphics/pokemon/jigglypuff/front.png
diff --git a/graphics/pokemon/icons/jigglypuff_icon.png b/graphics/pokemon/jigglypuff/icon.png
similarity index 100%
rename from graphics/pokemon/icons/jigglypuff_icon.png
rename to graphics/pokemon/jigglypuff/icon.png
diff --git a/graphics/pokemon/palettes/jigglypuff_palette.pal b/graphics/pokemon/jigglypuff/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/jigglypuff_palette.pal
rename to graphics/pokemon/jigglypuff/normal.pal
diff --git a/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal b/graphics/pokemon/jigglypuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/jigglypuff_shiny_palette.pal
rename to graphics/pokemon/jigglypuff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jirachi_front_pic.png b/graphics/pokemon/jirachi/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/jirachi_front_pic.png
rename to graphics/pokemon/jirachi/anim_front.png
diff --git a/graphics/pokemon/back_pics/jirachi_back_pic.png b/graphics/pokemon/jirachi/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/jirachi_back_pic.png
rename to graphics/pokemon/jirachi/back.png
diff --git a/graphics/pokemon/footprints/jirachi_footprint.png b/graphics/pokemon/jirachi/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/jirachi_footprint.png
rename to graphics/pokemon/jirachi/footprint.png
diff --git a/graphics/pokemon/front_pics/jirachi_still_front_pic.png b/graphics/pokemon/jirachi/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/jirachi_still_front_pic.png
rename to graphics/pokemon/jirachi/front.png
diff --git a/graphics/pokemon/icons/jirachi_icon.png b/graphics/pokemon/jirachi/icon.png
similarity index 100%
rename from graphics/pokemon/icons/jirachi_icon.png
rename to graphics/pokemon/jirachi/icon.png
diff --git a/graphics/pokemon/palettes/jirachi_palette.pal b/graphics/pokemon/jirachi/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/jirachi_palette.pal
rename to graphics/pokemon/jirachi/normal.pal
diff --git a/graphics/pokemon/palettes/jirachi_shiny_palette.pal b/graphics/pokemon/jirachi/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/jirachi_shiny_palette.pal
rename to graphics/pokemon/jirachi/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jolteon_front_pic.png b/graphics/pokemon/jolteon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/jolteon_front_pic.png
rename to graphics/pokemon/jolteon/anim_front.png
diff --git a/graphics/pokemon/back_pics/jolteon_back_pic.png b/graphics/pokemon/jolteon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/jolteon_back_pic.png
rename to graphics/pokemon/jolteon/back.png
diff --git a/graphics/pokemon/footprints/jolteon_footprint.png b/graphics/pokemon/jolteon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/jolteon_footprint.png
rename to graphics/pokemon/jolteon/footprint.png
diff --git a/graphics/pokemon/front_pics/jolteon_still_front_pic.png b/graphics/pokemon/jolteon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/jolteon_still_front_pic.png
rename to graphics/pokemon/jolteon/front.png
diff --git a/graphics/pokemon/icons/jolteon_icon.png b/graphics/pokemon/jolteon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/jolteon_icon.png
rename to graphics/pokemon/jolteon/icon.png
diff --git a/graphics/pokemon/palettes/jolteon_palette.pal b/graphics/pokemon/jolteon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/jolteon_palette.pal
rename to graphics/pokemon/jolteon/normal.pal
diff --git a/graphics/pokemon/palettes/jolteon_shiny_palette.pal b/graphics/pokemon/jolteon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/jolteon_shiny_palette.pal
rename to graphics/pokemon/jolteon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jumpluff_front_pic.png b/graphics/pokemon/jumpluff/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/jumpluff_front_pic.png
rename to graphics/pokemon/jumpluff/anim_front.png
diff --git a/graphics/pokemon/back_pics/jumpluff_back_pic.png b/graphics/pokemon/jumpluff/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/jumpluff_back_pic.png
rename to graphics/pokemon/jumpluff/back.png
diff --git a/graphics/pokemon/footprints/jumpluff_footprint.png b/graphics/pokemon/jumpluff/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/jumpluff_footprint.png
rename to graphics/pokemon/jumpluff/footprint.png
diff --git a/graphics/pokemon/front_pics/jumpluff_still_front_pic.png b/graphics/pokemon/jumpluff/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/jumpluff_still_front_pic.png
rename to graphics/pokemon/jumpluff/front.png
diff --git a/graphics/pokemon/icons/jumpluff_icon.png b/graphics/pokemon/jumpluff/icon.png
similarity index 100%
rename from graphics/pokemon/icons/jumpluff_icon.png
rename to graphics/pokemon/jumpluff/icon.png
diff --git a/graphics/pokemon/palettes/jumpluff_palette.pal b/graphics/pokemon/jumpluff/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/jumpluff_palette.pal
rename to graphics/pokemon/jumpluff/normal.pal
diff --git a/graphics/pokemon/palettes/jumpluff_shiny_palette.pal b/graphics/pokemon/jumpluff/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/jumpluff_shiny_palette.pal
rename to graphics/pokemon/jumpluff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jynx_front_pic.png b/graphics/pokemon/jynx/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/jynx_front_pic.png
rename to graphics/pokemon/jynx/anim_front.png
diff --git a/graphics/pokemon/back_pics/jynx_back_pic.png b/graphics/pokemon/jynx/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/jynx_back_pic.png
rename to graphics/pokemon/jynx/back.png
diff --git a/graphics/pokemon/footprints/jynx_footprint.png b/graphics/pokemon/jynx/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/jynx_footprint.png
rename to graphics/pokemon/jynx/footprint.png
diff --git a/graphics/pokemon/front_pics/jynx_still_front_pic.png b/graphics/pokemon/jynx/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/jynx_still_front_pic.png
rename to graphics/pokemon/jynx/front.png
diff --git a/graphics/pokemon/icons/jynx_icon.png b/graphics/pokemon/jynx/icon.png
similarity index 100%
rename from graphics/pokemon/icons/jynx_icon.png
rename to graphics/pokemon/jynx/icon.png
diff --git a/graphics/pokemon/palettes/jynx_palette.pal b/graphics/pokemon/jynx/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/jynx_palette.pal
rename to graphics/pokemon/jynx/normal.pal
diff --git a/graphics/pokemon/palettes/jynx_shiny_palette.pal b/graphics/pokemon/jynx/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/jynx_shiny_palette.pal
rename to graphics/pokemon/jynx/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kabuto_front_pic.png b/graphics/pokemon/kabuto/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kabuto_front_pic.png
rename to graphics/pokemon/kabuto/anim_front.png
diff --git a/graphics/pokemon/back_pics/kabuto_back_pic.png b/graphics/pokemon/kabuto/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kabuto_back_pic.png
rename to graphics/pokemon/kabuto/back.png
diff --git a/graphics/pokemon/footprints/kabuto_footprint.png b/graphics/pokemon/kabuto/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kabuto_footprint.png
rename to graphics/pokemon/kabuto/footprint.png
diff --git a/graphics/pokemon/front_pics/kabuto_still_front_pic.png b/graphics/pokemon/kabuto/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kabuto_still_front_pic.png
rename to graphics/pokemon/kabuto/front.png
diff --git a/graphics/pokemon/icons/kabuto_icon.png b/graphics/pokemon/kabuto/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kabuto_icon.png
rename to graphics/pokemon/kabuto/icon.png
diff --git a/graphics/pokemon/palettes/kabuto_palette.pal b/graphics/pokemon/kabuto/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kabuto_palette.pal
rename to graphics/pokemon/kabuto/normal.pal
diff --git a/graphics/pokemon/palettes/kabuto_shiny_palette.pal b/graphics/pokemon/kabuto/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kabuto_shiny_palette.pal
rename to graphics/pokemon/kabuto/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kabutops_front_pic.png b/graphics/pokemon/kabutops/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kabutops_front_pic.png
rename to graphics/pokemon/kabutops/anim_front.png
diff --git a/graphics/pokemon/back_pics/kabutops_back_pic.png b/graphics/pokemon/kabutops/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kabutops_back_pic.png
rename to graphics/pokemon/kabutops/back.png
diff --git a/graphics/pokemon/footprints/kabutops_footprint.png b/graphics/pokemon/kabutops/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kabutops_footprint.png
rename to graphics/pokemon/kabutops/footprint.png
diff --git a/graphics/pokemon/front_pics/kabutops_still_front_pic.png b/graphics/pokemon/kabutops/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kabutops_still_front_pic.png
rename to graphics/pokemon/kabutops/front.png
diff --git a/graphics/pokemon/icons/kabutops_icon.png b/graphics/pokemon/kabutops/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kabutops_icon.png
rename to graphics/pokemon/kabutops/icon.png
diff --git a/graphics/pokemon/palettes/kabutops_palette.pal b/graphics/pokemon/kabutops/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kabutops_palette.pal
rename to graphics/pokemon/kabutops/normal.pal
diff --git a/graphics/pokemon/palettes/kabutops_shiny_palette.pal b/graphics/pokemon/kabutops/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kabutops_shiny_palette.pal
rename to graphics/pokemon/kabutops/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kadabra_front_pic.png b/graphics/pokemon/kadabra/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kadabra_front_pic.png
rename to graphics/pokemon/kadabra/anim_front.png
diff --git a/graphics/pokemon/back_pics/kadabra_back_pic.png b/graphics/pokemon/kadabra/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kadabra_back_pic.png
rename to graphics/pokemon/kadabra/back.png
diff --git a/graphics/pokemon/footprints/kadabra_footprint.png b/graphics/pokemon/kadabra/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kadabra_footprint.png
rename to graphics/pokemon/kadabra/footprint.png
diff --git a/graphics/pokemon/front_pics/kadabra_still_front_pic.png b/graphics/pokemon/kadabra/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kadabra_still_front_pic.png
rename to graphics/pokemon/kadabra/front.png
diff --git a/graphics/pokemon/icons/kadabra_icon.png b/graphics/pokemon/kadabra/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kadabra_icon.png
rename to graphics/pokemon/kadabra/icon.png
diff --git a/graphics/pokemon/palettes/kadabra_palette.pal b/graphics/pokemon/kadabra/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kadabra_palette.pal
rename to graphics/pokemon/kadabra/normal.pal
diff --git a/graphics/pokemon/palettes/kadabra_shiny_palette.pal b/graphics/pokemon/kadabra/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kadabra_shiny_palette.pal
rename to graphics/pokemon/kadabra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kakuna_front_pic.png b/graphics/pokemon/kakuna/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kakuna_front_pic.png
rename to graphics/pokemon/kakuna/anim_front.png
diff --git a/graphics/pokemon/back_pics/kakuna_back_pic.png b/graphics/pokemon/kakuna/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kakuna_back_pic.png
rename to graphics/pokemon/kakuna/back.png
diff --git a/graphics/pokemon/footprints/kakuna_footprint.png b/graphics/pokemon/kakuna/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kakuna_footprint.png
rename to graphics/pokemon/kakuna/footprint.png
diff --git a/graphics/pokemon/front_pics/kakuna_still_front_pic.png b/graphics/pokemon/kakuna/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kakuna_still_front_pic.png
rename to graphics/pokemon/kakuna/front.png
diff --git a/graphics/pokemon/icons/kakuna_icon.png b/graphics/pokemon/kakuna/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kakuna_icon.png
rename to graphics/pokemon/kakuna/icon.png
diff --git a/graphics/pokemon/palettes/kakuna_palette.pal b/graphics/pokemon/kakuna/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kakuna_palette.pal
rename to graphics/pokemon/kakuna/normal.pal
diff --git a/graphics/pokemon/palettes/kakuna_shiny_palette.pal b/graphics/pokemon/kakuna/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kakuna_shiny_palette.pal
rename to graphics/pokemon/kakuna/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kangaskhan_front_pic.png b/graphics/pokemon/kangaskhan/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kangaskhan_front_pic.png
rename to graphics/pokemon/kangaskhan/anim_front.png
diff --git a/graphics/pokemon/back_pics/kangaskhan_back_pic.png b/graphics/pokemon/kangaskhan/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kangaskhan_back_pic.png
rename to graphics/pokemon/kangaskhan/back.png
diff --git a/graphics/pokemon/footprints/kangaskhan_footprint.png b/graphics/pokemon/kangaskhan/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kangaskhan_footprint.png
rename to graphics/pokemon/kangaskhan/footprint.png
diff --git a/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png b/graphics/pokemon/kangaskhan/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kangaskhan_still_front_pic.png
rename to graphics/pokemon/kangaskhan/front.png
diff --git a/graphics/pokemon/icons/kangaskhan_icon.png b/graphics/pokemon/kangaskhan/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kangaskhan_icon.png
rename to graphics/pokemon/kangaskhan/icon.png
diff --git a/graphics/pokemon/palettes/kangaskhan_palette.pal b/graphics/pokemon/kangaskhan/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kangaskhan_palette.pal
rename to graphics/pokemon/kangaskhan/normal.pal
diff --git a/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal b/graphics/pokemon/kangaskhan/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kangaskhan_shiny_palette.pal
rename to graphics/pokemon/kangaskhan/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kecleon_front_pic.png b/graphics/pokemon/kecleon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kecleon_front_pic.png
rename to graphics/pokemon/kecleon/anim_front.png
diff --git a/graphics/pokemon/back_pics/kecleon_back_pic.png b/graphics/pokemon/kecleon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kecleon_back_pic.png
rename to graphics/pokemon/kecleon/back.png
diff --git a/graphics/pokemon/footprints/kecleon_footprint.png b/graphics/pokemon/kecleon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kecleon_footprint.png
rename to graphics/pokemon/kecleon/footprint.png
diff --git a/graphics/pokemon/front_pics/kecleon_still_front_pic.png b/graphics/pokemon/kecleon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kecleon_still_front_pic.png
rename to graphics/pokemon/kecleon/front.png
diff --git a/graphics/pokemon/icons/kecleon_icon.png b/graphics/pokemon/kecleon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kecleon_icon.png
rename to graphics/pokemon/kecleon/icon.png
diff --git a/graphics/pokemon/palettes/kecleon_palette.pal b/graphics/pokemon/kecleon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kecleon_palette.pal
rename to graphics/pokemon/kecleon/normal.pal
diff --git a/graphics/pokemon/palettes/kecleon_shiny_palette.pal b/graphics/pokemon/kecleon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kecleon_shiny_palette.pal
rename to graphics/pokemon/kecleon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kingdra_front_pic.png b/graphics/pokemon/kingdra/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kingdra_front_pic.png
rename to graphics/pokemon/kingdra/anim_front.png
diff --git a/graphics/pokemon/back_pics/kingdra_back_pic.png b/graphics/pokemon/kingdra/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kingdra_back_pic.png
rename to graphics/pokemon/kingdra/back.png
diff --git a/graphics/pokemon/footprints/kingdra_footprint.png b/graphics/pokemon/kingdra/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kingdra_footprint.png
rename to graphics/pokemon/kingdra/footprint.png
diff --git a/graphics/pokemon/front_pics/kingdra_still_front_pic.png b/graphics/pokemon/kingdra/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kingdra_still_front_pic.png
rename to graphics/pokemon/kingdra/front.png
diff --git a/graphics/pokemon/icons/kingdra_icon.png b/graphics/pokemon/kingdra/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kingdra_icon.png
rename to graphics/pokemon/kingdra/icon.png
diff --git a/graphics/pokemon/palettes/kingdra_palette.pal b/graphics/pokemon/kingdra/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kingdra_palette.pal
rename to graphics/pokemon/kingdra/normal.pal
diff --git a/graphics/pokemon/palettes/kingdra_shiny_palette.pal b/graphics/pokemon/kingdra/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kingdra_shiny_palette.pal
rename to graphics/pokemon/kingdra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kingler_front_pic.png b/graphics/pokemon/kingler/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kingler_front_pic.png
rename to graphics/pokemon/kingler/anim_front.png
diff --git a/graphics/pokemon/back_pics/kingler_back_pic.png b/graphics/pokemon/kingler/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kingler_back_pic.png
rename to graphics/pokemon/kingler/back.png
diff --git a/graphics/pokemon/footprints/kingler_footprint.png b/graphics/pokemon/kingler/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kingler_footprint.png
rename to graphics/pokemon/kingler/footprint.png
diff --git a/graphics/pokemon/front_pics/kingler_still_front_pic.png b/graphics/pokemon/kingler/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kingler_still_front_pic.png
rename to graphics/pokemon/kingler/front.png
diff --git a/graphics/pokemon/icons/kingler_icon.png b/graphics/pokemon/kingler/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kingler_icon.png
rename to graphics/pokemon/kingler/icon.png
diff --git a/graphics/pokemon/palettes/kingler_palette.pal b/graphics/pokemon/kingler/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kingler_palette.pal
rename to graphics/pokemon/kingler/normal.pal
diff --git a/graphics/pokemon/palettes/kingler_shiny_palette.pal b/graphics/pokemon/kingler/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kingler_shiny_palette.pal
rename to graphics/pokemon/kingler/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kirlia_front_pic.png b/graphics/pokemon/kirlia/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kirlia_front_pic.png
rename to graphics/pokemon/kirlia/anim_front.png
diff --git a/graphics/pokemon/back_pics/kirlia_back_pic.png b/graphics/pokemon/kirlia/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kirlia_back_pic.png
rename to graphics/pokemon/kirlia/back.png
diff --git a/graphics/pokemon/footprints/kirlia_footprint.png b/graphics/pokemon/kirlia/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kirlia_footprint.png
rename to graphics/pokemon/kirlia/footprint.png
diff --git a/graphics/pokemon/front_pics/kirlia_still_front_pic.png b/graphics/pokemon/kirlia/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kirlia_still_front_pic.png
rename to graphics/pokemon/kirlia/front.png
diff --git a/graphics/pokemon/icons/kirlia_icon.png b/graphics/pokemon/kirlia/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kirlia_icon.png
rename to graphics/pokemon/kirlia/icon.png
diff --git a/graphics/pokemon/palettes/kirlia_palette.pal b/graphics/pokemon/kirlia/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kirlia_palette.pal
rename to graphics/pokemon/kirlia/normal.pal
diff --git a/graphics/pokemon/palettes/kirlia_shiny_palette.pal b/graphics/pokemon/kirlia/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kirlia_shiny_palette.pal
rename to graphics/pokemon/kirlia/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/koffing_front_pic.png b/graphics/pokemon/koffing/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/koffing_front_pic.png
rename to graphics/pokemon/koffing/anim_front.png
diff --git a/graphics/pokemon/back_pics/koffing_back_pic.png b/graphics/pokemon/koffing/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/koffing_back_pic.png
rename to graphics/pokemon/koffing/back.png
diff --git a/graphics/pokemon/footprints/koffing_footprint.png b/graphics/pokemon/koffing/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/koffing_footprint.png
rename to graphics/pokemon/koffing/footprint.png
diff --git a/graphics/pokemon/front_pics/koffing_still_front_pic.png b/graphics/pokemon/koffing/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/koffing_still_front_pic.png
rename to graphics/pokemon/koffing/front.png
diff --git a/graphics/pokemon/icons/koffing_icon.png b/graphics/pokemon/koffing/icon.png
similarity index 100%
rename from graphics/pokemon/icons/koffing_icon.png
rename to graphics/pokemon/koffing/icon.png
diff --git a/graphics/pokemon/palettes/koffing_palette.pal b/graphics/pokemon/koffing/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/koffing_palette.pal
rename to graphics/pokemon/koffing/normal.pal
diff --git a/graphics/pokemon/palettes/koffing_shiny_palette.pal b/graphics/pokemon/koffing/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/koffing_shiny_palette.pal
rename to graphics/pokemon/koffing/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/krabby_front_pic.png b/graphics/pokemon/krabby/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/krabby_front_pic.png
rename to graphics/pokemon/krabby/anim_front.png
diff --git a/graphics/pokemon/back_pics/krabby_back_pic.png b/graphics/pokemon/krabby/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/krabby_back_pic.png
rename to graphics/pokemon/krabby/back.png
diff --git a/graphics/pokemon/footprints/krabby_footprint.png b/graphics/pokemon/krabby/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/krabby_footprint.png
rename to graphics/pokemon/krabby/footprint.png
diff --git a/graphics/pokemon/front_pics/krabby_still_front_pic.png b/graphics/pokemon/krabby/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/krabby_still_front_pic.png
rename to graphics/pokemon/krabby/front.png
diff --git a/graphics/pokemon/icons/krabby_icon.png b/graphics/pokemon/krabby/icon.png
similarity index 100%
rename from graphics/pokemon/icons/krabby_icon.png
rename to graphics/pokemon/krabby/icon.png
diff --git a/graphics/pokemon/palettes/krabby_palette.pal b/graphics/pokemon/krabby/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/krabby_palette.pal
rename to graphics/pokemon/krabby/normal.pal
diff --git a/graphics/pokemon/palettes/krabby_shiny_palette.pal b/graphics/pokemon/krabby/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/krabby_shiny_palette.pal
rename to graphics/pokemon/krabby/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kyogre_front_pic.png b/graphics/pokemon/kyogre/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/kyogre_front_pic.png
rename to graphics/pokemon/kyogre/anim_front.png
diff --git a/graphics/pokemon/back_pics/kyogre_back_pic.png b/graphics/pokemon/kyogre/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/kyogre_back_pic.png
rename to graphics/pokemon/kyogre/back.png
diff --git a/graphics/pokemon/footprints/kyogre_footprint.png b/graphics/pokemon/kyogre/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/kyogre_footprint.png
rename to graphics/pokemon/kyogre/footprint.png
diff --git a/graphics/pokemon/front_pics/kyogre_still_front_pic.png b/graphics/pokemon/kyogre/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/kyogre_still_front_pic.png
rename to graphics/pokemon/kyogre/front.png
diff --git a/graphics/pokemon/icons/kyogre_icon.png b/graphics/pokemon/kyogre/icon.png
similarity index 100%
rename from graphics/pokemon/icons/kyogre_icon.png
rename to graphics/pokemon/kyogre/icon.png
diff --git a/graphics/pokemon/palettes/kyogre_palette.pal b/graphics/pokemon/kyogre/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/kyogre_palette.pal
rename to graphics/pokemon/kyogre/normal.pal
diff --git a/graphics/pokemon/palettes/kyogre_shiny_palette.pal b/graphics/pokemon/kyogre/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/kyogre_shiny_palette.pal
rename to graphics/pokemon/kyogre/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lairon_front_pic.png b/graphics/pokemon/lairon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lairon_front_pic.png
rename to graphics/pokemon/lairon/anim_front.png
diff --git a/graphics/pokemon/back_pics/lairon_back_pic.png b/graphics/pokemon/lairon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lairon_back_pic.png
rename to graphics/pokemon/lairon/back.png
diff --git a/graphics/pokemon/footprints/lairon_footprint.png b/graphics/pokemon/lairon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lairon_footprint.png
rename to graphics/pokemon/lairon/footprint.png
diff --git a/graphics/pokemon/front_pics/lairon_still_front_pic.png b/graphics/pokemon/lairon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lairon_still_front_pic.png
rename to graphics/pokemon/lairon/front.png
diff --git a/graphics/pokemon/icons/lairon_icon.png b/graphics/pokemon/lairon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lairon_icon.png
rename to graphics/pokemon/lairon/icon.png
diff --git a/graphics/pokemon/palettes/lairon_palette.pal b/graphics/pokemon/lairon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lairon_palette.pal
rename to graphics/pokemon/lairon/normal.pal
diff --git a/graphics/pokemon/palettes/lairon_shiny_palette.pal b/graphics/pokemon/lairon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lairon_shiny_palette.pal
rename to graphics/pokemon/lairon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lanturn_front_pic.png b/graphics/pokemon/lanturn/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lanturn_front_pic.png
rename to graphics/pokemon/lanturn/anim_front.png
diff --git a/graphics/pokemon/back_pics/lanturn_back_pic.png b/graphics/pokemon/lanturn/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lanturn_back_pic.png
rename to graphics/pokemon/lanturn/back.png
diff --git a/graphics/pokemon/footprints/lanturn_footprint.png b/graphics/pokemon/lanturn/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lanturn_footprint.png
rename to graphics/pokemon/lanturn/footprint.png
diff --git a/graphics/pokemon/front_pics/lanturn_still_front_pic.png b/graphics/pokemon/lanturn/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lanturn_still_front_pic.png
rename to graphics/pokemon/lanturn/front.png
diff --git a/graphics/pokemon/icons/lanturn_icon.png b/graphics/pokemon/lanturn/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lanturn_icon.png
rename to graphics/pokemon/lanturn/icon.png
diff --git a/graphics/pokemon/palettes/lanturn_palette.pal b/graphics/pokemon/lanturn/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lanturn_palette.pal
rename to graphics/pokemon/lanturn/normal.pal
diff --git a/graphics/pokemon/palettes/lanturn_shiny_palette.pal b/graphics/pokemon/lanturn/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lanturn_shiny_palette.pal
rename to graphics/pokemon/lanturn/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lapras_front_pic.png b/graphics/pokemon/lapras/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lapras_front_pic.png
rename to graphics/pokemon/lapras/anim_front.png
diff --git a/graphics/pokemon/back_pics/lapras_back_pic.png b/graphics/pokemon/lapras/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lapras_back_pic.png
rename to graphics/pokemon/lapras/back.png
diff --git a/graphics/pokemon/footprints/lapras_footprint.png b/graphics/pokemon/lapras/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lapras_footprint.png
rename to graphics/pokemon/lapras/footprint.png
diff --git a/graphics/pokemon/front_pics/lapras_still_front_pic.png b/graphics/pokemon/lapras/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lapras_still_front_pic.png
rename to graphics/pokemon/lapras/front.png
diff --git a/graphics/pokemon/icons/lapras_icon.png b/graphics/pokemon/lapras/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lapras_icon.png
rename to graphics/pokemon/lapras/icon.png
diff --git a/graphics/pokemon/palettes/lapras_palette.pal b/graphics/pokemon/lapras/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lapras_palette.pal
rename to graphics/pokemon/lapras/normal.pal
diff --git a/graphics/pokemon/palettes/lapras_shiny_palette.pal b/graphics/pokemon/lapras/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lapras_shiny_palette.pal
rename to graphics/pokemon/lapras/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/larvitar_front_pic.png b/graphics/pokemon/larvitar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/larvitar_front_pic.png
rename to graphics/pokemon/larvitar/anim_front.png
diff --git a/graphics/pokemon/back_pics/larvitar_back_pic.png b/graphics/pokemon/larvitar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/larvitar_back_pic.png
rename to graphics/pokemon/larvitar/back.png
diff --git a/graphics/pokemon/footprints/larvitar_footprint.png b/graphics/pokemon/larvitar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/larvitar_footprint.png
rename to graphics/pokemon/larvitar/footprint.png
diff --git a/graphics/pokemon/front_pics/larvitar_still_front_pic.png b/graphics/pokemon/larvitar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/larvitar_still_front_pic.png
rename to graphics/pokemon/larvitar/front.png
diff --git a/graphics/pokemon/icons/larvitar_icon.png b/graphics/pokemon/larvitar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/larvitar_icon.png
rename to graphics/pokemon/larvitar/icon.png
diff --git a/graphics/pokemon/palettes/larvitar_palette.pal b/graphics/pokemon/larvitar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/larvitar_palette.pal
rename to graphics/pokemon/larvitar/normal.pal
diff --git a/graphics/pokemon/palettes/larvitar_shiny_palette.pal b/graphics/pokemon/larvitar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/larvitar_shiny_palette.pal
rename to graphics/pokemon/larvitar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/latias_front_pic.png b/graphics/pokemon/latias/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/latias_front_pic.png
rename to graphics/pokemon/latias/anim_front.png
diff --git a/graphics/pokemon/back_pics/latias_back_pic.png b/graphics/pokemon/latias/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/latias_back_pic.png
rename to graphics/pokemon/latias/back.png
diff --git a/graphics/pokemon/footprints/latias_footprint.png b/graphics/pokemon/latias/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/latias_footprint.png
rename to graphics/pokemon/latias/footprint.png
diff --git a/graphics/pokemon/front_pics/latias_still_front_pic.png b/graphics/pokemon/latias/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/latias_still_front_pic.png
rename to graphics/pokemon/latias/front.png
diff --git a/graphics/pokemon/icons/latias_icon.png b/graphics/pokemon/latias/icon.png
similarity index 100%
rename from graphics/pokemon/icons/latias_icon.png
rename to graphics/pokemon/latias/icon.png
diff --git a/graphics/pokemon/palettes/latias_palette.pal b/graphics/pokemon/latias/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/latias_palette.pal
rename to graphics/pokemon/latias/normal.pal
diff --git a/graphics/pokemon/palettes/latias_shiny_palette.pal b/graphics/pokemon/latias/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/latias_shiny_palette.pal
rename to graphics/pokemon/latias/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/latios_front_pic.png b/graphics/pokemon/latios/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/latios_front_pic.png
rename to graphics/pokemon/latios/anim_front.png
diff --git a/graphics/pokemon/back_pics/latios_back_pic.png b/graphics/pokemon/latios/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/latios_back_pic.png
rename to graphics/pokemon/latios/back.png
diff --git a/graphics/pokemon/footprints/latios_footprint.png b/graphics/pokemon/latios/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/latios_footprint.png
rename to graphics/pokemon/latios/footprint.png
diff --git a/graphics/pokemon/front_pics/latios_still_front_pic.png b/graphics/pokemon/latios/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/latios_still_front_pic.png
rename to graphics/pokemon/latios/front.png
diff --git a/graphics/pokemon/icons/latios_icon.png b/graphics/pokemon/latios/icon.png
similarity index 100%
rename from graphics/pokemon/icons/latios_icon.png
rename to graphics/pokemon/latios/icon.png
diff --git a/graphics/pokemon/palettes/latios_palette.pal b/graphics/pokemon/latios/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/latios_palette.pal
rename to graphics/pokemon/latios/normal.pal
diff --git a/graphics/pokemon/palettes/latios_shiny_palette.pal b/graphics/pokemon/latios/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/latios_shiny_palette.pal
rename to graphics/pokemon/latios/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ledian_front_pic.png b/graphics/pokemon/ledian/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ledian_front_pic.png
rename to graphics/pokemon/ledian/anim_front.png
diff --git a/graphics/pokemon/back_pics/ledian_back_pic.png b/graphics/pokemon/ledian/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ledian_back_pic.png
rename to graphics/pokemon/ledian/back.png
diff --git a/graphics/pokemon/footprints/ledian_footprint.png b/graphics/pokemon/ledian/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ledian_footprint.png
rename to graphics/pokemon/ledian/footprint.png
diff --git a/graphics/pokemon/front_pics/ledian_still_front_pic.png b/graphics/pokemon/ledian/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ledian_still_front_pic.png
rename to graphics/pokemon/ledian/front.png
diff --git a/graphics/pokemon/icons/ledian_icon.png b/graphics/pokemon/ledian/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ledian_icon.png
rename to graphics/pokemon/ledian/icon.png
diff --git a/graphics/pokemon/palettes/ledian_palette.pal b/graphics/pokemon/ledian/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ledian_palette.pal
rename to graphics/pokemon/ledian/normal.pal
diff --git a/graphics/pokemon/palettes/ledian_shiny_palette.pal b/graphics/pokemon/ledian/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ledian_shiny_palette.pal
rename to graphics/pokemon/ledian/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ledyba_front_pic.png b/graphics/pokemon/ledyba/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ledyba_front_pic.png
rename to graphics/pokemon/ledyba/anim_front.png
diff --git a/graphics/pokemon/back_pics/ledyba_back_pic.png b/graphics/pokemon/ledyba/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ledyba_back_pic.png
rename to graphics/pokemon/ledyba/back.png
diff --git a/graphics/pokemon/footprints/ledyba_footprint.png b/graphics/pokemon/ledyba/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ledyba_footprint.png
rename to graphics/pokemon/ledyba/footprint.png
diff --git a/graphics/pokemon/front_pics/ledyba_still_front_pic.png b/graphics/pokemon/ledyba/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ledyba_still_front_pic.png
rename to graphics/pokemon/ledyba/front.png
diff --git a/graphics/pokemon/icons/ledyba_icon.png b/graphics/pokemon/ledyba/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ledyba_icon.png
rename to graphics/pokemon/ledyba/icon.png
diff --git a/graphics/pokemon/palettes/ledyba_palette.pal b/graphics/pokemon/ledyba/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ledyba_palette.pal
rename to graphics/pokemon/ledyba/normal.pal
diff --git a/graphics/pokemon/palettes/ledyba_shiny_palette.pal b/graphics/pokemon/ledyba/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ledyba_shiny_palette.pal
rename to graphics/pokemon/ledyba/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lickitung_front_pic.png b/graphics/pokemon/lickitung/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lickitung_front_pic.png
rename to graphics/pokemon/lickitung/anim_front.png
diff --git a/graphics/pokemon/back_pics/lickitung_back_pic.png b/graphics/pokemon/lickitung/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lickitung_back_pic.png
rename to graphics/pokemon/lickitung/back.png
diff --git a/graphics/pokemon/footprints/lickitung_footprint.png b/graphics/pokemon/lickitung/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lickitung_footprint.png
rename to graphics/pokemon/lickitung/footprint.png
diff --git a/graphics/pokemon/front_pics/lickitung_still_front_pic.png b/graphics/pokemon/lickitung/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lickitung_still_front_pic.png
rename to graphics/pokemon/lickitung/front.png
diff --git a/graphics/pokemon/icons/lickitung_icon.png b/graphics/pokemon/lickitung/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lickitung_icon.png
rename to graphics/pokemon/lickitung/icon.png
diff --git a/graphics/pokemon/palettes/lickitung_palette.pal b/graphics/pokemon/lickitung/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lickitung_palette.pal
rename to graphics/pokemon/lickitung/normal.pal
diff --git a/graphics/pokemon/palettes/lickitung_shiny_palette.pal b/graphics/pokemon/lickitung/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lickitung_shiny_palette.pal
rename to graphics/pokemon/lickitung/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lileep_front_pic.png b/graphics/pokemon/lileep/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lileep_front_pic.png
rename to graphics/pokemon/lileep/anim_front.png
diff --git a/graphics/pokemon/back_pics/lileep_back_pic.png b/graphics/pokemon/lileep/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lileep_back_pic.png
rename to graphics/pokemon/lileep/back.png
diff --git a/graphics/pokemon/footprints/lileep_footprint.png b/graphics/pokemon/lileep/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lileep_footprint.png
rename to graphics/pokemon/lileep/footprint.png
diff --git a/graphics/pokemon/front_pics/lileep_still_front_pic.png b/graphics/pokemon/lileep/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lileep_still_front_pic.png
rename to graphics/pokemon/lileep/front.png
diff --git a/graphics/pokemon/icons/lileep_icon.png b/graphics/pokemon/lileep/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lileep_icon.png
rename to graphics/pokemon/lileep/icon.png
diff --git a/graphics/pokemon/palettes/lileep_palette.pal b/graphics/pokemon/lileep/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lileep_palette.pal
rename to graphics/pokemon/lileep/normal.pal
diff --git a/graphics/pokemon/palettes/lileep_shiny_palette.pal b/graphics/pokemon/lileep/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lileep_shiny_palette.pal
rename to graphics/pokemon/lileep/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/linoone_front_pic.png b/graphics/pokemon/linoone/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/linoone_front_pic.png
rename to graphics/pokemon/linoone/anim_front.png
diff --git a/graphics/pokemon/back_pics/linoone_back_pic.png b/graphics/pokemon/linoone/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/linoone_back_pic.png
rename to graphics/pokemon/linoone/back.png
diff --git a/graphics/pokemon/footprints/linoone_footprint.png b/graphics/pokemon/linoone/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/linoone_footprint.png
rename to graphics/pokemon/linoone/footprint.png
diff --git a/graphics/pokemon/front_pics/linoone_still_front_pic.png b/graphics/pokemon/linoone/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/linoone_still_front_pic.png
rename to graphics/pokemon/linoone/front.png
diff --git a/graphics/pokemon/icons/linoone_icon.png b/graphics/pokemon/linoone/icon.png
similarity index 100%
rename from graphics/pokemon/icons/linoone_icon.png
rename to graphics/pokemon/linoone/icon.png
diff --git a/graphics/pokemon/palettes/linoone_palette.pal b/graphics/pokemon/linoone/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/linoone_palette.pal
rename to graphics/pokemon/linoone/normal.pal
diff --git a/graphics/pokemon/palettes/linoone_shiny_palette.pal b/graphics/pokemon/linoone/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/linoone_shiny_palette.pal
rename to graphics/pokemon/linoone/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lombre_front_pic.png b/graphics/pokemon/lombre/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lombre_front_pic.png
rename to graphics/pokemon/lombre/anim_front.png
diff --git a/graphics/pokemon/back_pics/lombre_back_pic.png b/graphics/pokemon/lombre/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lombre_back_pic.png
rename to graphics/pokemon/lombre/back.png
diff --git a/graphics/pokemon/footprints/lombre_footprint.png b/graphics/pokemon/lombre/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lombre_footprint.png
rename to graphics/pokemon/lombre/footprint.png
diff --git a/graphics/pokemon/front_pics/lombre_still_front_pic.png b/graphics/pokemon/lombre/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lombre_still_front_pic.png
rename to graphics/pokemon/lombre/front.png
diff --git a/graphics/pokemon/icons/lombre_icon.png b/graphics/pokemon/lombre/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lombre_icon.png
rename to graphics/pokemon/lombre/icon.png
diff --git a/graphics/pokemon/palettes/lombre_palette.pal b/graphics/pokemon/lombre/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lombre_palette.pal
rename to graphics/pokemon/lombre/normal.pal
diff --git a/graphics/pokemon/palettes/lombre_shiny_palette.pal b/graphics/pokemon/lombre/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lombre_shiny_palette.pal
rename to graphics/pokemon/lombre/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lotad_front_pic.png b/graphics/pokemon/lotad/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lotad_front_pic.png
rename to graphics/pokemon/lotad/anim_front.png
diff --git a/graphics/pokemon/back_pics/lotad_back_pic.png b/graphics/pokemon/lotad/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lotad_back_pic.png
rename to graphics/pokemon/lotad/back.png
diff --git a/graphics/pokemon/footprints/lotad_footprint.png b/graphics/pokemon/lotad/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lotad_footprint.png
rename to graphics/pokemon/lotad/footprint.png
diff --git a/graphics/pokemon/front_pics/lotad_still_front_pic.png b/graphics/pokemon/lotad/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lotad_still_front_pic.png
rename to graphics/pokemon/lotad/front.png
diff --git a/graphics/pokemon/icons/lotad_icon.png b/graphics/pokemon/lotad/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lotad_icon.png
rename to graphics/pokemon/lotad/icon.png
diff --git a/graphics/pokemon/palettes/lotad_palette.pal b/graphics/pokemon/lotad/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lotad_palette.pal
rename to graphics/pokemon/lotad/normal.pal
diff --git a/graphics/pokemon/palettes/lotad_shiny_palette.pal b/graphics/pokemon/lotad/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lotad_shiny_palette.pal
rename to graphics/pokemon/lotad/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/loudred_front_pic.png b/graphics/pokemon/loudred/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/loudred_front_pic.png
rename to graphics/pokemon/loudred/anim_front.png
diff --git a/graphics/pokemon/back_pics/loudred_back_pic.png b/graphics/pokemon/loudred/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/loudred_back_pic.png
rename to graphics/pokemon/loudred/back.png
diff --git a/graphics/pokemon/footprints/loudred_footprint.png b/graphics/pokemon/loudred/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/loudred_footprint.png
rename to graphics/pokemon/loudred/footprint.png
diff --git a/graphics/pokemon/front_pics/loudred_still_front_pic.png b/graphics/pokemon/loudred/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/loudred_still_front_pic.png
rename to graphics/pokemon/loudred/front.png
diff --git a/graphics/pokemon/icons/loudred_icon.png b/graphics/pokemon/loudred/icon.png
similarity index 100%
rename from graphics/pokemon/icons/loudred_icon.png
rename to graphics/pokemon/loudred/icon.png
diff --git a/graphics/pokemon/palettes/loudred_palette.pal b/graphics/pokemon/loudred/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/loudred_palette.pal
rename to graphics/pokemon/loudred/normal.pal
diff --git a/graphics/pokemon/palettes/loudred_shiny_palette.pal b/graphics/pokemon/loudred/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/loudred_shiny_palette.pal
rename to graphics/pokemon/loudred/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ludicolo_front_pic.png b/graphics/pokemon/ludicolo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ludicolo_front_pic.png
rename to graphics/pokemon/ludicolo/anim_front.png
diff --git a/graphics/pokemon/back_pics/ludicolo_back_pic.png b/graphics/pokemon/ludicolo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ludicolo_back_pic.png
rename to graphics/pokemon/ludicolo/back.png
diff --git a/graphics/pokemon/footprints/ludicolo_footprint.png b/graphics/pokemon/ludicolo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ludicolo_footprint.png
rename to graphics/pokemon/ludicolo/footprint.png
diff --git a/graphics/pokemon/front_pics/ludicolo_still_front_pic.png b/graphics/pokemon/ludicolo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ludicolo_still_front_pic.png
rename to graphics/pokemon/ludicolo/front.png
diff --git a/graphics/pokemon/icons/ludicolo_icon.png b/graphics/pokemon/ludicolo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ludicolo_icon.png
rename to graphics/pokemon/ludicolo/icon.png
diff --git a/graphics/pokemon/palettes/ludicolo_palette.pal b/graphics/pokemon/ludicolo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ludicolo_palette.pal
rename to graphics/pokemon/ludicolo/normal.pal
diff --git a/graphics/pokemon/palettes/ludicolo_shiny_palette.pal b/graphics/pokemon/ludicolo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ludicolo_shiny_palette.pal
rename to graphics/pokemon/ludicolo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lugia_front_pic.png b/graphics/pokemon/lugia/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lugia_front_pic.png
rename to graphics/pokemon/lugia/anim_front.png
diff --git a/graphics/pokemon/back_pics/lugia_back_pic.png b/graphics/pokemon/lugia/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lugia_back_pic.png
rename to graphics/pokemon/lugia/back.png
diff --git a/graphics/pokemon/footprints/lugia_footprint.png b/graphics/pokemon/lugia/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lugia_footprint.png
rename to graphics/pokemon/lugia/footprint.png
diff --git a/graphics/pokemon/front_pics/lugia_still_front_pic.png b/graphics/pokemon/lugia/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lugia_still_front_pic.png
rename to graphics/pokemon/lugia/front.png
diff --git a/graphics/pokemon/icons/lugia_icon.png b/graphics/pokemon/lugia/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lugia_icon.png
rename to graphics/pokemon/lugia/icon.png
diff --git a/graphics/pokemon/palettes/lugia_palette.pal b/graphics/pokemon/lugia/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lugia_palette.pal
rename to graphics/pokemon/lugia/normal.pal
diff --git a/graphics/pokemon/palettes/lugia_shiny_palette.pal b/graphics/pokemon/lugia/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lugia_shiny_palette.pal
rename to graphics/pokemon/lugia/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lunatone_front_pic.png b/graphics/pokemon/lunatone/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/lunatone_front_pic.png
rename to graphics/pokemon/lunatone/anim_front.png
diff --git a/graphics/pokemon/back_pics/lunatone_back_pic.png b/graphics/pokemon/lunatone/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/lunatone_back_pic.png
rename to graphics/pokemon/lunatone/back.png
diff --git a/graphics/pokemon/footprints/lunatone_footprint.png b/graphics/pokemon/lunatone/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/lunatone_footprint.png
rename to graphics/pokemon/lunatone/footprint.png
diff --git a/graphics/pokemon/front_pics/lunatone_still_front_pic.png b/graphics/pokemon/lunatone/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/lunatone_still_front_pic.png
rename to graphics/pokemon/lunatone/front.png
diff --git a/graphics/pokemon/icons/lunatone_icon.png b/graphics/pokemon/lunatone/icon.png
similarity index 100%
rename from graphics/pokemon/icons/lunatone_icon.png
rename to graphics/pokemon/lunatone/icon.png
diff --git a/graphics/pokemon/palettes/lunatone_palette.pal b/graphics/pokemon/lunatone/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/lunatone_palette.pal
rename to graphics/pokemon/lunatone/normal.pal
diff --git a/graphics/pokemon/palettes/lunatone_shiny_palette.pal b/graphics/pokemon/lunatone/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/lunatone_shiny_palette.pal
rename to graphics/pokemon/lunatone/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/luvdisc_front_pic.png b/graphics/pokemon/luvdisc/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/luvdisc_front_pic.png
rename to graphics/pokemon/luvdisc/anim_front.png
diff --git a/graphics/pokemon/back_pics/luvdisc_back_pic.png b/graphics/pokemon/luvdisc/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/luvdisc_back_pic.png
rename to graphics/pokemon/luvdisc/back.png
diff --git a/graphics/pokemon/footprints/luvdisc_footprint.png b/graphics/pokemon/luvdisc/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/luvdisc_footprint.png
rename to graphics/pokemon/luvdisc/footprint.png
diff --git a/graphics/pokemon/front_pics/luvdisc_still_front_pic.png b/graphics/pokemon/luvdisc/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/luvdisc_still_front_pic.png
rename to graphics/pokemon/luvdisc/front.png
diff --git a/graphics/pokemon/icons/luvdisc_icon.png b/graphics/pokemon/luvdisc/icon.png
similarity index 100%
rename from graphics/pokemon/icons/luvdisc_icon.png
rename to graphics/pokemon/luvdisc/icon.png
diff --git a/graphics/pokemon/palettes/luvdisc_palette.pal b/graphics/pokemon/luvdisc/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/luvdisc_palette.pal
rename to graphics/pokemon/luvdisc/normal.pal
diff --git a/graphics/pokemon/palettes/luvdisc_shiny_palette.pal b/graphics/pokemon/luvdisc/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/luvdisc_shiny_palette.pal
rename to graphics/pokemon/luvdisc/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/machamp_front_pic.png b/graphics/pokemon/machamp/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/machamp_front_pic.png
rename to graphics/pokemon/machamp/anim_front.png
diff --git a/graphics/pokemon/back_pics/machamp_back_pic.png b/graphics/pokemon/machamp/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/machamp_back_pic.png
rename to graphics/pokemon/machamp/back.png
diff --git a/graphics/pokemon/footprints/machamp_footprint.png b/graphics/pokemon/machamp/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/machamp_footprint.png
rename to graphics/pokemon/machamp/footprint.png
diff --git a/graphics/pokemon/front_pics/machamp_still_front_pic.png b/graphics/pokemon/machamp/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/machamp_still_front_pic.png
rename to graphics/pokemon/machamp/front.png
diff --git a/graphics/pokemon/icons/machamp_icon.png b/graphics/pokemon/machamp/icon.png
similarity index 100%
rename from graphics/pokemon/icons/machamp_icon.png
rename to graphics/pokemon/machamp/icon.png
diff --git a/graphics/pokemon/palettes/machamp_palette.pal b/graphics/pokemon/machamp/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/machamp_palette.pal
rename to graphics/pokemon/machamp/normal.pal
diff --git a/graphics/pokemon/palettes/machamp_shiny_palette.pal b/graphics/pokemon/machamp/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/machamp_shiny_palette.pal
rename to graphics/pokemon/machamp/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/machoke_front_pic.png b/graphics/pokemon/machoke/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/machoke_front_pic.png
rename to graphics/pokemon/machoke/anim_front.png
diff --git a/graphics/pokemon/back_pics/machoke_back_pic.png b/graphics/pokemon/machoke/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/machoke_back_pic.png
rename to graphics/pokemon/machoke/back.png
diff --git a/graphics/pokemon/footprints/machoke_footprint.png b/graphics/pokemon/machoke/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/machoke_footprint.png
rename to graphics/pokemon/machoke/footprint.png
diff --git a/graphics/pokemon/front_pics/machoke_still_front_pic.png b/graphics/pokemon/machoke/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/machoke_still_front_pic.png
rename to graphics/pokemon/machoke/front.png
diff --git a/graphics/pokemon/icons/machoke_icon.png b/graphics/pokemon/machoke/icon.png
similarity index 100%
rename from graphics/pokemon/icons/machoke_icon.png
rename to graphics/pokemon/machoke/icon.png
diff --git a/graphics/pokemon/palettes/machoke_palette.pal b/graphics/pokemon/machoke/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/machoke_palette.pal
rename to graphics/pokemon/machoke/normal.pal
diff --git a/graphics/pokemon/palettes/machoke_shiny_palette.pal b/graphics/pokemon/machoke/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/machoke_shiny_palette.pal
rename to graphics/pokemon/machoke/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/machop_front_pic.png b/graphics/pokemon/machop/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/machop_front_pic.png
rename to graphics/pokemon/machop/anim_front.png
diff --git a/graphics/pokemon/back_pics/machop_back_pic.png b/graphics/pokemon/machop/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/machop_back_pic.png
rename to graphics/pokemon/machop/back.png
diff --git a/graphics/pokemon/footprints/machop_footprint.png b/graphics/pokemon/machop/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/machop_footprint.png
rename to graphics/pokemon/machop/footprint.png
diff --git a/graphics/pokemon/front_pics/machop_still_front_pic.png b/graphics/pokemon/machop/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/machop_still_front_pic.png
rename to graphics/pokemon/machop/front.png
diff --git a/graphics/pokemon/icons/machop_icon.png b/graphics/pokemon/machop/icon.png
similarity index 100%
rename from graphics/pokemon/icons/machop_icon.png
rename to graphics/pokemon/machop/icon.png
diff --git a/graphics/pokemon/palettes/machop_palette.pal b/graphics/pokemon/machop/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/machop_palette.pal
rename to graphics/pokemon/machop/normal.pal
diff --git a/graphics/pokemon/palettes/machop_shiny_palette.pal b/graphics/pokemon/machop/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/machop_shiny_palette.pal
rename to graphics/pokemon/machop/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magby_front_pic.png b/graphics/pokemon/magby/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/magby_front_pic.png
rename to graphics/pokemon/magby/anim_front.png
diff --git a/graphics/pokemon/back_pics/magby_back_pic.png b/graphics/pokemon/magby/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/magby_back_pic.png
rename to graphics/pokemon/magby/back.png
diff --git a/graphics/pokemon/footprints/magby_footprint.png b/graphics/pokemon/magby/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/magby_footprint.png
rename to graphics/pokemon/magby/footprint.png
diff --git a/graphics/pokemon/front_pics/magby_still_front_pic.png b/graphics/pokemon/magby/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/magby_still_front_pic.png
rename to graphics/pokemon/magby/front.png
diff --git a/graphics/pokemon/icons/magby_icon.png b/graphics/pokemon/magby/icon.png
similarity index 100%
rename from graphics/pokemon/icons/magby_icon.png
rename to graphics/pokemon/magby/icon.png
diff --git a/graphics/pokemon/palettes/magby_palette.pal b/graphics/pokemon/magby/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/magby_palette.pal
rename to graphics/pokemon/magby/normal.pal
diff --git a/graphics/pokemon/palettes/magby_shiny_palette.pal b/graphics/pokemon/magby/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/magby_shiny_palette.pal
rename to graphics/pokemon/magby/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magcargo_front_pic.png b/graphics/pokemon/magcargo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/magcargo_front_pic.png
rename to graphics/pokemon/magcargo/anim_front.png
diff --git a/graphics/pokemon/back_pics/magcargo_back_pic.png b/graphics/pokemon/magcargo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/magcargo_back_pic.png
rename to graphics/pokemon/magcargo/back.png
diff --git a/graphics/pokemon/footprints/magcargo_footprint.png b/graphics/pokemon/magcargo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/magcargo_footprint.png
rename to graphics/pokemon/magcargo/footprint.png
diff --git a/graphics/pokemon/front_pics/magcargo_still_front_pic.png b/graphics/pokemon/magcargo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/magcargo_still_front_pic.png
rename to graphics/pokemon/magcargo/front.png
diff --git a/graphics/pokemon/icons/magcargo_icon.png b/graphics/pokemon/magcargo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/magcargo_icon.png
rename to graphics/pokemon/magcargo/icon.png
diff --git a/graphics/pokemon/palettes/magcargo_palette.pal b/graphics/pokemon/magcargo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/magcargo_palette.pal
rename to graphics/pokemon/magcargo/normal.pal
diff --git a/graphics/pokemon/palettes/magcargo_shiny_palette.pal b/graphics/pokemon/magcargo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/magcargo_shiny_palette.pal
rename to graphics/pokemon/magcargo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magikarp_front_pic.png b/graphics/pokemon/magikarp/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/magikarp_front_pic.png
rename to graphics/pokemon/magikarp/anim_front.png
diff --git a/graphics/pokemon/back_pics/magikarp_back_pic.png b/graphics/pokemon/magikarp/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/magikarp_back_pic.png
rename to graphics/pokemon/magikarp/back.png
diff --git a/graphics/pokemon/footprints/magikarp_footprint.png b/graphics/pokemon/magikarp/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/magikarp_footprint.png
rename to graphics/pokemon/magikarp/footprint.png
diff --git a/graphics/pokemon/front_pics/magikarp_still_front_pic.png b/graphics/pokemon/magikarp/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/magikarp_still_front_pic.png
rename to graphics/pokemon/magikarp/front.png
diff --git a/graphics/pokemon/icons/magikarp_icon.png b/graphics/pokemon/magikarp/icon.png
similarity index 100%
rename from graphics/pokemon/icons/magikarp_icon.png
rename to graphics/pokemon/magikarp/icon.png
diff --git a/graphics/pokemon/palettes/magikarp_palette.pal b/graphics/pokemon/magikarp/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/magikarp_palette.pal
rename to graphics/pokemon/magikarp/normal.pal
diff --git a/graphics/pokemon/palettes/magikarp_shiny_palette.pal b/graphics/pokemon/magikarp/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/magikarp_shiny_palette.pal
rename to graphics/pokemon/magikarp/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magmar_front_pic.png b/graphics/pokemon/magmar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/magmar_front_pic.png
rename to graphics/pokemon/magmar/anim_front.png
diff --git a/graphics/pokemon/back_pics/magmar_back_pic.png b/graphics/pokemon/magmar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/magmar_back_pic.png
rename to graphics/pokemon/magmar/back.png
diff --git a/graphics/pokemon/footprints/magmar_footprint.png b/graphics/pokemon/magmar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/magmar_footprint.png
rename to graphics/pokemon/magmar/footprint.png
diff --git a/graphics/pokemon/front_pics/magmar_still_front_pic.png b/graphics/pokemon/magmar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/magmar_still_front_pic.png
rename to graphics/pokemon/magmar/front.png
diff --git a/graphics/pokemon/icons/magmar_icon.png b/graphics/pokemon/magmar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/magmar_icon.png
rename to graphics/pokemon/magmar/icon.png
diff --git a/graphics/pokemon/palettes/magmar_palette.pal b/graphics/pokemon/magmar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/magmar_palette.pal
rename to graphics/pokemon/magmar/normal.pal
diff --git a/graphics/pokemon/palettes/magmar_shiny_palette.pal b/graphics/pokemon/magmar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/magmar_shiny_palette.pal
rename to graphics/pokemon/magmar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magnemite_front_pic.png b/graphics/pokemon/magnemite/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/magnemite_front_pic.png
rename to graphics/pokemon/magnemite/anim_front.png
diff --git a/graphics/pokemon/back_pics/magnemite_back_pic.png b/graphics/pokemon/magnemite/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/magnemite_back_pic.png
rename to graphics/pokemon/magnemite/back.png
diff --git a/graphics/pokemon/footprints/magnemite_footprint.png b/graphics/pokemon/magnemite/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/magnemite_footprint.png
rename to graphics/pokemon/magnemite/footprint.png
diff --git a/graphics/pokemon/front_pics/magnemite_still_front_pic.png b/graphics/pokemon/magnemite/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/magnemite_still_front_pic.png
rename to graphics/pokemon/magnemite/front.png
diff --git a/graphics/pokemon/icons/magnemite_icon.png b/graphics/pokemon/magnemite/icon.png
similarity index 100%
rename from graphics/pokemon/icons/magnemite_icon.png
rename to graphics/pokemon/magnemite/icon.png
diff --git a/graphics/pokemon/palettes/magnemite_palette.pal b/graphics/pokemon/magnemite/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/magnemite_palette.pal
rename to graphics/pokemon/magnemite/normal.pal
diff --git a/graphics/pokemon/palettes/magnemite_shiny_palette.pal b/graphics/pokemon/magnemite/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/magnemite_shiny_palette.pal
rename to graphics/pokemon/magnemite/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magneton_front_pic.png b/graphics/pokemon/magneton/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/magneton_front_pic.png
rename to graphics/pokemon/magneton/anim_front.png
diff --git a/graphics/pokemon/back_pics/magneton_back_pic.png b/graphics/pokemon/magneton/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/magneton_back_pic.png
rename to graphics/pokemon/magneton/back.png
diff --git a/graphics/pokemon/footprints/magneton_footprint.png b/graphics/pokemon/magneton/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/magneton_footprint.png
rename to graphics/pokemon/magneton/footprint.png
diff --git a/graphics/pokemon/front_pics/magneton_still_front_pic.png b/graphics/pokemon/magneton/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/magneton_still_front_pic.png
rename to graphics/pokemon/magneton/front.png
diff --git a/graphics/pokemon/icons/magneton_icon.png b/graphics/pokemon/magneton/icon.png
similarity index 100%
rename from graphics/pokemon/icons/magneton_icon.png
rename to graphics/pokemon/magneton/icon.png
diff --git a/graphics/pokemon/palettes/magneton_palette.pal b/graphics/pokemon/magneton/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/magneton_palette.pal
rename to graphics/pokemon/magneton/normal.pal
diff --git a/graphics/pokemon/palettes/magneton_shiny_palette.pal b/graphics/pokemon/magneton/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/magneton_shiny_palette.pal
rename to graphics/pokemon/magneton/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/makuhita_front_pic.png b/graphics/pokemon/makuhita/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/makuhita_front_pic.png
rename to graphics/pokemon/makuhita/anim_front.png
diff --git a/graphics/pokemon/back_pics/makuhita_back_pic.png b/graphics/pokemon/makuhita/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/makuhita_back_pic.png
rename to graphics/pokemon/makuhita/back.png
diff --git a/graphics/pokemon/footprints/makuhita_footprint.png b/graphics/pokemon/makuhita/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/makuhita_footprint.png
rename to graphics/pokemon/makuhita/footprint.png
diff --git a/graphics/pokemon/front_pics/makuhita_still_front_pic.png b/graphics/pokemon/makuhita/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/makuhita_still_front_pic.png
rename to graphics/pokemon/makuhita/front.png
diff --git a/graphics/pokemon/icons/makuhita_icon.png b/graphics/pokemon/makuhita/icon.png
similarity index 100%
rename from graphics/pokemon/icons/makuhita_icon.png
rename to graphics/pokemon/makuhita/icon.png
diff --git a/graphics/pokemon/palettes/makuhita_palette.pal b/graphics/pokemon/makuhita/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/makuhita_palette.pal
rename to graphics/pokemon/makuhita/normal.pal
diff --git a/graphics/pokemon/palettes/makuhita_shiny_palette.pal b/graphics/pokemon/makuhita/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/makuhita_shiny_palette.pal
rename to graphics/pokemon/makuhita/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/manectric_front_pic.png b/graphics/pokemon/manectric/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/manectric_front_pic.png
rename to graphics/pokemon/manectric/anim_front.png
diff --git a/graphics/pokemon/back_pics/manectric_back_pic.png b/graphics/pokemon/manectric/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/manectric_back_pic.png
rename to graphics/pokemon/manectric/back.png
diff --git a/graphics/pokemon/footprints/manectric_footprint.png b/graphics/pokemon/manectric/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/manectric_footprint.png
rename to graphics/pokemon/manectric/footprint.png
diff --git a/graphics/pokemon/front_pics/manectric_still_front_pic.png b/graphics/pokemon/manectric/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/manectric_still_front_pic.png
rename to graphics/pokemon/manectric/front.png
diff --git a/graphics/pokemon/icons/manectric_icon.png b/graphics/pokemon/manectric/icon.png
similarity index 100%
rename from graphics/pokemon/icons/manectric_icon.png
rename to graphics/pokemon/manectric/icon.png
diff --git a/graphics/pokemon/palettes/manectric_palette.pal b/graphics/pokemon/manectric/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/manectric_palette.pal
rename to graphics/pokemon/manectric/normal.pal
diff --git a/graphics/pokemon/palettes/manectric_shiny_palette.pal b/graphics/pokemon/manectric/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/manectric_shiny_palette.pal
rename to graphics/pokemon/manectric/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mankey_front_pic.png b/graphics/pokemon/mankey/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mankey_front_pic.png
rename to graphics/pokemon/mankey/anim_front.png
diff --git a/graphics/pokemon/back_pics/mankey_back_pic.png b/graphics/pokemon/mankey/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mankey_back_pic.png
rename to graphics/pokemon/mankey/back.png
diff --git a/graphics/pokemon/footprints/mankey_footprint.png b/graphics/pokemon/mankey/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mankey_footprint.png
rename to graphics/pokemon/mankey/footprint.png
diff --git a/graphics/pokemon/front_pics/mankey_still_front_pic.png b/graphics/pokemon/mankey/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mankey_still_front_pic.png
rename to graphics/pokemon/mankey/front.png
diff --git a/graphics/pokemon/icons/mankey_icon.png b/graphics/pokemon/mankey/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mankey_icon.png
rename to graphics/pokemon/mankey/icon.png
diff --git a/graphics/pokemon/palettes/mankey_palette.pal b/graphics/pokemon/mankey/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mankey_palette.pal
rename to graphics/pokemon/mankey/normal.pal
diff --git a/graphics/pokemon/palettes/mankey_shiny_palette.pal b/graphics/pokemon/mankey/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mankey_shiny_palette.pal
rename to graphics/pokemon/mankey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mantine_front_pic.png b/graphics/pokemon/mantine/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mantine_front_pic.png
rename to graphics/pokemon/mantine/anim_front.png
diff --git a/graphics/pokemon/back_pics/mantine_back_pic.png b/graphics/pokemon/mantine/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mantine_back_pic.png
rename to graphics/pokemon/mantine/back.png
diff --git a/graphics/pokemon/footprints/mantine_footprint.png b/graphics/pokemon/mantine/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mantine_footprint.png
rename to graphics/pokemon/mantine/footprint.png
diff --git a/graphics/pokemon/front_pics/mantine_still_front_pic.png b/graphics/pokemon/mantine/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mantine_still_front_pic.png
rename to graphics/pokemon/mantine/front.png
diff --git a/graphics/pokemon/icons/mantine_icon.png b/graphics/pokemon/mantine/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mantine_icon.png
rename to graphics/pokemon/mantine/icon.png
diff --git a/graphics/pokemon/palettes/mantine_palette.pal b/graphics/pokemon/mantine/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mantine_palette.pal
rename to graphics/pokemon/mantine/normal.pal
diff --git a/graphics/pokemon/palettes/mantine_shiny_palette.pal b/graphics/pokemon/mantine/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mantine_shiny_palette.pal
rename to graphics/pokemon/mantine/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mareep_front_pic.png b/graphics/pokemon/mareep/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mareep_front_pic.png
rename to graphics/pokemon/mareep/anim_front.png
diff --git a/graphics/pokemon/back_pics/mareep_back_pic.png b/graphics/pokemon/mareep/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mareep_back_pic.png
rename to graphics/pokemon/mareep/back.png
diff --git a/graphics/pokemon/footprints/mareep_footprint.png b/graphics/pokemon/mareep/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mareep_footprint.png
rename to graphics/pokemon/mareep/footprint.png
diff --git a/graphics/pokemon/front_pics/mareep_still_front_pic.png b/graphics/pokemon/mareep/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mareep_still_front_pic.png
rename to graphics/pokemon/mareep/front.png
diff --git a/graphics/pokemon/icons/mareep_icon.png b/graphics/pokemon/mareep/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mareep_icon.png
rename to graphics/pokemon/mareep/icon.png
diff --git a/graphics/pokemon/palettes/mareep_palette.pal b/graphics/pokemon/mareep/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mareep_palette.pal
rename to graphics/pokemon/mareep/normal.pal
diff --git a/graphics/pokemon/palettes/mareep_shiny_palette.pal b/graphics/pokemon/mareep/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mareep_shiny_palette.pal
rename to graphics/pokemon/mareep/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/marill_front_pic.png b/graphics/pokemon/marill/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/marill_front_pic.png
rename to graphics/pokemon/marill/anim_front.png
diff --git a/graphics/pokemon/back_pics/marill_back_pic.png b/graphics/pokemon/marill/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/marill_back_pic.png
rename to graphics/pokemon/marill/back.png
diff --git a/graphics/pokemon/footprints/marill_footprint.png b/graphics/pokemon/marill/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/marill_footprint.png
rename to graphics/pokemon/marill/footprint.png
diff --git a/graphics/pokemon/front_pics/marill_still_front_pic.png b/graphics/pokemon/marill/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/marill_still_front_pic.png
rename to graphics/pokemon/marill/front.png
diff --git a/graphics/pokemon/icons/marill_icon.png b/graphics/pokemon/marill/icon.png
similarity index 100%
rename from graphics/pokemon/icons/marill_icon.png
rename to graphics/pokemon/marill/icon.png
diff --git a/graphics/pokemon/palettes/marill_palette.pal b/graphics/pokemon/marill/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/marill_palette.pal
rename to graphics/pokemon/marill/normal.pal
diff --git a/graphics/pokemon/palettes/marill_shiny_palette.pal b/graphics/pokemon/marill/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/marill_shiny_palette.pal
rename to graphics/pokemon/marill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/marowak_front_pic.png b/graphics/pokemon/marowak/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/marowak_front_pic.png
rename to graphics/pokemon/marowak/anim_front.png
diff --git a/graphics/pokemon/back_pics/marowak_back_pic.png b/graphics/pokemon/marowak/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/marowak_back_pic.png
rename to graphics/pokemon/marowak/back.png
diff --git a/graphics/pokemon/footprints/marowak_footprint.png b/graphics/pokemon/marowak/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/marowak_footprint.png
rename to graphics/pokemon/marowak/footprint.png
diff --git a/graphics/pokemon/front_pics/marowak_still_front_pic.png b/graphics/pokemon/marowak/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/marowak_still_front_pic.png
rename to graphics/pokemon/marowak/front.png
diff --git a/graphics/pokemon/icons/marowak_icon.png b/graphics/pokemon/marowak/icon.png
similarity index 100%
rename from graphics/pokemon/icons/marowak_icon.png
rename to graphics/pokemon/marowak/icon.png
diff --git a/graphics/pokemon/palettes/marowak_palette.pal b/graphics/pokemon/marowak/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/marowak_palette.pal
rename to graphics/pokemon/marowak/normal.pal
diff --git a/graphics/pokemon/palettes/marowak_shiny_palette.pal b/graphics/pokemon/marowak/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/marowak_shiny_palette.pal
rename to graphics/pokemon/marowak/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/marshtomp_front_pic.png b/graphics/pokemon/marshtomp/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/marshtomp_front_pic.png
rename to graphics/pokemon/marshtomp/anim_front.png
diff --git a/graphics/pokemon/back_pics/marshtomp_back_pic.png b/graphics/pokemon/marshtomp/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/marshtomp_back_pic.png
rename to graphics/pokemon/marshtomp/back.png
diff --git a/graphics/pokemon/footprints/marshtomp_footprint.png b/graphics/pokemon/marshtomp/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/marshtomp_footprint.png
rename to graphics/pokemon/marshtomp/footprint.png
diff --git a/graphics/pokemon/front_pics/marshtomp_still_front_pic.png b/graphics/pokemon/marshtomp/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/marshtomp_still_front_pic.png
rename to graphics/pokemon/marshtomp/front.png
diff --git a/graphics/pokemon/icons/marshtomp_icon.png b/graphics/pokemon/marshtomp/icon.png
similarity index 100%
rename from graphics/pokemon/icons/marshtomp_icon.png
rename to graphics/pokemon/marshtomp/icon.png
diff --git a/graphics/pokemon/palettes/marshtomp_palette.pal b/graphics/pokemon/marshtomp/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/marshtomp_palette.pal
rename to graphics/pokemon/marshtomp/normal.pal
diff --git a/graphics/pokemon/palettes/marshtomp_shiny_palette.pal b/graphics/pokemon/marshtomp/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/marshtomp_shiny_palette.pal
rename to graphics/pokemon/marshtomp/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/masquerain_front_pic.png b/graphics/pokemon/masquerain/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/masquerain_front_pic.png
rename to graphics/pokemon/masquerain/anim_front.png
diff --git a/graphics/pokemon/back_pics/masquerain_back_pic.png b/graphics/pokemon/masquerain/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/masquerain_back_pic.png
rename to graphics/pokemon/masquerain/back.png
diff --git a/graphics/pokemon/footprints/masquerain_footprint.png b/graphics/pokemon/masquerain/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/masquerain_footprint.png
rename to graphics/pokemon/masquerain/footprint.png
diff --git a/graphics/pokemon/front_pics/masquerain_still_front_pic.png b/graphics/pokemon/masquerain/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/masquerain_still_front_pic.png
rename to graphics/pokemon/masquerain/front.png
diff --git a/graphics/pokemon/icons/masquerain_icon.png b/graphics/pokemon/masquerain/icon.png
similarity index 100%
rename from graphics/pokemon/icons/masquerain_icon.png
rename to graphics/pokemon/masquerain/icon.png
diff --git a/graphics/pokemon/palettes/masquerain_palette.pal b/graphics/pokemon/masquerain/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/masquerain_palette.pal
rename to graphics/pokemon/masquerain/normal.pal
diff --git a/graphics/pokemon/palettes/masquerain_shiny_palette.pal b/graphics/pokemon/masquerain/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/masquerain_shiny_palette.pal
rename to graphics/pokemon/masquerain/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mawile_front_pic.png b/graphics/pokemon/mawile/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mawile_front_pic.png
rename to graphics/pokemon/mawile/anim_front.png
diff --git a/graphics/pokemon/back_pics/mawile_back_pic.png b/graphics/pokemon/mawile/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mawile_back_pic.png
rename to graphics/pokemon/mawile/back.png
diff --git a/graphics/pokemon/footprints/mawile_footprint.png b/graphics/pokemon/mawile/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mawile_footprint.png
rename to graphics/pokemon/mawile/footprint.png
diff --git a/graphics/pokemon/front_pics/mawile_still_front_pic.png b/graphics/pokemon/mawile/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mawile_still_front_pic.png
rename to graphics/pokemon/mawile/front.png
diff --git a/graphics/pokemon/icons/mawile_icon.png b/graphics/pokemon/mawile/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mawile_icon.png
rename to graphics/pokemon/mawile/icon.png
diff --git a/graphics/pokemon/palettes/mawile_palette.pal b/graphics/pokemon/mawile/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mawile_palette.pal
rename to graphics/pokemon/mawile/normal.pal
diff --git a/graphics/pokemon/palettes/mawile_shiny_palette.pal b/graphics/pokemon/mawile/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mawile_shiny_palette.pal
rename to graphics/pokemon/mawile/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/medicham_front_pic.png b/graphics/pokemon/medicham/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/medicham_front_pic.png
rename to graphics/pokemon/medicham/anim_front.png
diff --git a/graphics/pokemon/back_pics/medicham_back_pic.png b/graphics/pokemon/medicham/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/medicham_back_pic.png
rename to graphics/pokemon/medicham/back.png
diff --git a/graphics/pokemon/footprints/medicham_footprint.png b/graphics/pokemon/medicham/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/medicham_footprint.png
rename to graphics/pokemon/medicham/footprint.png
diff --git a/graphics/pokemon/front_pics/medicham_still_front_pic.png b/graphics/pokemon/medicham/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/medicham_still_front_pic.png
rename to graphics/pokemon/medicham/front.png
diff --git a/graphics/pokemon/icons/medicham_icon.png b/graphics/pokemon/medicham/icon.png
similarity index 100%
rename from graphics/pokemon/icons/medicham_icon.png
rename to graphics/pokemon/medicham/icon.png
diff --git a/graphics/pokemon/palettes/medicham_palette.pal b/graphics/pokemon/medicham/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/medicham_palette.pal
rename to graphics/pokemon/medicham/normal.pal
diff --git a/graphics/pokemon/palettes/medicham_shiny_palette.pal b/graphics/pokemon/medicham/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/medicham_shiny_palette.pal
rename to graphics/pokemon/medicham/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/meditite_front_pic.png b/graphics/pokemon/meditite/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/meditite_front_pic.png
rename to graphics/pokemon/meditite/anim_front.png
diff --git a/graphics/pokemon/back_pics/meditite_back_pic.png b/graphics/pokemon/meditite/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/meditite_back_pic.png
rename to graphics/pokemon/meditite/back.png
diff --git a/graphics/pokemon/footprints/meditite_footprint.png b/graphics/pokemon/meditite/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/meditite_footprint.png
rename to graphics/pokemon/meditite/footprint.png
diff --git a/graphics/pokemon/front_pics/meditite_still_front_pic.png b/graphics/pokemon/meditite/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/meditite_still_front_pic.png
rename to graphics/pokemon/meditite/front.png
diff --git a/graphics/pokemon/icons/meditite_icon.png b/graphics/pokemon/meditite/icon.png
similarity index 100%
rename from graphics/pokemon/icons/meditite_icon.png
rename to graphics/pokemon/meditite/icon.png
diff --git a/graphics/pokemon/palettes/meditite_palette.pal b/graphics/pokemon/meditite/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/meditite_palette.pal
rename to graphics/pokemon/meditite/normal.pal
diff --git a/graphics/pokemon/palettes/meditite_shiny_palette.pal b/graphics/pokemon/meditite/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/meditite_shiny_palette.pal
rename to graphics/pokemon/meditite/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/meganium_front_pic.png b/graphics/pokemon/meganium/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/meganium_front_pic.png
rename to graphics/pokemon/meganium/anim_front.png
diff --git a/graphics/pokemon/back_pics/meganium_back_pic.png b/graphics/pokemon/meganium/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/meganium_back_pic.png
rename to graphics/pokemon/meganium/back.png
diff --git a/graphics/pokemon/footprints/meganium_footprint.png b/graphics/pokemon/meganium/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/meganium_footprint.png
rename to graphics/pokemon/meganium/footprint.png
diff --git a/graphics/pokemon/front_pics/meganium_still_front_pic.png b/graphics/pokemon/meganium/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/meganium_still_front_pic.png
rename to graphics/pokemon/meganium/front.png
diff --git a/graphics/pokemon/icons/meganium_icon.png b/graphics/pokemon/meganium/icon.png
similarity index 100%
rename from graphics/pokemon/icons/meganium_icon.png
rename to graphics/pokemon/meganium/icon.png
diff --git a/graphics/pokemon/palettes/meganium_palette.pal b/graphics/pokemon/meganium/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/meganium_palette.pal
rename to graphics/pokemon/meganium/normal.pal
diff --git a/graphics/pokemon/palettes/meganium_shiny_palette.pal b/graphics/pokemon/meganium/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/meganium_shiny_palette.pal
rename to graphics/pokemon/meganium/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/meowth_front_pic.png b/graphics/pokemon/meowth/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/meowth_front_pic.png
rename to graphics/pokemon/meowth/anim_front.png
diff --git a/graphics/pokemon/back_pics/meowth_back_pic.png b/graphics/pokemon/meowth/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/meowth_back_pic.png
rename to graphics/pokemon/meowth/back.png
diff --git a/graphics/pokemon/footprints/meowth_footprint.png b/graphics/pokemon/meowth/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/meowth_footprint.png
rename to graphics/pokemon/meowth/footprint.png
diff --git a/graphics/pokemon/front_pics/meowth_still_front_pic.png b/graphics/pokemon/meowth/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/meowth_still_front_pic.png
rename to graphics/pokemon/meowth/front.png
diff --git a/graphics/pokemon/icons/meowth_icon.png b/graphics/pokemon/meowth/icon.png
similarity index 100%
rename from graphics/pokemon/icons/meowth_icon.png
rename to graphics/pokemon/meowth/icon.png
diff --git a/graphics/pokemon/palettes/meowth_palette.pal b/graphics/pokemon/meowth/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/meowth_palette.pal
rename to graphics/pokemon/meowth/normal.pal
diff --git a/graphics/pokemon/palettes/meowth_shiny_palette.pal b/graphics/pokemon/meowth/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/meowth_shiny_palette.pal
rename to graphics/pokemon/meowth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/metagross_front_pic.png b/graphics/pokemon/metagross/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/metagross_front_pic.png
rename to graphics/pokemon/metagross/anim_front.png
diff --git a/graphics/pokemon/back_pics/metagross_back_pic.png b/graphics/pokemon/metagross/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/metagross_back_pic.png
rename to graphics/pokemon/metagross/back.png
diff --git a/graphics/pokemon/footprints/metagross_footprint.png b/graphics/pokemon/metagross/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/metagross_footprint.png
rename to graphics/pokemon/metagross/footprint.png
diff --git a/graphics/pokemon/front_pics/metagross_still_front_pic.png b/graphics/pokemon/metagross/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/metagross_still_front_pic.png
rename to graphics/pokemon/metagross/front.png
diff --git a/graphics/pokemon/icons/metagross_icon.png b/graphics/pokemon/metagross/icon.png
similarity index 100%
rename from graphics/pokemon/icons/metagross_icon.png
rename to graphics/pokemon/metagross/icon.png
diff --git a/graphics/pokemon/palettes/metagross_palette.pal b/graphics/pokemon/metagross/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/metagross_palette.pal
rename to graphics/pokemon/metagross/normal.pal
diff --git a/graphics/pokemon/palettes/metagross_shiny_palette.pal b/graphics/pokemon/metagross/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/metagross_shiny_palette.pal
rename to graphics/pokemon/metagross/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/metang_front_pic.png b/graphics/pokemon/metang/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/metang_front_pic.png
rename to graphics/pokemon/metang/anim_front.png
diff --git a/graphics/pokemon/back_pics/metang_back_pic.png b/graphics/pokemon/metang/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/metang_back_pic.png
rename to graphics/pokemon/metang/back.png
diff --git a/graphics/pokemon/footprints/metang_footprint.png b/graphics/pokemon/metang/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/metang_footprint.png
rename to graphics/pokemon/metang/footprint.png
diff --git a/graphics/pokemon/front_pics/metang_still_front_pic.png b/graphics/pokemon/metang/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/metang_still_front_pic.png
rename to graphics/pokemon/metang/front.png
diff --git a/graphics/pokemon/icons/metang_icon.png b/graphics/pokemon/metang/icon.png
similarity index 100%
rename from graphics/pokemon/icons/metang_icon.png
rename to graphics/pokemon/metang/icon.png
diff --git a/graphics/pokemon/palettes/metang_palette.pal b/graphics/pokemon/metang/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/metang_palette.pal
rename to graphics/pokemon/metang/normal.pal
diff --git a/graphics/pokemon/palettes/metang_shiny_palette.pal b/graphics/pokemon/metang/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/metang_shiny_palette.pal
rename to graphics/pokemon/metang/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/metapod_front_pic.png b/graphics/pokemon/metapod/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/metapod_front_pic.png
rename to graphics/pokemon/metapod/anim_front.png
diff --git a/graphics/pokemon/back_pics/metapod_back_pic.png b/graphics/pokemon/metapod/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/metapod_back_pic.png
rename to graphics/pokemon/metapod/back.png
diff --git a/graphics/pokemon/footprints/metapod_footprint.png b/graphics/pokemon/metapod/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/metapod_footprint.png
rename to graphics/pokemon/metapod/footprint.png
diff --git a/graphics/pokemon/front_pics/metapod_still_front_pic.png b/graphics/pokemon/metapod/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/metapod_still_front_pic.png
rename to graphics/pokemon/metapod/front.png
diff --git a/graphics/pokemon/icons/metapod_icon.png b/graphics/pokemon/metapod/icon.png
similarity index 100%
rename from graphics/pokemon/icons/metapod_icon.png
rename to graphics/pokemon/metapod/icon.png
diff --git a/graphics/pokemon/palettes/metapod_palette.pal b/graphics/pokemon/metapod/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/metapod_palette.pal
rename to graphics/pokemon/metapod/normal.pal
diff --git a/graphics/pokemon/palettes/metapod_shiny_palette.pal b/graphics/pokemon/metapod/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/metapod_shiny_palette.pal
rename to graphics/pokemon/metapod/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mew_front_pic.png b/graphics/pokemon/mew/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mew_front_pic.png
rename to graphics/pokemon/mew/anim_front.png
diff --git a/graphics/pokemon/back_pics/mew_back_pic.png b/graphics/pokemon/mew/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mew_back_pic.png
rename to graphics/pokemon/mew/back.png
diff --git a/graphics/pokemon/footprints/mew_footprint.png b/graphics/pokemon/mew/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mew_footprint.png
rename to graphics/pokemon/mew/footprint.png
diff --git a/graphics/pokemon/front_pics/mew_still_front_pic.png b/graphics/pokemon/mew/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mew_still_front_pic.png
rename to graphics/pokemon/mew/front.png
diff --git a/graphics/pokemon/icons/mew_icon.png b/graphics/pokemon/mew/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mew_icon.png
rename to graphics/pokemon/mew/icon.png
diff --git a/graphics/pokemon/palettes/mew_palette.pal b/graphics/pokemon/mew/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mew_palette.pal
rename to graphics/pokemon/mew/normal.pal
diff --git a/graphics/pokemon/palettes/mew_shiny_palette.pal b/graphics/pokemon/mew/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mew_shiny_palette.pal
rename to graphics/pokemon/mew/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mewtwo_front_pic.png b/graphics/pokemon/mewtwo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mewtwo_front_pic.png
rename to graphics/pokemon/mewtwo/anim_front.png
diff --git a/graphics/pokemon/back_pics/mewtwo_back_pic.png b/graphics/pokemon/mewtwo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mewtwo_back_pic.png
rename to graphics/pokemon/mewtwo/back.png
diff --git a/graphics/pokemon/footprints/mewtwo_footprint.png b/graphics/pokemon/mewtwo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mewtwo_footprint.png
rename to graphics/pokemon/mewtwo/footprint.png
diff --git a/graphics/pokemon/front_pics/mewtwo_still_front_pic.png b/graphics/pokemon/mewtwo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mewtwo_still_front_pic.png
rename to graphics/pokemon/mewtwo/front.png
diff --git a/graphics/pokemon/icons/mewtwo_icon.png b/graphics/pokemon/mewtwo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mewtwo_icon.png
rename to graphics/pokemon/mewtwo/icon.png
diff --git a/graphics/pokemon/palettes/mewtwo_palette.pal b/graphics/pokemon/mewtwo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mewtwo_palette.pal
rename to graphics/pokemon/mewtwo/normal.pal
diff --git a/graphics/pokemon/palettes/mewtwo_shiny_palette.pal b/graphics/pokemon/mewtwo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mewtwo_shiny_palette.pal
rename to graphics/pokemon/mewtwo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mightyena_front_pic.png b/graphics/pokemon/mightyena/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mightyena_front_pic.png
rename to graphics/pokemon/mightyena/anim_front.png
diff --git a/graphics/pokemon/back_pics/mightyena_back_pic.png b/graphics/pokemon/mightyena/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mightyena_back_pic.png
rename to graphics/pokemon/mightyena/back.png
diff --git a/graphics/pokemon/footprints/mightyena_footprint.png b/graphics/pokemon/mightyena/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mightyena_footprint.png
rename to graphics/pokemon/mightyena/footprint.png
diff --git a/graphics/pokemon/front_pics/mightyena_still_front_pic.png b/graphics/pokemon/mightyena/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mightyena_still_front_pic.png
rename to graphics/pokemon/mightyena/front.png
diff --git a/graphics/pokemon/icons/mightyena_icon.png b/graphics/pokemon/mightyena/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mightyena_icon.png
rename to graphics/pokemon/mightyena/icon.png
diff --git a/graphics/pokemon/palettes/mightyena_palette.pal b/graphics/pokemon/mightyena/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mightyena_palette.pal
rename to graphics/pokemon/mightyena/normal.pal
diff --git a/graphics/pokemon/palettes/mightyena_shiny_palette.pal b/graphics/pokemon/mightyena/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mightyena_shiny_palette.pal
rename to graphics/pokemon/mightyena/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/milotic_front_pic.png b/graphics/pokemon/milotic/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/milotic_front_pic.png
rename to graphics/pokemon/milotic/anim_front.png
diff --git a/graphics/pokemon/back_pics/milotic_back_pic.png b/graphics/pokemon/milotic/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/milotic_back_pic.png
rename to graphics/pokemon/milotic/back.png
diff --git a/graphics/pokemon/footprints/milotic_footprint.png b/graphics/pokemon/milotic/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/milotic_footprint.png
rename to graphics/pokemon/milotic/footprint.png
diff --git a/graphics/pokemon/front_pics/milotic_still_front_pic.png b/graphics/pokemon/milotic/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/milotic_still_front_pic.png
rename to graphics/pokemon/milotic/front.png
diff --git a/graphics/pokemon/icons/milotic_icon.png b/graphics/pokemon/milotic/icon.png
similarity index 100%
rename from graphics/pokemon/icons/milotic_icon.png
rename to graphics/pokemon/milotic/icon.png
diff --git a/graphics/pokemon/palettes/milotic_palette.pal b/graphics/pokemon/milotic/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/milotic_palette.pal
rename to graphics/pokemon/milotic/normal.pal
diff --git a/graphics/pokemon/palettes/milotic_shiny_palette.pal b/graphics/pokemon/milotic/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/milotic_shiny_palette.pal
rename to graphics/pokemon/milotic/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/miltank_front_pic.png b/graphics/pokemon/miltank/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/miltank_front_pic.png
rename to graphics/pokemon/miltank/anim_front.png
diff --git a/graphics/pokemon/back_pics/miltank_back_pic.png b/graphics/pokemon/miltank/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/miltank_back_pic.png
rename to graphics/pokemon/miltank/back.png
diff --git a/graphics/pokemon/footprints/miltank_footprint.png b/graphics/pokemon/miltank/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/miltank_footprint.png
rename to graphics/pokemon/miltank/footprint.png
diff --git a/graphics/pokemon/front_pics/miltank_still_front_pic.png b/graphics/pokemon/miltank/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/miltank_still_front_pic.png
rename to graphics/pokemon/miltank/front.png
diff --git a/graphics/pokemon/icons/miltank_icon.png b/graphics/pokemon/miltank/icon.png
similarity index 100%
rename from graphics/pokemon/icons/miltank_icon.png
rename to graphics/pokemon/miltank/icon.png
diff --git a/graphics/pokemon/palettes/miltank_palette.pal b/graphics/pokemon/miltank/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/miltank_palette.pal
rename to graphics/pokemon/miltank/normal.pal
diff --git a/graphics/pokemon/palettes/miltank_shiny_palette.pal b/graphics/pokemon/miltank/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/miltank_shiny_palette.pal
rename to graphics/pokemon/miltank/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/minun_front_pic.png b/graphics/pokemon/minun/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/minun_front_pic.png
rename to graphics/pokemon/minun/anim_front.png
diff --git a/graphics/pokemon/back_pics/minun_back_pic.png b/graphics/pokemon/minun/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/minun_back_pic.png
rename to graphics/pokemon/minun/back.png
diff --git a/graphics/pokemon/footprints/minun_footprint.png b/graphics/pokemon/minun/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/minun_footprint.png
rename to graphics/pokemon/minun/footprint.png
diff --git a/graphics/pokemon/front_pics/minun_still_front_pic.png b/graphics/pokemon/minun/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/minun_still_front_pic.png
rename to graphics/pokemon/minun/front.png
diff --git a/graphics/pokemon/icons/minun_icon.png b/graphics/pokemon/minun/icon.png
similarity index 100%
rename from graphics/pokemon/icons/minun_icon.png
rename to graphics/pokemon/minun/icon.png
diff --git a/graphics/pokemon/palettes/minun_palette.pal b/graphics/pokemon/minun/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/minun_palette.pal
rename to graphics/pokemon/minun/normal.pal
diff --git a/graphics/pokemon/palettes/minun_shiny_palette.pal b/graphics/pokemon/minun/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/minun_shiny_palette.pal
rename to graphics/pokemon/minun/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/misdreavus_front_pic.png b/graphics/pokemon/misdreavus/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/misdreavus_front_pic.png
rename to graphics/pokemon/misdreavus/anim_front.png
diff --git a/graphics/pokemon/back_pics/misdreavus_back_pic.png b/graphics/pokemon/misdreavus/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/misdreavus_back_pic.png
rename to graphics/pokemon/misdreavus/back.png
diff --git a/graphics/pokemon/footprints/misdreavus_footprint.png b/graphics/pokemon/misdreavus/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/misdreavus_footprint.png
rename to graphics/pokemon/misdreavus/footprint.png
diff --git a/graphics/pokemon/front_pics/misdreavus_still_front_pic.png b/graphics/pokemon/misdreavus/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/misdreavus_still_front_pic.png
rename to graphics/pokemon/misdreavus/front.png
diff --git a/graphics/pokemon/icons/misdreavus_icon.png b/graphics/pokemon/misdreavus/icon.png
similarity index 100%
rename from graphics/pokemon/icons/misdreavus_icon.png
rename to graphics/pokemon/misdreavus/icon.png
diff --git a/graphics/pokemon/palettes/misdreavus_palette.pal b/graphics/pokemon/misdreavus/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/misdreavus_palette.pal
rename to graphics/pokemon/misdreavus/normal.pal
diff --git a/graphics/pokemon/palettes/misdreavus_shiny_palette.pal b/graphics/pokemon/misdreavus/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/misdreavus_shiny_palette.pal
rename to graphics/pokemon/misdreavus/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/moltres_front_pic.png b/graphics/pokemon/moltres/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/moltres_front_pic.png
rename to graphics/pokemon/moltres/anim_front.png
diff --git a/graphics/pokemon/back_pics/moltres_back_pic.png b/graphics/pokemon/moltres/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/moltres_back_pic.png
rename to graphics/pokemon/moltres/back.png
diff --git a/graphics/pokemon/footprints/moltres_footprint.png b/graphics/pokemon/moltres/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/moltres_footprint.png
rename to graphics/pokemon/moltres/footprint.png
diff --git a/graphics/pokemon/front_pics/moltres_still_front_pic.png b/graphics/pokemon/moltres/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/moltres_still_front_pic.png
rename to graphics/pokemon/moltres/front.png
diff --git a/graphics/pokemon/icons/moltres_icon.png b/graphics/pokemon/moltres/icon.png
similarity index 100%
rename from graphics/pokemon/icons/moltres_icon.png
rename to graphics/pokemon/moltres/icon.png
diff --git a/graphics/pokemon/palettes/moltres_palette.pal b/graphics/pokemon/moltres/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/moltres_palette.pal
rename to graphics/pokemon/moltres/normal.pal
diff --git a/graphics/pokemon/palettes/moltres_shiny_palette.pal b/graphics/pokemon/moltres/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/moltres_shiny_palette.pal
rename to graphics/pokemon/moltres/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mr_mime_front_pic.png b/graphics/pokemon/mr_mime/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mr_mime_front_pic.png
rename to graphics/pokemon/mr_mime/anim_front.png
diff --git a/graphics/pokemon/back_pics/mr_mime_back_pic.png b/graphics/pokemon/mr_mime/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mr_mime_back_pic.png
rename to graphics/pokemon/mr_mime/back.png
diff --git a/graphics/pokemon/footprints/mr_mime_footprint.png b/graphics/pokemon/mr_mime/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mr_mime_footprint.png
rename to graphics/pokemon/mr_mime/footprint.png
diff --git a/graphics/pokemon/front_pics/mr_mime_still_front_pic.png b/graphics/pokemon/mr_mime/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mr_mime_still_front_pic.png
rename to graphics/pokemon/mr_mime/front.png
diff --git a/graphics/pokemon/icons/mr_mime_icon.png b/graphics/pokemon/mr_mime/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mr_mime_icon.png
rename to graphics/pokemon/mr_mime/icon.png
diff --git a/graphics/pokemon/palettes/mr_mime_palette.pal b/graphics/pokemon/mr_mime/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mr_mime_palette.pal
rename to graphics/pokemon/mr_mime/normal.pal
diff --git a/graphics/pokemon/palettes/mr_mime_shiny_palette.pal b/graphics/pokemon/mr_mime/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mr_mime_shiny_palette.pal
rename to graphics/pokemon/mr_mime/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mudkip_front_pic.png b/graphics/pokemon/mudkip/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/mudkip_front_pic.png
rename to graphics/pokemon/mudkip/anim_front.png
diff --git a/graphics/pokemon/back_pics/mudkip_back_pic.png b/graphics/pokemon/mudkip/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/mudkip_back_pic.png
rename to graphics/pokemon/mudkip/back.png
diff --git a/graphics/pokemon/footprints/mudkip_footprint.png b/graphics/pokemon/mudkip/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/mudkip_footprint.png
rename to graphics/pokemon/mudkip/footprint.png
diff --git a/graphics/pokemon/front_pics/mudkip_still_front_pic.png b/graphics/pokemon/mudkip/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/mudkip_still_front_pic.png
rename to graphics/pokemon/mudkip/front.png
diff --git a/graphics/pokemon/icons/mudkip_icon.png b/graphics/pokemon/mudkip/icon.png
similarity index 100%
rename from graphics/pokemon/icons/mudkip_icon.png
rename to graphics/pokemon/mudkip/icon.png
diff --git a/graphics/pokemon/palettes/mudkip_palette.pal b/graphics/pokemon/mudkip/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/mudkip_palette.pal
rename to graphics/pokemon/mudkip/normal.pal
diff --git a/graphics/pokemon/palettes/mudkip_shiny_palette.pal b/graphics/pokemon/mudkip/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/mudkip_shiny_palette.pal
rename to graphics/pokemon/mudkip/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/muk_front_pic.png b/graphics/pokemon/muk/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/muk_front_pic.png
rename to graphics/pokemon/muk/anim_front.png
diff --git a/graphics/pokemon/back_pics/muk_back_pic.png b/graphics/pokemon/muk/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/muk_back_pic.png
rename to graphics/pokemon/muk/back.png
diff --git a/graphics/pokemon/footprints/muk_footprint.png b/graphics/pokemon/muk/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/muk_footprint.png
rename to graphics/pokemon/muk/footprint.png
diff --git a/graphics/pokemon/front_pics/muk_still_front_pic.png b/graphics/pokemon/muk/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/muk_still_front_pic.png
rename to graphics/pokemon/muk/front.png
diff --git a/graphics/pokemon/icons/muk_icon.png b/graphics/pokemon/muk/icon.png
similarity index 100%
rename from graphics/pokemon/icons/muk_icon.png
rename to graphics/pokemon/muk/icon.png
diff --git a/graphics/pokemon/palettes/muk_palette.pal b/graphics/pokemon/muk/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/muk_palette.pal
rename to graphics/pokemon/muk/normal.pal
diff --git a/graphics/pokemon/palettes/muk_shiny_palette.pal b/graphics/pokemon/muk/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/muk_shiny_palette.pal
rename to graphics/pokemon/muk/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/murkrow_front_pic.png b/graphics/pokemon/murkrow/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/murkrow_front_pic.png
rename to graphics/pokemon/murkrow/anim_front.png
diff --git a/graphics/pokemon/back_pics/murkrow_back_pic.png b/graphics/pokemon/murkrow/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/murkrow_back_pic.png
rename to graphics/pokemon/murkrow/back.png
diff --git a/graphics/pokemon/footprints/murkrow_footprint.png b/graphics/pokemon/murkrow/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/murkrow_footprint.png
rename to graphics/pokemon/murkrow/footprint.png
diff --git a/graphics/pokemon/front_pics/murkrow_still_front_pic.png b/graphics/pokemon/murkrow/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/murkrow_still_front_pic.png
rename to graphics/pokemon/murkrow/front.png
diff --git a/graphics/pokemon/icons/murkrow_icon.png b/graphics/pokemon/murkrow/icon.png
similarity index 100%
rename from graphics/pokemon/icons/murkrow_icon.png
rename to graphics/pokemon/murkrow/icon.png
diff --git a/graphics/pokemon/palettes/murkrow_palette.pal b/graphics/pokemon/murkrow/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/murkrow_palette.pal
rename to graphics/pokemon/murkrow/normal.pal
diff --git a/graphics/pokemon/palettes/murkrow_shiny_palette.pal b/graphics/pokemon/murkrow/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/murkrow_shiny_palette.pal
rename to graphics/pokemon/murkrow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/natu_front_pic.png b/graphics/pokemon/natu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/natu_front_pic.png
rename to graphics/pokemon/natu/anim_front.png
diff --git a/graphics/pokemon/back_pics/natu_back_pic.png b/graphics/pokemon/natu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/natu_back_pic.png
rename to graphics/pokemon/natu/back.png
diff --git a/graphics/pokemon/footprints/natu_footprint.png b/graphics/pokemon/natu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/natu_footprint.png
rename to graphics/pokemon/natu/footprint.png
diff --git a/graphics/pokemon/front_pics/natu_still_front_pic.png b/graphics/pokemon/natu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/natu_still_front_pic.png
rename to graphics/pokemon/natu/front.png
diff --git a/graphics/pokemon/icons/natu_icon.png b/graphics/pokemon/natu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/natu_icon.png
rename to graphics/pokemon/natu/icon.png
diff --git a/graphics/pokemon/palettes/natu_palette.pal b/graphics/pokemon/natu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/natu_palette.pal
rename to graphics/pokemon/natu/normal.pal
diff --git a/graphics/pokemon/palettes/natu_shiny_palette.pal b/graphics/pokemon/natu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/natu_shiny_palette.pal
rename to graphics/pokemon/natu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoking_front_pic.png b/graphics/pokemon/nidoking/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nidoking_front_pic.png
rename to graphics/pokemon/nidoking/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoking_back_pic.png b/graphics/pokemon/nidoking/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nidoking_back_pic.png
rename to graphics/pokemon/nidoking/back.png
diff --git a/graphics/pokemon/footprints/nidoking_footprint.png b/graphics/pokemon/nidoking/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nidoking_footprint.png
rename to graphics/pokemon/nidoking/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoking_still_front_pic.png b/graphics/pokemon/nidoking/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nidoking_still_front_pic.png
rename to graphics/pokemon/nidoking/front.png
diff --git a/graphics/pokemon/icons/nidoking_icon.png b/graphics/pokemon/nidoking/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nidoking_icon.png
rename to graphics/pokemon/nidoking/icon.png
diff --git a/graphics/pokemon/palettes/nidoking_palette.pal b/graphics/pokemon/nidoking/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoking_palette.pal
rename to graphics/pokemon/nidoking/normal.pal
diff --git a/graphics/pokemon/palettes/nidoking_shiny_palette.pal b/graphics/pokemon/nidoking/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoking_shiny_palette.pal
rename to graphics/pokemon/nidoking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoqueen_front_pic.png b/graphics/pokemon/nidoqueen/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nidoqueen_front_pic.png
rename to graphics/pokemon/nidoqueen/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoqueen_back_pic.png b/graphics/pokemon/nidoqueen/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nidoqueen_back_pic.png
rename to graphics/pokemon/nidoqueen/back.png
diff --git a/graphics/pokemon/footprints/nidoqueen_footprint.png b/graphics/pokemon/nidoqueen/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nidoqueen_footprint.png
rename to graphics/pokemon/nidoqueen/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png b/graphics/pokemon/nidoqueen/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nidoqueen_still_front_pic.png
rename to graphics/pokemon/nidoqueen/front.png
diff --git a/graphics/pokemon/icons/nidoqueen_icon.png b/graphics/pokemon/nidoqueen/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nidoqueen_icon.png
rename to graphics/pokemon/nidoqueen/icon.png
diff --git a/graphics/pokemon/palettes/nidoqueen_palette.pal b/graphics/pokemon/nidoqueen/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoqueen_palette.pal
rename to graphics/pokemon/nidoqueen/normal.pal
diff --git a/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal b/graphics/pokemon/nidoqueen/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoqueen_shiny_palette.pal
rename to graphics/pokemon/nidoqueen/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoran_f_front_pic.png b/graphics/pokemon/nidoran_f/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nidoran_f_front_pic.png
rename to graphics/pokemon/nidoran_f/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoran_f_back_pic.png b/graphics/pokemon/nidoran_f/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nidoran_f_back_pic.png
rename to graphics/pokemon/nidoran_f/back.png
diff --git a/graphics/pokemon/footprints/nidoran_f_footprint.png b/graphics/pokemon/nidoran_f/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nidoran_f_footprint.png
rename to graphics/pokemon/nidoran_f/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png b/graphics/pokemon/nidoran_f/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nidoran_f_still_front_pic.png
rename to graphics/pokemon/nidoran_f/front.png
diff --git a/graphics/pokemon/icons/nidoran_f_icon.png b/graphics/pokemon/nidoran_f/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nidoran_f_icon.png
rename to graphics/pokemon/nidoran_f/icon.png
diff --git a/graphics/pokemon/palettes/nidoran_f_palette.pal b/graphics/pokemon/nidoran_f/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoran_f_palette.pal
rename to graphics/pokemon/nidoran_f/normal.pal
diff --git a/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal b/graphics/pokemon/nidoran_f/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoran_f_shiny_palette.pal
rename to graphics/pokemon/nidoran_f/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoran_m_front_pic.png b/graphics/pokemon/nidoran_m/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nidoran_m_front_pic.png
rename to graphics/pokemon/nidoran_m/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoran_m_back_pic.png b/graphics/pokemon/nidoran_m/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nidoran_m_back_pic.png
rename to graphics/pokemon/nidoran_m/back.png
diff --git a/graphics/pokemon/footprints/nidoran_m_footprint.png b/graphics/pokemon/nidoran_m/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nidoran_m_footprint.png
rename to graphics/pokemon/nidoran_m/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png b/graphics/pokemon/nidoran_m/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nidoran_m_still_front_pic.png
rename to graphics/pokemon/nidoran_m/front.png
diff --git a/graphics/pokemon/icons/nidoran_m_icon.png b/graphics/pokemon/nidoran_m/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nidoran_m_icon.png
rename to graphics/pokemon/nidoran_m/icon.png
diff --git a/graphics/pokemon/palettes/nidoran_m_palette.pal b/graphics/pokemon/nidoran_m/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoran_m_palette.pal
rename to graphics/pokemon/nidoran_m/normal.pal
diff --git a/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal b/graphics/pokemon/nidoran_m/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidoran_m_shiny_palette.pal
rename to graphics/pokemon/nidoran_m/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidorina_front_pic.png b/graphics/pokemon/nidorina/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nidorina_front_pic.png
rename to graphics/pokemon/nidorina/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidorina_back_pic.png b/graphics/pokemon/nidorina/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nidorina_back_pic.png
rename to graphics/pokemon/nidorina/back.png
diff --git a/graphics/pokemon/footprints/nidorina_footprint.png b/graphics/pokemon/nidorina/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nidorina_footprint.png
rename to graphics/pokemon/nidorina/footprint.png
diff --git a/graphics/pokemon/front_pics/nidorina_still_front_pic.png b/graphics/pokemon/nidorina/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nidorina_still_front_pic.png
rename to graphics/pokemon/nidorina/front.png
diff --git a/graphics/pokemon/icons/nidorina_icon.png b/graphics/pokemon/nidorina/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nidorina_icon.png
rename to graphics/pokemon/nidorina/icon.png
diff --git a/graphics/pokemon/palettes/nidorina_palette.pal b/graphics/pokemon/nidorina/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidorina_palette.pal
rename to graphics/pokemon/nidorina/normal.pal
diff --git a/graphics/pokemon/palettes/nidorina_shiny_palette.pal b/graphics/pokemon/nidorina/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidorina_shiny_palette.pal
rename to graphics/pokemon/nidorina/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidorino_front_pic.png b/graphics/pokemon/nidorino/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nidorino_front_pic.png
rename to graphics/pokemon/nidorino/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidorino_back_pic.png b/graphics/pokemon/nidorino/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nidorino_back_pic.png
rename to graphics/pokemon/nidorino/back.png
diff --git a/graphics/pokemon/footprints/nidorino_footprint.png b/graphics/pokemon/nidorino/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nidorino_footprint.png
rename to graphics/pokemon/nidorino/footprint.png
diff --git a/graphics/pokemon/front_pics/nidorino_still_front_pic.png b/graphics/pokemon/nidorino/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nidorino_still_front_pic.png
rename to graphics/pokemon/nidorino/front.png
diff --git a/graphics/pokemon/icons/nidorino_icon.png b/graphics/pokemon/nidorino/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nidorino_icon.png
rename to graphics/pokemon/nidorino/icon.png
diff --git a/graphics/pokemon/palettes/nidorino_palette.pal b/graphics/pokemon/nidorino/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidorino_palette.pal
rename to graphics/pokemon/nidorino/normal.pal
diff --git a/graphics/pokemon/palettes/nidorino_shiny_palette.pal b/graphics/pokemon/nidorino/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nidorino_shiny_palette.pal
rename to graphics/pokemon/nidorino/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nincada_front_pic.png b/graphics/pokemon/nincada/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nincada_front_pic.png
rename to graphics/pokemon/nincada/anim_front.png
diff --git a/graphics/pokemon/back_pics/nincada_back_pic.png b/graphics/pokemon/nincada/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nincada_back_pic.png
rename to graphics/pokemon/nincada/back.png
diff --git a/graphics/pokemon/footprints/nincada_footprint.png b/graphics/pokemon/nincada/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nincada_footprint.png
rename to graphics/pokemon/nincada/footprint.png
diff --git a/graphics/pokemon/front_pics/nincada_still_front_pic.png b/graphics/pokemon/nincada/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nincada_still_front_pic.png
rename to graphics/pokemon/nincada/front.png
diff --git a/graphics/pokemon/icons/nincada_icon.png b/graphics/pokemon/nincada/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nincada_icon.png
rename to graphics/pokemon/nincada/icon.png
diff --git a/graphics/pokemon/palettes/nincada_palette.pal b/graphics/pokemon/nincada/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nincada_palette.pal
rename to graphics/pokemon/nincada/normal.pal
diff --git a/graphics/pokemon/palettes/nincada_shiny_palette.pal b/graphics/pokemon/nincada/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nincada_shiny_palette.pal
rename to graphics/pokemon/nincada/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ninetales_front_pic.png b/graphics/pokemon/ninetales/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ninetales_front_pic.png
rename to graphics/pokemon/ninetales/anim_front.png
diff --git a/graphics/pokemon/back_pics/ninetales_back_pic.png b/graphics/pokemon/ninetales/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ninetales_back_pic.png
rename to graphics/pokemon/ninetales/back.png
diff --git a/graphics/pokemon/footprints/ninetales_footprint.png b/graphics/pokemon/ninetales/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ninetales_footprint.png
rename to graphics/pokemon/ninetales/footprint.png
diff --git a/graphics/pokemon/front_pics/ninetales_still_front_pic.png b/graphics/pokemon/ninetales/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ninetales_still_front_pic.png
rename to graphics/pokemon/ninetales/front.png
diff --git a/graphics/pokemon/icons/ninetales_icon.png b/graphics/pokemon/ninetales/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ninetales_icon.png
rename to graphics/pokemon/ninetales/icon.png
diff --git a/graphics/pokemon/palettes/ninetales_palette.pal b/graphics/pokemon/ninetales/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ninetales_palette.pal
rename to graphics/pokemon/ninetales/normal.pal
diff --git a/graphics/pokemon/palettes/ninetales_shiny_palette.pal b/graphics/pokemon/ninetales/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ninetales_shiny_palette.pal
rename to graphics/pokemon/ninetales/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ninjask_front_pic.png b/graphics/pokemon/ninjask/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ninjask_front_pic.png
rename to graphics/pokemon/ninjask/anim_front.png
diff --git a/graphics/pokemon/back_pics/ninjask_back_pic.png b/graphics/pokemon/ninjask/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ninjask_back_pic.png
rename to graphics/pokemon/ninjask/back.png
diff --git a/graphics/pokemon/footprints/ninjask_footprint.png b/graphics/pokemon/ninjask/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ninjask_footprint.png
rename to graphics/pokemon/ninjask/footprint.png
diff --git a/graphics/pokemon/front_pics/ninjask_still_front_pic.png b/graphics/pokemon/ninjask/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ninjask_still_front_pic.png
rename to graphics/pokemon/ninjask/front.png
diff --git a/graphics/pokemon/icons/ninjask_icon.png b/graphics/pokemon/ninjask/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ninjask_icon.png
rename to graphics/pokemon/ninjask/icon.png
diff --git a/graphics/pokemon/palettes/ninjask_palette.pal b/graphics/pokemon/ninjask/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ninjask_palette.pal
rename to graphics/pokemon/ninjask/normal.pal
diff --git a/graphics/pokemon/palettes/ninjask_shiny_palette.pal b/graphics/pokemon/ninjask/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ninjask_shiny_palette.pal
rename to graphics/pokemon/ninjask/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/noctowl_front_pic.png b/graphics/pokemon/noctowl/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/noctowl_front_pic.png
rename to graphics/pokemon/noctowl/anim_front.png
diff --git a/graphics/pokemon/back_pics/noctowl_back_pic.png b/graphics/pokemon/noctowl/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/noctowl_back_pic.png
rename to graphics/pokemon/noctowl/back.png
diff --git a/graphics/pokemon/footprints/noctowl_footprint.png b/graphics/pokemon/noctowl/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/noctowl_footprint.png
rename to graphics/pokemon/noctowl/footprint.png
diff --git a/graphics/pokemon/front_pics/noctowl_still_front_pic.png b/graphics/pokemon/noctowl/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/noctowl_still_front_pic.png
rename to graphics/pokemon/noctowl/front.png
diff --git a/graphics/pokemon/icons/noctowl_icon.png b/graphics/pokemon/noctowl/icon.png
similarity index 100%
rename from graphics/pokemon/icons/noctowl_icon.png
rename to graphics/pokemon/noctowl/icon.png
diff --git a/graphics/pokemon/palettes/noctowl_palette.pal b/graphics/pokemon/noctowl/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/noctowl_palette.pal
rename to graphics/pokemon/noctowl/normal.pal
diff --git a/graphics/pokemon/palettes/noctowl_shiny_palette.pal b/graphics/pokemon/noctowl/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/noctowl_shiny_palette.pal
rename to graphics/pokemon/noctowl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nosepass_front_pic.png b/graphics/pokemon/nosepass/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nosepass_front_pic.png
rename to graphics/pokemon/nosepass/anim_front.png
diff --git a/graphics/pokemon/back_pics/nosepass_back_pic.png b/graphics/pokemon/nosepass/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nosepass_back_pic.png
rename to graphics/pokemon/nosepass/back.png
diff --git a/graphics/pokemon/footprints/nosepass_footprint.png b/graphics/pokemon/nosepass/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nosepass_footprint.png
rename to graphics/pokemon/nosepass/footprint.png
diff --git a/graphics/pokemon/front_pics/nosepass_still_front_pic.png b/graphics/pokemon/nosepass/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nosepass_still_front_pic.png
rename to graphics/pokemon/nosepass/front.png
diff --git a/graphics/pokemon/icons/nosepass_icon.png b/graphics/pokemon/nosepass/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nosepass_icon.png
rename to graphics/pokemon/nosepass/icon.png
diff --git a/graphics/pokemon/palettes/nosepass_palette.pal b/graphics/pokemon/nosepass/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nosepass_palette.pal
rename to graphics/pokemon/nosepass/normal.pal
diff --git a/graphics/pokemon/palettes/nosepass_shiny_palette.pal b/graphics/pokemon/nosepass/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nosepass_shiny_palette.pal
rename to graphics/pokemon/nosepass/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/numel_front_pic.png b/graphics/pokemon/numel/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/numel_front_pic.png
rename to graphics/pokemon/numel/anim_front.png
diff --git a/graphics/pokemon/back_pics/numel_back_pic.png b/graphics/pokemon/numel/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/numel_back_pic.png
rename to graphics/pokemon/numel/back.png
diff --git a/graphics/pokemon/footprints/numel_footprint.png b/graphics/pokemon/numel/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/numel_footprint.png
rename to graphics/pokemon/numel/footprint.png
diff --git a/graphics/pokemon/front_pics/numel_still_front_pic.png b/graphics/pokemon/numel/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/numel_still_front_pic.png
rename to graphics/pokemon/numel/front.png
diff --git a/graphics/pokemon/icons/numel_icon.png b/graphics/pokemon/numel/icon.png
similarity index 100%
rename from graphics/pokemon/icons/numel_icon.png
rename to graphics/pokemon/numel/icon.png
diff --git a/graphics/pokemon/palettes/numel_palette.pal b/graphics/pokemon/numel/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/numel_palette.pal
rename to graphics/pokemon/numel/normal.pal
diff --git a/graphics/pokemon/palettes/numel_shiny_palette.pal b/graphics/pokemon/numel/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/numel_shiny_palette.pal
rename to graphics/pokemon/numel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nuzleaf_front_pic.png b/graphics/pokemon/nuzleaf/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/nuzleaf_front_pic.png
rename to graphics/pokemon/nuzleaf/anim_front.png
diff --git a/graphics/pokemon/back_pics/nuzleaf_back_pic.png b/graphics/pokemon/nuzleaf/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/nuzleaf_back_pic.png
rename to graphics/pokemon/nuzleaf/back.png
diff --git a/graphics/pokemon/footprints/nuzleaf_footprint.png b/graphics/pokemon/nuzleaf/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/nuzleaf_footprint.png
rename to graphics/pokemon/nuzleaf/footprint.png
diff --git a/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png b/graphics/pokemon/nuzleaf/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/nuzleaf_still_front_pic.png
rename to graphics/pokemon/nuzleaf/front.png
diff --git a/graphics/pokemon/icons/nuzleaf_icon.png b/graphics/pokemon/nuzleaf/icon.png
similarity index 100%
rename from graphics/pokemon/icons/nuzleaf_icon.png
rename to graphics/pokemon/nuzleaf/icon.png
diff --git a/graphics/pokemon/palettes/nuzleaf_palette.pal b/graphics/pokemon/nuzleaf/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/nuzleaf_palette.pal
rename to graphics/pokemon/nuzleaf/normal.pal
diff --git a/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal b/graphics/pokemon/nuzleaf/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/nuzleaf_shiny_palette.pal
rename to graphics/pokemon/nuzleaf/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/octillery_front_pic.png b/graphics/pokemon/octillery/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/octillery_front_pic.png
rename to graphics/pokemon/octillery/anim_front.png
diff --git a/graphics/pokemon/back_pics/octillery_back_pic.png b/graphics/pokemon/octillery/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/octillery_back_pic.png
rename to graphics/pokemon/octillery/back.png
diff --git a/graphics/pokemon/footprints/octillery_footprint.png b/graphics/pokemon/octillery/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/octillery_footprint.png
rename to graphics/pokemon/octillery/footprint.png
diff --git a/graphics/pokemon/front_pics/octillery_still_front_pic.png b/graphics/pokemon/octillery/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/octillery_still_front_pic.png
rename to graphics/pokemon/octillery/front.png
diff --git a/graphics/pokemon/icons/octillery_icon.png b/graphics/pokemon/octillery/icon.png
similarity index 100%
rename from graphics/pokemon/icons/octillery_icon.png
rename to graphics/pokemon/octillery/icon.png
diff --git a/graphics/pokemon/palettes/octillery_palette.pal b/graphics/pokemon/octillery/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/octillery_palette.pal
rename to graphics/pokemon/octillery/normal.pal
diff --git a/graphics/pokemon/palettes/octillery_shiny_palette.pal b/graphics/pokemon/octillery/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/octillery_shiny_palette.pal
rename to graphics/pokemon/octillery/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/oddish_front_pic.png b/graphics/pokemon/oddish/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/oddish_front_pic.png
rename to graphics/pokemon/oddish/anim_front.png
diff --git a/graphics/pokemon/back_pics/oddish_back_pic.png b/graphics/pokemon/oddish/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/oddish_back_pic.png
rename to graphics/pokemon/oddish/back.png
diff --git a/graphics/pokemon/footprints/oddish_footprint.png b/graphics/pokemon/oddish/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/oddish_footprint.png
rename to graphics/pokemon/oddish/footprint.png
diff --git a/graphics/pokemon/front_pics/oddish_still_front_pic.png b/graphics/pokemon/oddish/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/oddish_still_front_pic.png
rename to graphics/pokemon/oddish/front.png
diff --git a/graphics/pokemon/icons/oddish_icon.png b/graphics/pokemon/oddish/icon.png
similarity index 100%
rename from graphics/pokemon/icons/oddish_icon.png
rename to graphics/pokemon/oddish/icon.png
diff --git a/graphics/pokemon/palettes/oddish_palette.pal b/graphics/pokemon/oddish/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/oddish_palette.pal
rename to graphics/pokemon/oddish/normal.pal
diff --git a/graphics/pokemon/palettes/oddish_shiny_palette.pal b/graphics/pokemon/oddish/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/oddish_shiny_palette.pal
rename to graphics/pokemon/oddish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/omanyte_front_pic.png b/graphics/pokemon/omanyte/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/omanyte_front_pic.png
rename to graphics/pokemon/omanyte/anim_front.png
diff --git a/graphics/pokemon/back_pics/omanyte_back_pic.png b/graphics/pokemon/omanyte/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/omanyte_back_pic.png
rename to graphics/pokemon/omanyte/back.png
diff --git a/graphics/pokemon/footprints/omanyte_footprint.png b/graphics/pokemon/omanyte/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/omanyte_footprint.png
rename to graphics/pokemon/omanyte/footprint.png
diff --git a/graphics/pokemon/front_pics/omanyte_still_front_pic.png b/graphics/pokemon/omanyte/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/omanyte_still_front_pic.png
rename to graphics/pokemon/omanyte/front.png
diff --git a/graphics/pokemon/icons/omanyte_icon.png b/graphics/pokemon/omanyte/icon.png
similarity index 100%
rename from graphics/pokemon/icons/omanyte_icon.png
rename to graphics/pokemon/omanyte/icon.png
diff --git a/graphics/pokemon/palettes/omanyte_palette.pal b/graphics/pokemon/omanyte/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/omanyte_palette.pal
rename to graphics/pokemon/omanyte/normal.pal
diff --git a/graphics/pokemon/palettes/omanyte_shiny_palette.pal b/graphics/pokemon/omanyte/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/omanyte_shiny_palette.pal
rename to graphics/pokemon/omanyte/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/omastar_front_pic.png b/graphics/pokemon/omastar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/omastar_front_pic.png
rename to graphics/pokemon/omastar/anim_front.png
diff --git a/graphics/pokemon/back_pics/omastar_back_pic.png b/graphics/pokemon/omastar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/omastar_back_pic.png
rename to graphics/pokemon/omastar/back.png
diff --git a/graphics/pokemon/footprints/omastar_footprint.png b/graphics/pokemon/omastar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/omastar_footprint.png
rename to graphics/pokemon/omastar/footprint.png
diff --git a/graphics/pokemon/front_pics/omastar_still_front_pic.png b/graphics/pokemon/omastar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/omastar_still_front_pic.png
rename to graphics/pokemon/omastar/front.png
diff --git a/graphics/pokemon/icons/omastar_icon.png b/graphics/pokemon/omastar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/omastar_icon.png
rename to graphics/pokemon/omastar/icon.png
diff --git a/graphics/pokemon/palettes/omastar_palette.pal b/graphics/pokemon/omastar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/omastar_palette.pal
rename to graphics/pokemon/omastar/normal.pal
diff --git a/graphics/pokemon/palettes/omastar_shiny_palette.pal b/graphics/pokemon/omastar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/omastar_shiny_palette.pal
rename to graphics/pokemon/omastar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/onix_front_pic.png b/graphics/pokemon/onix/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/onix_front_pic.png
rename to graphics/pokemon/onix/anim_front.png
diff --git a/graphics/pokemon/back_pics/onix_back_pic.png b/graphics/pokemon/onix/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/onix_back_pic.png
rename to graphics/pokemon/onix/back.png
diff --git a/graphics/pokemon/footprints/onix_footprint.png b/graphics/pokemon/onix/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/onix_footprint.png
rename to graphics/pokemon/onix/footprint.png
diff --git a/graphics/pokemon/front_pics/onix_still_front_pic.png b/graphics/pokemon/onix/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/onix_still_front_pic.png
rename to graphics/pokemon/onix/front.png
diff --git a/graphics/pokemon/icons/onix_icon.png b/graphics/pokemon/onix/icon.png
similarity index 100%
rename from graphics/pokemon/icons/onix_icon.png
rename to graphics/pokemon/onix/icon.png
diff --git a/graphics/pokemon/palettes/onix_palette.pal b/graphics/pokemon/onix/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/onix_palette.pal
rename to graphics/pokemon/onix/normal.pal
diff --git a/graphics/pokemon/palettes/onix_shiny_palette.pal b/graphics/pokemon/onix/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/onix_shiny_palette.pal
rename to graphics/pokemon/onix/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/paras_front_pic.png b/graphics/pokemon/paras/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/paras_front_pic.png
rename to graphics/pokemon/paras/anim_front.png
diff --git a/graphics/pokemon/back_pics/paras_back_pic.png b/graphics/pokemon/paras/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/paras_back_pic.png
rename to graphics/pokemon/paras/back.png
diff --git a/graphics/pokemon/footprints/paras_footprint.png b/graphics/pokemon/paras/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/paras_footprint.png
rename to graphics/pokemon/paras/footprint.png
diff --git a/graphics/pokemon/front_pics/paras_still_front_pic.png b/graphics/pokemon/paras/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/paras_still_front_pic.png
rename to graphics/pokemon/paras/front.png
diff --git a/graphics/pokemon/icons/paras_icon.png b/graphics/pokemon/paras/icon.png
similarity index 100%
rename from graphics/pokemon/icons/paras_icon.png
rename to graphics/pokemon/paras/icon.png
diff --git a/graphics/pokemon/palettes/paras_palette.pal b/graphics/pokemon/paras/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/paras_palette.pal
rename to graphics/pokemon/paras/normal.pal
diff --git a/graphics/pokemon/palettes/paras_shiny_palette.pal b/graphics/pokemon/paras/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/paras_shiny_palette.pal
rename to graphics/pokemon/paras/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/parasect_front_pic.png b/graphics/pokemon/parasect/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/parasect_front_pic.png
rename to graphics/pokemon/parasect/anim_front.png
diff --git a/graphics/pokemon/back_pics/parasect_back_pic.png b/graphics/pokemon/parasect/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/parasect_back_pic.png
rename to graphics/pokemon/parasect/back.png
diff --git a/graphics/pokemon/footprints/parasect_footprint.png b/graphics/pokemon/parasect/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/parasect_footprint.png
rename to graphics/pokemon/parasect/footprint.png
diff --git a/graphics/pokemon/front_pics/parasect_still_front_pic.png b/graphics/pokemon/parasect/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/parasect_still_front_pic.png
rename to graphics/pokemon/parasect/front.png
diff --git a/graphics/pokemon/icons/parasect_icon.png b/graphics/pokemon/parasect/icon.png
similarity index 100%
rename from graphics/pokemon/icons/parasect_icon.png
rename to graphics/pokemon/parasect/icon.png
diff --git a/graphics/pokemon/palettes/parasect_palette.pal b/graphics/pokemon/parasect/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/parasect_palette.pal
rename to graphics/pokemon/parasect/normal.pal
diff --git a/graphics/pokemon/palettes/parasect_shiny_palette.pal b/graphics/pokemon/parasect/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/parasect_shiny_palette.pal
rename to graphics/pokemon/parasect/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pelipper_front_pic.png b/graphics/pokemon/pelipper/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pelipper_front_pic.png
rename to graphics/pokemon/pelipper/anim_front.png
diff --git a/graphics/pokemon/back_pics/pelipper_back_pic.png b/graphics/pokemon/pelipper/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pelipper_back_pic.png
rename to graphics/pokemon/pelipper/back.png
diff --git a/graphics/pokemon/footprints/pelipper_footprint.png b/graphics/pokemon/pelipper/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pelipper_footprint.png
rename to graphics/pokemon/pelipper/footprint.png
diff --git a/graphics/pokemon/front_pics/pelipper_still_front_pic.png b/graphics/pokemon/pelipper/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pelipper_still_front_pic.png
rename to graphics/pokemon/pelipper/front.png
diff --git a/graphics/pokemon/icons/pelipper_icon.png b/graphics/pokemon/pelipper/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pelipper_icon.png
rename to graphics/pokemon/pelipper/icon.png
diff --git a/graphics/pokemon/palettes/pelipper_palette.pal b/graphics/pokemon/pelipper/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pelipper_palette.pal
rename to graphics/pokemon/pelipper/normal.pal
diff --git a/graphics/pokemon/palettes/pelipper_shiny_palette.pal b/graphics/pokemon/pelipper/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pelipper_shiny_palette.pal
rename to graphics/pokemon/pelipper/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/persian_front_pic.png b/graphics/pokemon/persian/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/persian_front_pic.png
rename to graphics/pokemon/persian/anim_front.png
diff --git a/graphics/pokemon/back_pics/persian_back_pic.png b/graphics/pokemon/persian/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/persian_back_pic.png
rename to graphics/pokemon/persian/back.png
diff --git a/graphics/pokemon/footprints/persian_footprint.png b/graphics/pokemon/persian/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/persian_footprint.png
rename to graphics/pokemon/persian/footprint.png
diff --git a/graphics/pokemon/front_pics/persian_still_front_pic.png b/graphics/pokemon/persian/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/persian_still_front_pic.png
rename to graphics/pokemon/persian/front.png
diff --git a/graphics/pokemon/icons/persian_icon.png b/graphics/pokemon/persian/icon.png
similarity index 100%
rename from graphics/pokemon/icons/persian_icon.png
rename to graphics/pokemon/persian/icon.png
diff --git a/graphics/pokemon/palettes/persian_palette.pal b/graphics/pokemon/persian/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/persian_palette.pal
rename to graphics/pokemon/persian/normal.pal
diff --git a/graphics/pokemon/palettes/persian_shiny_palette.pal b/graphics/pokemon/persian/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/persian_shiny_palette.pal
rename to graphics/pokemon/persian/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/phanpy_front_pic.png b/graphics/pokemon/phanpy/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/phanpy_front_pic.png
rename to graphics/pokemon/phanpy/anim_front.png
diff --git a/graphics/pokemon/back_pics/phanpy_back_pic.png b/graphics/pokemon/phanpy/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/phanpy_back_pic.png
rename to graphics/pokemon/phanpy/back.png
diff --git a/graphics/pokemon/footprints/phanpy_footprint.png b/graphics/pokemon/phanpy/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/phanpy_footprint.png
rename to graphics/pokemon/phanpy/footprint.png
diff --git a/graphics/pokemon/front_pics/phanpy_still_front_pic.png b/graphics/pokemon/phanpy/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/phanpy_still_front_pic.png
rename to graphics/pokemon/phanpy/front.png
diff --git a/graphics/pokemon/icons/phanpy_icon.png b/graphics/pokemon/phanpy/icon.png
similarity index 100%
rename from graphics/pokemon/icons/phanpy_icon.png
rename to graphics/pokemon/phanpy/icon.png
diff --git a/graphics/pokemon/palettes/phanpy_palette.pal b/graphics/pokemon/phanpy/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/phanpy_palette.pal
rename to graphics/pokemon/phanpy/normal.pal
diff --git a/graphics/pokemon/palettes/phanpy_shiny_palette.pal b/graphics/pokemon/phanpy/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/phanpy_shiny_palette.pal
rename to graphics/pokemon/phanpy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pichu_front_pic.png b/graphics/pokemon/pichu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pichu_front_pic.png
rename to graphics/pokemon/pichu/anim_front.png
diff --git a/graphics/pokemon/back_pics/pichu_back_pic.png b/graphics/pokemon/pichu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pichu_back_pic.png
rename to graphics/pokemon/pichu/back.png
diff --git a/graphics/pokemon/footprints/pichu_footprint.png b/graphics/pokemon/pichu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pichu_footprint.png
rename to graphics/pokemon/pichu/footprint.png
diff --git a/graphics/pokemon/front_pics/pichu_still_front_pic.png b/graphics/pokemon/pichu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pichu_still_front_pic.png
rename to graphics/pokemon/pichu/front.png
diff --git a/graphics/pokemon/icons/pichu_icon.png b/graphics/pokemon/pichu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pichu_icon.png
rename to graphics/pokemon/pichu/icon.png
diff --git a/graphics/pokemon/palettes/pichu_palette.pal b/graphics/pokemon/pichu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pichu_palette.pal
rename to graphics/pokemon/pichu/normal.pal
diff --git a/graphics/pokemon/palettes/pichu_shiny_palette.pal b/graphics/pokemon/pichu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pichu_shiny_palette.pal
rename to graphics/pokemon/pichu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pidgeot_front_pic.png b/graphics/pokemon/pidgeot/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pidgeot_front_pic.png
rename to graphics/pokemon/pidgeot/anim_front.png
diff --git a/graphics/pokemon/back_pics/pidgeot_back_pic.png b/graphics/pokemon/pidgeot/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pidgeot_back_pic.png
rename to graphics/pokemon/pidgeot/back.png
diff --git a/graphics/pokemon/footprints/pidgeot_footprint.png b/graphics/pokemon/pidgeot/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pidgeot_footprint.png
rename to graphics/pokemon/pidgeot/footprint.png
diff --git a/graphics/pokemon/front_pics/pidgeot_still_front_pic.png b/graphics/pokemon/pidgeot/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pidgeot_still_front_pic.png
rename to graphics/pokemon/pidgeot/front.png
diff --git a/graphics/pokemon/icons/pidgeot_icon.png b/graphics/pokemon/pidgeot/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pidgeot_icon.png
rename to graphics/pokemon/pidgeot/icon.png
diff --git a/graphics/pokemon/palettes/pidgeot_palette.pal b/graphics/pokemon/pidgeot/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pidgeot_palette.pal
rename to graphics/pokemon/pidgeot/normal.pal
diff --git a/graphics/pokemon/palettes/pidgeot_shiny_palette.pal b/graphics/pokemon/pidgeot/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pidgeot_shiny_palette.pal
rename to graphics/pokemon/pidgeot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pidgeotto_front_pic.png b/graphics/pokemon/pidgeotto/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pidgeotto_front_pic.png
rename to graphics/pokemon/pidgeotto/anim_front.png
diff --git a/graphics/pokemon/back_pics/pidgeotto_back_pic.png b/graphics/pokemon/pidgeotto/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pidgeotto_back_pic.png
rename to graphics/pokemon/pidgeotto/back.png
diff --git a/graphics/pokemon/footprints/pidgeotto_footprint.png b/graphics/pokemon/pidgeotto/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pidgeotto_footprint.png
rename to graphics/pokemon/pidgeotto/footprint.png
diff --git a/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png b/graphics/pokemon/pidgeotto/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pidgeotto_still_front_pic.png
rename to graphics/pokemon/pidgeotto/front.png
diff --git a/graphics/pokemon/icons/pidgeotto_icon.png b/graphics/pokemon/pidgeotto/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pidgeotto_icon.png
rename to graphics/pokemon/pidgeotto/icon.png
diff --git a/graphics/pokemon/palettes/pidgeotto_palette.pal b/graphics/pokemon/pidgeotto/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pidgeotto_palette.pal
rename to graphics/pokemon/pidgeotto/normal.pal
diff --git a/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal b/graphics/pokemon/pidgeotto/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pidgeotto_shiny_palette.pal
rename to graphics/pokemon/pidgeotto/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pidgey_front_pic.png b/graphics/pokemon/pidgey/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pidgey_front_pic.png
rename to graphics/pokemon/pidgey/anim_front.png
diff --git a/graphics/pokemon/back_pics/pidgey_back_pic.png b/graphics/pokemon/pidgey/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pidgey_back_pic.png
rename to graphics/pokemon/pidgey/back.png
diff --git a/graphics/pokemon/footprints/pidgey_footprint.png b/graphics/pokemon/pidgey/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pidgey_footprint.png
rename to graphics/pokemon/pidgey/footprint.png
diff --git a/graphics/pokemon/front_pics/pidgey_still_front_pic.png b/graphics/pokemon/pidgey/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pidgey_still_front_pic.png
rename to graphics/pokemon/pidgey/front.png
diff --git a/graphics/pokemon/icons/pidgey_icon.png b/graphics/pokemon/pidgey/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pidgey_icon.png
rename to graphics/pokemon/pidgey/icon.png
diff --git a/graphics/pokemon/palettes/pidgey_palette.pal b/graphics/pokemon/pidgey/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pidgey_palette.pal
rename to graphics/pokemon/pidgey/normal.pal
diff --git a/graphics/pokemon/palettes/pidgey_shiny_palette.pal b/graphics/pokemon/pidgey/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pidgey_shiny_palette.pal
rename to graphics/pokemon/pidgey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pikachu_front_pic.png b/graphics/pokemon/pikachu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pikachu_front_pic.png
rename to graphics/pokemon/pikachu/anim_front.png
diff --git a/graphics/pokemon/back_pics/pikachu_back_pic.png b/graphics/pokemon/pikachu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pikachu_back_pic.png
rename to graphics/pokemon/pikachu/back.png
diff --git a/graphics/pokemon/footprints/pikachu_footprint.png b/graphics/pokemon/pikachu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pikachu_footprint.png
rename to graphics/pokemon/pikachu/footprint.png
diff --git a/graphics/pokemon/front_pics/pikachu_still_front_pic.png b/graphics/pokemon/pikachu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pikachu_still_front_pic.png
rename to graphics/pokemon/pikachu/front.png
diff --git a/graphics/pokemon/icons/pikachu_icon.png b/graphics/pokemon/pikachu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pikachu_icon.png
rename to graphics/pokemon/pikachu/icon.png
diff --git a/graphics/pokemon/palettes/pikachu_palette.pal b/graphics/pokemon/pikachu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pikachu_palette.pal
rename to graphics/pokemon/pikachu/normal.pal
diff --git a/graphics/pokemon/palettes/pikachu_shiny_palette.pal b/graphics/pokemon/pikachu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pikachu_shiny_palette.pal
rename to graphics/pokemon/pikachu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/piloswine_front_pic.png b/graphics/pokemon/piloswine/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/piloswine_front_pic.png
rename to graphics/pokemon/piloswine/anim_front.png
diff --git a/graphics/pokemon/back_pics/piloswine_back_pic.png b/graphics/pokemon/piloswine/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/piloswine_back_pic.png
rename to graphics/pokemon/piloswine/back.png
diff --git a/graphics/pokemon/footprints/piloswine_footprint.png b/graphics/pokemon/piloswine/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/piloswine_footprint.png
rename to graphics/pokemon/piloswine/footprint.png
diff --git a/graphics/pokemon/front_pics/piloswine_still_front_pic.png b/graphics/pokemon/piloswine/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/piloswine_still_front_pic.png
rename to graphics/pokemon/piloswine/front.png
diff --git a/graphics/pokemon/icons/piloswine_icon.png b/graphics/pokemon/piloswine/icon.png
similarity index 100%
rename from graphics/pokemon/icons/piloswine_icon.png
rename to graphics/pokemon/piloswine/icon.png
diff --git a/graphics/pokemon/palettes/piloswine_palette.pal b/graphics/pokemon/piloswine/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/piloswine_palette.pal
rename to graphics/pokemon/piloswine/normal.pal
diff --git a/graphics/pokemon/palettes/piloswine_shiny_palette.pal b/graphics/pokemon/piloswine/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/piloswine_shiny_palette.pal
rename to graphics/pokemon/piloswine/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pineco_front_pic.png b/graphics/pokemon/pineco/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pineco_front_pic.png
rename to graphics/pokemon/pineco/anim_front.png
diff --git a/graphics/pokemon/back_pics/pineco_back_pic.png b/graphics/pokemon/pineco/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pineco_back_pic.png
rename to graphics/pokemon/pineco/back.png
diff --git a/graphics/pokemon/footprints/pineco_footprint.png b/graphics/pokemon/pineco/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pineco_footprint.png
rename to graphics/pokemon/pineco/footprint.png
diff --git a/graphics/pokemon/front_pics/pineco_still_front_pic.png b/graphics/pokemon/pineco/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pineco_still_front_pic.png
rename to graphics/pokemon/pineco/front.png
diff --git a/graphics/pokemon/icons/pineco_icon.png b/graphics/pokemon/pineco/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pineco_icon.png
rename to graphics/pokemon/pineco/icon.png
diff --git a/graphics/pokemon/palettes/pineco_palette.pal b/graphics/pokemon/pineco/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pineco_palette.pal
rename to graphics/pokemon/pineco/normal.pal
diff --git a/graphics/pokemon/palettes/pineco_shiny_palette.pal b/graphics/pokemon/pineco/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pineco_shiny_palette.pal
rename to graphics/pokemon/pineco/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pinsir_front_pic.png b/graphics/pokemon/pinsir/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pinsir_front_pic.png
rename to graphics/pokemon/pinsir/anim_front.png
diff --git a/graphics/pokemon/back_pics/pinsir_back_pic.png b/graphics/pokemon/pinsir/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pinsir_back_pic.png
rename to graphics/pokemon/pinsir/back.png
diff --git a/graphics/pokemon/footprints/pinsir_footprint.png b/graphics/pokemon/pinsir/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pinsir_footprint.png
rename to graphics/pokemon/pinsir/footprint.png
diff --git a/graphics/pokemon/front_pics/pinsir_still_front_pic.png b/graphics/pokemon/pinsir/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pinsir_still_front_pic.png
rename to graphics/pokemon/pinsir/front.png
diff --git a/graphics/pokemon/icons/pinsir_icon.png b/graphics/pokemon/pinsir/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pinsir_icon.png
rename to graphics/pokemon/pinsir/icon.png
diff --git a/graphics/pokemon/palettes/pinsir_palette.pal b/graphics/pokemon/pinsir/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pinsir_palette.pal
rename to graphics/pokemon/pinsir/normal.pal
diff --git a/graphics/pokemon/palettes/pinsir_shiny_palette.pal b/graphics/pokemon/pinsir/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pinsir_shiny_palette.pal
rename to graphics/pokemon/pinsir/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/plusle_front_pic.png b/graphics/pokemon/plusle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/plusle_front_pic.png
rename to graphics/pokemon/plusle/anim_front.png
diff --git a/graphics/pokemon/back_pics/plusle_back_pic.png b/graphics/pokemon/plusle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/plusle_back_pic.png
rename to graphics/pokemon/plusle/back.png
diff --git a/graphics/pokemon/footprints/plusle_footprint.png b/graphics/pokemon/plusle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/plusle_footprint.png
rename to graphics/pokemon/plusle/footprint.png
diff --git a/graphics/pokemon/front_pics/plusle_still_front_pic.png b/graphics/pokemon/plusle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/plusle_still_front_pic.png
rename to graphics/pokemon/plusle/front.png
diff --git a/graphics/pokemon/icons/plusle_icon.png b/graphics/pokemon/plusle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/plusle_icon.png
rename to graphics/pokemon/plusle/icon.png
diff --git a/graphics/pokemon/palettes/plusle_palette.pal b/graphics/pokemon/plusle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/plusle_palette.pal
rename to graphics/pokemon/plusle/normal.pal
diff --git a/graphics/pokemon/palettes/plusle_shiny_palette.pal b/graphics/pokemon/plusle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/plusle_shiny_palette.pal
rename to graphics/pokemon/plusle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/politoed_front_pic.png b/graphics/pokemon/politoed/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/politoed_front_pic.png
rename to graphics/pokemon/politoed/anim_front.png
diff --git a/graphics/pokemon/back_pics/politoed_back_pic.png b/graphics/pokemon/politoed/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/politoed_back_pic.png
rename to graphics/pokemon/politoed/back.png
diff --git a/graphics/pokemon/footprints/politoed_footprint.png b/graphics/pokemon/politoed/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/politoed_footprint.png
rename to graphics/pokemon/politoed/footprint.png
diff --git a/graphics/pokemon/front_pics/politoed_still_front_pic.png b/graphics/pokemon/politoed/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/politoed_still_front_pic.png
rename to graphics/pokemon/politoed/front.png
diff --git a/graphics/pokemon/icons/politoed_icon.png b/graphics/pokemon/politoed/icon.png
similarity index 100%
rename from graphics/pokemon/icons/politoed_icon.png
rename to graphics/pokemon/politoed/icon.png
diff --git a/graphics/pokemon/palettes/politoed_palette.pal b/graphics/pokemon/politoed/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/politoed_palette.pal
rename to graphics/pokemon/politoed/normal.pal
diff --git a/graphics/pokemon/palettes/politoed_shiny_palette.pal b/graphics/pokemon/politoed/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/politoed_shiny_palette.pal
rename to graphics/pokemon/politoed/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poliwag_front_pic.png b/graphics/pokemon/poliwag/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/poliwag_front_pic.png
rename to graphics/pokemon/poliwag/anim_front.png
diff --git a/graphics/pokemon/back_pics/poliwag_back_pic.png b/graphics/pokemon/poliwag/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/poliwag_back_pic.png
rename to graphics/pokemon/poliwag/back.png
diff --git a/graphics/pokemon/footprints/poliwag_footprint.png b/graphics/pokemon/poliwag/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/poliwag_footprint.png
rename to graphics/pokemon/poliwag/footprint.png
diff --git a/graphics/pokemon/front_pics/poliwag_still_front_pic.png b/graphics/pokemon/poliwag/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/poliwag_still_front_pic.png
rename to graphics/pokemon/poliwag/front.png
diff --git a/graphics/pokemon/icons/poliwag_icon.png b/graphics/pokemon/poliwag/icon.png
similarity index 100%
rename from graphics/pokemon/icons/poliwag_icon.png
rename to graphics/pokemon/poliwag/icon.png
diff --git a/graphics/pokemon/palettes/poliwag_palette.pal b/graphics/pokemon/poliwag/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/poliwag_palette.pal
rename to graphics/pokemon/poliwag/normal.pal
diff --git a/graphics/pokemon/palettes/poliwag_shiny_palette.pal b/graphics/pokemon/poliwag/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/poliwag_shiny_palette.pal
rename to graphics/pokemon/poliwag/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poliwhirl_front_pic.png b/graphics/pokemon/poliwhirl/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/poliwhirl_front_pic.png
rename to graphics/pokemon/poliwhirl/anim_front.png
diff --git a/graphics/pokemon/back_pics/poliwhirl_back_pic.png b/graphics/pokemon/poliwhirl/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/poliwhirl_back_pic.png
rename to graphics/pokemon/poliwhirl/back.png
diff --git a/graphics/pokemon/footprints/poliwhirl_footprint.png b/graphics/pokemon/poliwhirl/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/poliwhirl_footprint.png
rename to graphics/pokemon/poliwhirl/footprint.png
diff --git a/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png b/graphics/pokemon/poliwhirl/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/poliwhirl_still_front_pic.png
rename to graphics/pokemon/poliwhirl/front.png
diff --git a/graphics/pokemon/icons/poliwhirl_icon.png b/graphics/pokemon/poliwhirl/icon.png
similarity index 100%
rename from graphics/pokemon/icons/poliwhirl_icon.png
rename to graphics/pokemon/poliwhirl/icon.png
diff --git a/graphics/pokemon/palettes/poliwhirl_palette.pal b/graphics/pokemon/poliwhirl/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/poliwhirl_palette.pal
rename to graphics/pokemon/poliwhirl/normal.pal
diff --git a/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal b/graphics/pokemon/poliwhirl/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/poliwhirl_shiny_palette.pal
rename to graphics/pokemon/poliwhirl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poliwrath_front_pic.png b/graphics/pokemon/poliwrath/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/poliwrath_front_pic.png
rename to graphics/pokemon/poliwrath/anim_front.png
diff --git a/graphics/pokemon/back_pics/poliwrath_back_pic.png b/graphics/pokemon/poliwrath/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/poliwrath_back_pic.png
rename to graphics/pokemon/poliwrath/back.png
diff --git a/graphics/pokemon/footprints/poliwrath_footprint.png b/graphics/pokemon/poliwrath/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/poliwrath_footprint.png
rename to graphics/pokemon/poliwrath/footprint.png
diff --git a/graphics/pokemon/front_pics/poliwrath_still_front_pic.png b/graphics/pokemon/poliwrath/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/poliwrath_still_front_pic.png
rename to graphics/pokemon/poliwrath/front.png
diff --git a/graphics/pokemon/icons/poliwrath_icon.png b/graphics/pokemon/poliwrath/icon.png
similarity index 100%
rename from graphics/pokemon/icons/poliwrath_icon.png
rename to graphics/pokemon/poliwrath/icon.png
diff --git a/graphics/pokemon/palettes/poliwrath_palette.pal b/graphics/pokemon/poliwrath/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/poliwrath_palette.pal
rename to graphics/pokemon/poliwrath/normal.pal
diff --git a/graphics/pokemon/palettes/poliwrath_shiny_palette.pal b/graphics/pokemon/poliwrath/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/poliwrath_shiny_palette.pal
rename to graphics/pokemon/poliwrath/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ponyta_front_pic.png b/graphics/pokemon/ponyta/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ponyta_front_pic.png
rename to graphics/pokemon/ponyta/anim_front.png
diff --git a/graphics/pokemon/back_pics/ponyta_back_pic.png b/graphics/pokemon/ponyta/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ponyta_back_pic.png
rename to graphics/pokemon/ponyta/back.png
diff --git a/graphics/pokemon/footprints/ponyta_footprint.png b/graphics/pokemon/ponyta/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ponyta_footprint.png
rename to graphics/pokemon/ponyta/footprint.png
diff --git a/graphics/pokemon/front_pics/ponyta_still_front_pic.png b/graphics/pokemon/ponyta/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ponyta_still_front_pic.png
rename to graphics/pokemon/ponyta/front.png
diff --git a/graphics/pokemon/icons/ponyta_icon.png b/graphics/pokemon/ponyta/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ponyta_icon.png
rename to graphics/pokemon/ponyta/icon.png
diff --git a/graphics/pokemon/palettes/ponyta_palette.pal b/graphics/pokemon/ponyta/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ponyta_palette.pal
rename to graphics/pokemon/ponyta/normal.pal
diff --git a/graphics/pokemon/palettes/ponyta_shiny_palette.pal b/graphics/pokemon/ponyta/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ponyta_shiny_palette.pal
rename to graphics/pokemon/ponyta/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poochyena_front_pic.png b/graphics/pokemon/poochyena/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/poochyena_front_pic.png
rename to graphics/pokemon/poochyena/anim_front.png
diff --git a/graphics/pokemon/back_pics/poochyena_back_pic.png b/graphics/pokemon/poochyena/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/poochyena_back_pic.png
rename to graphics/pokemon/poochyena/back.png
diff --git a/graphics/pokemon/footprints/poochyena_footprint.png b/graphics/pokemon/poochyena/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/poochyena_footprint.png
rename to graphics/pokemon/poochyena/footprint.png
diff --git a/graphics/pokemon/front_pics/poochyena_still_front_pic.png b/graphics/pokemon/poochyena/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/poochyena_still_front_pic.png
rename to graphics/pokemon/poochyena/front.png
diff --git a/graphics/pokemon/icons/poochyena_icon.png b/graphics/pokemon/poochyena/icon.png
similarity index 100%
rename from graphics/pokemon/icons/poochyena_icon.png
rename to graphics/pokemon/poochyena/icon.png
diff --git a/graphics/pokemon/palettes/poochyena_palette.pal b/graphics/pokemon/poochyena/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/poochyena_palette.pal
rename to graphics/pokemon/poochyena/normal.pal
diff --git a/graphics/pokemon/palettes/poochyena_shiny_palette.pal b/graphics/pokemon/poochyena/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/poochyena_shiny_palette.pal
rename to graphics/pokemon/poochyena/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/porygon_front_pic.png b/graphics/pokemon/porygon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/porygon_front_pic.png
rename to graphics/pokemon/porygon/anim_front.png
diff --git a/graphics/pokemon/back_pics/porygon_back_pic.png b/graphics/pokemon/porygon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/porygon_back_pic.png
rename to graphics/pokemon/porygon/back.png
diff --git a/graphics/pokemon/footprints/porygon_footprint.png b/graphics/pokemon/porygon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/porygon_footprint.png
rename to graphics/pokemon/porygon/footprint.png
diff --git a/graphics/pokemon/front_pics/porygon_still_front_pic.png b/graphics/pokemon/porygon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/porygon_still_front_pic.png
rename to graphics/pokemon/porygon/front.png
diff --git a/graphics/pokemon/icons/porygon_icon.png b/graphics/pokemon/porygon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/porygon_icon.png
rename to graphics/pokemon/porygon/icon.png
diff --git a/graphics/pokemon/palettes/porygon_palette.pal b/graphics/pokemon/porygon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/porygon_palette.pal
rename to graphics/pokemon/porygon/normal.pal
diff --git a/graphics/pokemon/palettes/porygon_shiny_palette.pal b/graphics/pokemon/porygon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/porygon_shiny_palette.pal
rename to graphics/pokemon/porygon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/porygon2_front_pic.png b/graphics/pokemon/porygon2/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/porygon2_front_pic.png
rename to graphics/pokemon/porygon2/anim_front.png
diff --git a/graphics/pokemon/back_pics/porygon2_back_pic.png b/graphics/pokemon/porygon2/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/porygon2_back_pic.png
rename to graphics/pokemon/porygon2/back.png
diff --git a/graphics/pokemon/footprints/porygon2_footprint.png b/graphics/pokemon/porygon2/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/porygon2_footprint.png
rename to graphics/pokemon/porygon2/footprint.png
diff --git a/graphics/pokemon/front_pics/porygon2_still_front_pic.png b/graphics/pokemon/porygon2/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/porygon2_still_front_pic.png
rename to graphics/pokemon/porygon2/front.png
diff --git a/graphics/pokemon/icons/porygon2_icon.png b/graphics/pokemon/porygon2/icon.png
similarity index 100%
rename from graphics/pokemon/icons/porygon2_icon.png
rename to graphics/pokemon/porygon2/icon.png
diff --git a/graphics/pokemon/palettes/porygon2_palette.pal b/graphics/pokemon/porygon2/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/porygon2_palette.pal
rename to graphics/pokemon/porygon2/normal.pal
diff --git a/graphics/pokemon/palettes/porygon2_shiny_palette.pal b/graphics/pokemon/porygon2/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/porygon2_shiny_palette.pal
rename to graphics/pokemon/porygon2/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/primeape_front_pic.png b/graphics/pokemon/primeape/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/primeape_front_pic.png
rename to graphics/pokemon/primeape/anim_front.png
diff --git a/graphics/pokemon/back_pics/primeape_back_pic.png b/graphics/pokemon/primeape/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/primeape_back_pic.png
rename to graphics/pokemon/primeape/back.png
diff --git a/graphics/pokemon/footprints/primeape_footprint.png b/graphics/pokemon/primeape/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/primeape_footprint.png
rename to graphics/pokemon/primeape/footprint.png
diff --git a/graphics/pokemon/front_pics/primeape_still_front_pic.png b/graphics/pokemon/primeape/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/primeape_still_front_pic.png
rename to graphics/pokemon/primeape/front.png
diff --git a/graphics/pokemon/icons/primeape_icon.png b/graphics/pokemon/primeape/icon.png
similarity index 100%
rename from graphics/pokemon/icons/primeape_icon.png
rename to graphics/pokemon/primeape/icon.png
diff --git a/graphics/pokemon/palettes/primeape_palette.pal b/graphics/pokemon/primeape/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/primeape_palette.pal
rename to graphics/pokemon/primeape/normal.pal
diff --git a/graphics/pokemon/palettes/primeape_shiny_palette.pal b/graphics/pokemon/primeape/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/primeape_shiny_palette.pal
rename to graphics/pokemon/primeape/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/psyduck_front_pic.png b/graphics/pokemon/psyduck/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/psyduck_front_pic.png
rename to graphics/pokemon/psyduck/anim_front.png
diff --git a/graphics/pokemon/back_pics/psyduck_back_pic.png b/graphics/pokemon/psyduck/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/psyduck_back_pic.png
rename to graphics/pokemon/psyduck/back.png
diff --git a/graphics/pokemon/footprints/psyduck_footprint.png b/graphics/pokemon/psyduck/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/psyduck_footprint.png
rename to graphics/pokemon/psyduck/footprint.png
diff --git a/graphics/pokemon/front_pics/psyduck_still_front_pic.png b/graphics/pokemon/psyduck/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/psyduck_still_front_pic.png
rename to graphics/pokemon/psyduck/front.png
diff --git a/graphics/pokemon/icons/psyduck_icon.png b/graphics/pokemon/psyduck/icon.png
similarity index 100%
rename from graphics/pokemon/icons/psyduck_icon.png
rename to graphics/pokemon/psyduck/icon.png
diff --git a/graphics/pokemon/palettes/psyduck_palette.pal b/graphics/pokemon/psyduck/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/psyduck_palette.pal
rename to graphics/pokemon/psyduck/normal.pal
diff --git a/graphics/pokemon/palettes/psyduck_shiny_palette.pal b/graphics/pokemon/psyduck/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/psyduck_shiny_palette.pal
rename to graphics/pokemon/psyduck/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pupitar_front_pic.png b/graphics/pokemon/pupitar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/pupitar_front_pic.png
rename to graphics/pokemon/pupitar/anim_front.png
diff --git a/graphics/pokemon/back_pics/pupitar_back_pic.png b/graphics/pokemon/pupitar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/pupitar_back_pic.png
rename to graphics/pokemon/pupitar/back.png
diff --git a/graphics/pokemon/footprints/pupitar_footprint.png b/graphics/pokemon/pupitar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/pupitar_footprint.png
rename to graphics/pokemon/pupitar/footprint.png
diff --git a/graphics/pokemon/front_pics/pupitar_still_front_pic.png b/graphics/pokemon/pupitar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/pupitar_still_front_pic.png
rename to graphics/pokemon/pupitar/front.png
diff --git a/graphics/pokemon/icons/pupitar_icon.png b/graphics/pokemon/pupitar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/pupitar_icon.png
rename to graphics/pokemon/pupitar/icon.png
diff --git a/graphics/pokemon/palettes/pupitar_palette.pal b/graphics/pokemon/pupitar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/pupitar_palette.pal
rename to graphics/pokemon/pupitar/normal.pal
diff --git a/graphics/pokemon/palettes/pupitar_shiny_palette.pal b/graphics/pokemon/pupitar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/pupitar_shiny_palette.pal
rename to graphics/pokemon/pupitar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/quagsire_front_pic.png b/graphics/pokemon/quagsire/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/quagsire_front_pic.png
rename to graphics/pokemon/quagsire/anim_front.png
diff --git a/graphics/pokemon/back_pics/quagsire_back_pic.png b/graphics/pokemon/quagsire/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/quagsire_back_pic.png
rename to graphics/pokemon/quagsire/back.png
diff --git a/graphics/pokemon/footprints/quagsire_footprint.png b/graphics/pokemon/quagsire/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/quagsire_footprint.png
rename to graphics/pokemon/quagsire/footprint.png
diff --git a/graphics/pokemon/front_pics/quagsire_still_front_pic.png b/graphics/pokemon/quagsire/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/quagsire_still_front_pic.png
rename to graphics/pokemon/quagsire/front.png
diff --git a/graphics/pokemon/icons/quagsire_icon.png b/graphics/pokemon/quagsire/icon.png
similarity index 100%
rename from graphics/pokemon/icons/quagsire_icon.png
rename to graphics/pokemon/quagsire/icon.png
diff --git a/graphics/pokemon/palettes/quagsire_palette.pal b/graphics/pokemon/quagsire/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/quagsire_palette.pal
rename to graphics/pokemon/quagsire/normal.pal
diff --git a/graphics/pokemon/palettes/quagsire_shiny_palette.pal b/graphics/pokemon/quagsire/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/quagsire_shiny_palette.pal
rename to graphics/pokemon/quagsire/shiny.pal
diff --git a/graphics/pokemon/footprints/question_mark_footprint.png b/graphics/pokemon/question_mark/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/question_mark_footprint.png
rename to graphics/pokemon/question_mark/footprint.png
diff --git a/graphics/pokemon/icons/question_mark_icon.png b/graphics/pokemon/question_mark/icon.png
similarity index 100%
rename from graphics/pokemon/icons/question_mark_icon.png
rename to graphics/pokemon/question_mark/icon.png
diff --git a/graphics/pokemon/anim_front_pics/quilava_front_pic.png b/graphics/pokemon/quilava/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/quilava_front_pic.png
rename to graphics/pokemon/quilava/anim_front.png
diff --git a/graphics/pokemon/back_pics/quilava_back_pic.png b/graphics/pokemon/quilava/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/quilava_back_pic.png
rename to graphics/pokemon/quilava/back.png
diff --git a/graphics/pokemon/footprints/quilava_footprint.png b/graphics/pokemon/quilava/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/quilava_footprint.png
rename to graphics/pokemon/quilava/footprint.png
diff --git a/graphics/pokemon/front_pics/quilava_still_front_pic.png b/graphics/pokemon/quilava/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/quilava_still_front_pic.png
rename to graphics/pokemon/quilava/front.png
diff --git a/graphics/pokemon/icons/quilava_icon.png b/graphics/pokemon/quilava/icon.png
similarity index 100%
rename from graphics/pokemon/icons/quilava_icon.png
rename to graphics/pokemon/quilava/icon.png
diff --git a/graphics/pokemon/palettes/quilava_palette.pal b/graphics/pokemon/quilava/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/quilava_palette.pal
rename to graphics/pokemon/quilava/normal.pal
diff --git a/graphics/pokemon/palettes/quilava_shiny_palette.pal b/graphics/pokemon/quilava/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/quilava_shiny_palette.pal
rename to graphics/pokemon/quilava/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/qwilfish_front_pic.png b/graphics/pokemon/qwilfish/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/qwilfish_front_pic.png
rename to graphics/pokemon/qwilfish/anim_front.png
diff --git a/graphics/pokemon/back_pics/qwilfish_back_pic.png b/graphics/pokemon/qwilfish/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/qwilfish_back_pic.png
rename to graphics/pokemon/qwilfish/back.png
diff --git a/graphics/pokemon/footprints/qwilfish_footprint.png b/graphics/pokemon/qwilfish/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/qwilfish_footprint.png
rename to graphics/pokemon/qwilfish/footprint.png
diff --git a/graphics/pokemon/front_pics/qwilfish_still_front_pic.png b/graphics/pokemon/qwilfish/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/qwilfish_still_front_pic.png
rename to graphics/pokemon/qwilfish/front.png
diff --git a/graphics/pokemon/icons/qwilfish_icon.png b/graphics/pokemon/qwilfish/icon.png
similarity index 100%
rename from graphics/pokemon/icons/qwilfish_icon.png
rename to graphics/pokemon/qwilfish/icon.png
diff --git a/graphics/pokemon/palettes/qwilfish_palette.pal b/graphics/pokemon/qwilfish/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/qwilfish_palette.pal
rename to graphics/pokemon/qwilfish/normal.pal
diff --git a/graphics/pokemon/palettes/qwilfish_shiny_palette.pal b/graphics/pokemon/qwilfish/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/qwilfish_shiny_palette.pal
rename to graphics/pokemon/qwilfish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/raichu_front_pic.png b/graphics/pokemon/raichu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/raichu_front_pic.png
rename to graphics/pokemon/raichu/anim_front.png
diff --git a/graphics/pokemon/back_pics/raichu_back_pic.png b/graphics/pokemon/raichu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/raichu_back_pic.png
rename to graphics/pokemon/raichu/back.png
diff --git a/graphics/pokemon/footprints/raichu_footprint.png b/graphics/pokemon/raichu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/raichu_footprint.png
rename to graphics/pokemon/raichu/footprint.png
diff --git a/graphics/pokemon/front_pics/raichu_still_front_pic.png b/graphics/pokemon/raichu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/raichu_still_front_pic.png
rename to graphics/pokemon/raichu/front.png
diff --git a/graphics/pokemon/icons/raichu_icon.png b/graphics/pokemon/raichu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/raichu_icon.png
rename to graphics/pokemon/raichu/icon.png
diff --git a/graphics/pokemon/palettes/raichu_palette.pal b/graphics/pokemon/raichu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/raichu_palette.pal
rename to graphics/pokemon/raichu/normal.pal
diff --git a/graphics/pokemon/palettes/raichu_shiny_palette.pal b/graphics/pokemon/raichu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/raichu_shiny_palette.pal
rename to graphics/pokemon/raichu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/raikou_front_pic.png b/graphics/pokemon/raikou/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/raikou_front_pic.png
rename to graphics/pokemon/raikou/anim_front.png
diff --git a/graphics/pokemon/back_pics/raikou_back_pic.png b/graphics/pokemon/raikou/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/raikou_back_pic.png
rename to graphics/pokemon/raikou/back.png
diff --git a/graphics/pokemon/footprints/raikou_footprint.png b/graphics/pokemon/raikou/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/raikou_footprint.png
rename to graphics/pokemon/raikou/footprint.png
diff --git a/graphics/pokemon/front_pics/raikou_still_front_pic.png b/graphics/pokemon/raikou/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/raikou_still_front_pic.png
rename to graphics/pokemon/raikou/front.png
diff --git a/graphics/pokemon/icons/raikou_icon.png b/graphics/pokemon/raikou/icon.png
similarity index 100%
rename from graphics/pokemon/icons/raikou_icon.png
rename to graphics/pokemon/raikou/icon.png
diff --git a/graphics/pokemon/palettes/raikou_palette.pal b/graphics/pokemon/raikou/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/raikou_palette.pal
rename to graphics/pokemon/raikou/normal.pal
diff --git a/graphics/pokemon/palettes/raikou_shiny_palette.pal b/graphics/pokemon/raikou/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/raikou_shiny_palette.pal
rename to graphics/pokemon/raikou/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ralts_front_pic.png b/graphics/pokemon/ralts/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ralts_front_pic.png
rename to graphics/pokemon/ralts/anim_front.png
diff --git a/graphics/pokemon/back_pics/ralts_back_pic.png b/graphics/pokemon/ralts/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ralts_back_pic.png
rename to graphics/pokemon/ralts/back.png
diff --git a/graphics/pokemon/footprints/ralts_footprint.png b/graphics/pokemon/ralts/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ralts_footprint.png
rename to graphics/pokemon/ralts/footprint.png
diff --git a/graphics/pokemon/front_pics/ralts_still_front_pic.png b/graphics/pokemon/ralts/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ralts_still_front_pic.png
rename to graphics/pokemon/ralts/front.png
diff --git a/graphics/pokemon/icons/ralts_icon.png b/graphics/pokemon/ralts/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ralts_icon.png
rename to graphics/pokemon/ralts/icon.png
diff --git a/graphics/pokemon/palettes/ralts_palette.pal b/graphics/pokemon/ralts/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ralts_palette.pal
rename to graphics/pokemon/ralts/normal.pal
diff --git a/graphics/pokemon/palettes/ralts_shiny_palette.pal b/graphics/pokemon/ralts/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ralts_shiny_palette.pal
rename to graphics/pokemon/ralts/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rapidash_front_pic.png b/graphics/pokemon/rapidash/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/rapidash_front_pic.png
rename to graphics/pokemon/rapidash/anim_front.png
diff --git a/graphics/pokemon/back_pics/rapidash_back_pic.png b/graphics/pokemon/rapidash/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/rapidash_back_pic.png
rename to graphics/pokemon/rapidash/back.png
diff --git a/graphics/pokemon/footprints/rapidash_footprint.png b/graphics/pokemon/rapidash/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/rapidash_footprint.png
rename to graphics/pokemon/rapidash/footprint.png
diff --git a/graphics/pokemon/front_pics/rapidash_still_front_pic.png b/graphics/pokemon/rapidash/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/rapidash_still_front_pic.png
rename to graphics/pokemon/rapidash/front.png
diff --git a/graphics/pokemon/icons/rapidash_icon.png b/graphics/pokemon/rapidash/icon.png
similarity index 100%
rename from graphics/pokemon/icons/rapidash_icon.png
rename to graphics/pokemon/rapidash/icon.png
diff --git a/graphics/pokemon/palettes/rapidash_palette.pal b/graphics/pokemon/rapidash/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/rapidash_palette.pal
rename to graphics/pokemon/rapidash/normal.pal
diff --git a/graphics/pokemon/palettes/rapidash_shiny_palette.pal b/graphics/pokemon/rapidash/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/rapidash_shiny_palette.pal
rename to graphics/pokemon/rapidash/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/raticate_front_pic.png b/graphics/pokemon/raticate/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/raticate_front_pic.png
rename to graphics/pokemon/raticate/anim_front.png
diff --git a/graphics/pokemon/back_pics/raticate_back_pic.png b/graphics/pokemon/raticate/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/raticate_back_pic.png
rename to graphics/pokemon/raticate/back.png
diff --git a/graphics/pokemon/footprints/raticate_footprint.png b/graphics/pokemon/raticate/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/raticate_footprint.png
rename to graphics/pokemon/raticate/footprint.png
diff --git a/graphics/pokemon/front_pics/raticate_still_front_pic.png b/graphics/pokemon/raticate/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/raticate_still_front_pic.png
rename to graphics/pokemon/raticate/front.png
diff --git a/graphics/pokemon/icons/raticate_icon.png b/graphics/pokemon/raticate/icon.png
similarity index 100%
rename from graphics/pokemon/icons/raticate_icon.png
rename to graphics/pokemon/raticate/icon.png
diff --git a/graphics/pokemon/palettes/raticate_palette.pal b/graphics/pokemon/raticate/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/raticate_palette.pal
rename to graphics/pokemon/raticate/normal.pal
diff --git a/graphics/pokemon/palettes/raticate_shiny_palette.pal b/graphics/pokemon/raticate/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/raticate_shiny_palette.pal
rename to graphics/pokemon/raticate/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rattata_front_pic.png b/graphics/pokemon/rattata/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/rattata_front_pic.png
rename to graphics/pokemon/rattata/anim_front.png
diff --git a/graphics/pokemon/back_pics/rattata_back_pic.png b/graphics/pokemon/rattata/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/rattata_back_pic.png
rename to graphics/pokemon/rattata/back.png
diff --git a/graphics/pokemon/footprints/rattata_footprint.png b/graphics/pokemon/rattata/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/rattata_footprint.png
rename to graphics/pokemon/rattata/footprint.png
diff --git a/graphics/pokemon/front_pics/rattata_still_front_pic.png b/graphics/pokemon/rattata/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/rattata_still_front_pic.png
rename to graphics/pokemon/rattata/front.png
diff --git a/graphics/pokemon/icons/rattata_icon.png b/graphics/pokemon/rattata/icon.png
similarity index 100%
rename from graphics/pokemon/icons/rattata_icon.png
rename to graphics/pokemon/rattata/icon.png
diff --git a/graphics/pokemon/palettes/rattata_palette.pal b/graphics/pokemon/rattata/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/rattata_palette.pal
rename to graphics/pokemon/rattata/normal.pal
diff --git a/graphics/pokemon/palettes/rattata_shiny_palette.pal b/graphics/pokemon/rattata/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/rattata_shiny_palette.pal
rename to graphics/pokemon/rattata/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rayquaza_front_pic.png b/graphics/pokemon/rayquaza/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/rayquaza_front_pic.png
rename to graphics/pokemon/rayquaza/anim_front.png
diff --git a/graphics/pokemon/back_pics/rayquaza_back_pic.png b/graphics/pokemon/rayquaza/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/rayquaza_back_pic.png
rename to graphics/pokemon/rayquaza/back.png
diff --git a/graphics/pokemon/footprints/rayquaza_footprint.png b/graphics/pokemon/rayquaza/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/rayquaza_footprint.png
rename to graphics/pokemon/rayquaza/footprint.png
diff --git a/graphics/pokemon/front_pics/rayquaza_still_front_pic.png b/graphics/pokemon/rayquaza/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/rayquaza_still_front_pic.png
rename to graphics/pokemon/rayquaza/front.png
diff --git a/graphics/pokemon/icons/rayquaza_icon.png b/graphics/pokemon/rayquaza/icon.png
similarity index 100%
rename from graphics/pokemon/icons/rayquaza_icon.png
rename to graphics/pokemon/rayquaza/icon.png
diff --git a/graphics/pokemon/palettes/rayquaza_palette.pal b/graphics/pokemon/rayquaza/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/rayquaza_palette.pal
rename to graphics/pokemon/rayquaza/normal.pal
diff --git a/graphics/pokemon/palettes/rayquaza_shiny_palette.pal b/graphics/pokemon/rayquaza/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/rayquaza_shiny_palette.pal
rename to graphics/pokemon/rayquaza/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/regice_front_pic.png b/graphics/pokemon/regice/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/regice_front_pic.png
rename to graphics/pokemon/regice/anim_front.png
diff --git a/graphics/pokemon/back_pics/regice_back_pic.png b/graphics/pokemon/regice/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/regice_back_pic.png
rename to graphics/pokemon/regice/back.png
diff --git a/graphics/pokemon/footprints/regice_footprint.png b/graphics/pokemon/regice/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/regice_footprint.png
rename to graphics/pokemon/regice/footprint.png
diff --git a/graphics/pokemon/front_pics/regice_still_front_pic.png b/graphics/pokemon/regice/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/regice_still_front_pic.png
rename to graphics/pokemon/regice/front.png
diff --git a/graphics/pokemon/icons/regice_icon.png b/graphics/pokemon/regice/icon.png
similarity index 100%
rename from graphics/pokemon/icons/regice_icon.png
rename to graphics/pokemon/regice/icon.png
diff --git a/graphics/pokemon/palettes/regice_palette.pal b/graphics/pokemon/regice/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/regice_palette.pal
rename to graphics/pokemon/regice/normal.pal
diff --git a/graphics/pokemon/palettes/regice_shiny_palette.pal b/graphics/pokemon/regice/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/regice_shiny_palette.pal
rename to graphics/pokemon/regice/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/regirock_front_pic.png b/graphics/pokemon/regirock/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/regirock_front_pic.png
rename to graphics/pokemon/regirock/anim_front.png
diff --git a/graphics/pokemon/back_pics/regirock_back_pic.png b/graphics/pokemon/regirock/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/regirock_back_pic.png
rename to graphics/pokemon/regirock/back.png
diff --git a/graphics/pokemon/footprints/regirock_footprint.png b/graphics/pokemon/regirock/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/regirock_footprint.png
rename to graphics/pokemon/regirock/footprint.png
diff --git a/graphics/pokemon/front_pics/regirock_still_front_pic.png b/graphics/pokemon/regirock/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/regirock_still_front_pic.png
rename to graphics/pokemon/regirock/front.png
diff --git a/graphics/pokemon/icons/regirock_icon.png b/graphics/pokemon/regirock/icon.png
similarity index 100%
rename from graphics/pokemon/icons/regirock_icon.png
rename to graphics/pokemon/regirock/icon.png
diff --git a/graphics/pokemon/palettes/regirock_palette.pal b/graphics/pokemon/regirock/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/regirock_palette.pal
rename to graphics/pokemon/regirock/normal.pal
diff --git a/graphics/pokemon/palettes/regirock_shiny_palette.pal b/graphics/pokemon/regirock/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/regirock_shiny_palette.pal
rename to graphics/pokemon/regirock/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/registeel_front_pic.png b/graphics/pokemon/registeel/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/registeel_front_pic.png
rename to graphics/pokemon/registeel/anim_front.png
diff --git a/graphics/pokemon/back_pics/registeel_back_pic.png b/graphics/pokemon/registeel/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/registeel_back_pic.png
rename to graphics/pokemon/registeel/back.png
diff --git a/graphics/pokemon/footprints/registeel_footprint.png b/graphics/pokemon/registeel/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/registeel_footprint.png
rename to graphics/pokemon/registeel/footprint.png
diff --git a/graphics/pokemon/front_pics/registeel_still_front_pic.png b/graphics/pokemon/registeel/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/registeel_still_front_pic.png
rename to graphics/pokemon/registeel/front.png
diff --git a/graphics/pokemon/icons/registeel_icon.png b/graphics/pokemon/registeel/icon.png
similarity index 100%
rename from graphics/pokemon/icons/registeel_icon.png
rename to graphics/pokemon/registeel/icon.png
diff --git a/graphics/pokemon/palettes/registeel_palette.pal b/graphics/pokemon/registeel/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/registeel_palette.pal
rename to graphics/pokemon/registeel/normal.pal
diff --git a/graphics/pokemon/palettes/registeel_shiny_palette.pal b/graphics/pokemon/registeel/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/registeel_shiny_palette.pal
rename to graphics/pokemon/registeel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/relicanth_front_pic.png b/graphics/pokemon/relicanth/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/relicanth_front_pic.png
rename to graphics/pokemon/relicanth/anim_front.png
diff --git a/graphics/pokemon/back_pics/relicanth_back_pic.png b/graphics/pokemon/relicanth/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/relicanth_back_pic.png
rename to graphics/pokemon/relicanth/back.png
diff --git a/graphics/pokemon/footprints/relicanth_footprint.png b/graphics/pokemon/relicanth/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/relicanth_footprint.png
rename to graphics/pokemon/relicanth/footprint.png
diff --git a/graphics/pokemon/front_pics/relicanth_still_front_pic.png b/graphics/pokemon/relicanth/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/relicanth_still_front_pic.png
rename to graphics/pokemon/relicanth/front.png
diff --git a/graphics/pokemon/icons/relicanth_icon.png b/graphics/pokemon/relicanth/icon.png
similarity index 100%
rename from graphics/pokemon/icons/relicanth_icon.png
rename to graphics/pokemon/relicanth/icon.png
diff --git a/graphics/pokemon/palettes/relicanth_palette.pal b/graphics/pokemon/relicanth/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/relicanth_palette.pal
rename to graphics/pokemon/relicanth/normal.pal
diff --git a/graphics/pokemon/palettes/relicanth_shiny_palette.pal b/graphics/pokemon/relicanth/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/relicanth_shiny_palette.pal
rename to graphics/pokemon/relicanth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/remoraid_front_pic.png b/graphics/pokemon/remoraid/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/remoraid_front_pic.png
rename to graphics/pokemon/remoraid/anim_front.png
diff --git a/graphics/pokemon/back_pics/remoraid_back_pic.png b/graphics/pokemon/remoraid/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/remoraid_back_pic.png
rename to graphics/pokemon/remoraid/back.png
diff --git a/graphics/pokemon/footprints/remoraid_footprint.png b/graphics/pokemon/remoraid/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/remoraid_footprint.png
rename to graphics/pokemon/remoraid/footprint.png
diff --git a/graphics/pokemon/front_pics/remoraid_still_front_pic.png b/graphics/pokemon/remoraid/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/remoraid_still_front_pic.png
rename to graphics/pokemon/remoraid/front.png
diff --git a/graphics/pokemon/icons/remoraid_icon.png b/graphics/pokemon/remoraid/icon.png
similarity index 100%
rename from graphics/pokemon/icons/remoraid_icon.png
rename to graphics/pokemon/remoraid/icon.png
diff --git a/graphics/pokemon/palettes/remoraid_palette.pal b/graphics/pokemon/remoraid/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/remoraid_palette.pal
rename to graphics/pokemon/remoraid/normal.pal
diff --git a/graphics/pokemon/palettes/remoraid_shiny_palette.pal b/graphics/pokemon/remoraid/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/remoraid_shiny_palette.pal
rename to graphics/pokemon/remoraid/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rhydon_front_pic.png b/graphics/pokemon/rhydon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/rhydon_front_pic.png
rename to graphics/pokemon/rhydon/anim_front.png
diff --git a/graphics/pokemon/back_pics/rhydon_back_pic.png b/graphics/pokemon/rhydon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/rhydon_back_pic.png
rename to graphics/pokemon/rhydon/back.png
diff --git a/graphics/pokemon/footprints/rhydon_footprint.png b/graphics/pokemon/rhydon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/rhydon_footprint.png
rename to graphics/pokemon/rhydon/footprint.png
diff --git a/graphics/pokemon/front_pics/rhydon_still_front_pic.png b/graphics/pokemon/rhydon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/rhydon_still_front_pic.png
rename to graphics/pokemon/rhydon/front.png
diff --git a/graphics/pokemon/icons/rhydon_icon.png b/graphics/pokemon/rhydon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/rhydon_icon.png
rename to graphics/pokemon/rhydon/icon.png
diff --git a/graphics/pokemon/palettes/rhydon_palette.pal b/graphics/pokemon/rhydon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/rhydon_palette.pal
rename to graphics/pokemon/rhydon/normal.pal
diff --git a/graphics/pokemon/palettes/rhydon_shiny_palette.pal b/graphics/pokemon/rhydon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/rhydon_shiny_palette.pal
rename to graphics/pokemon/rhydon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rhyhorn_front_pic.png b/graphics/pokemon/rhyhorn/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/rhyhorn_front_pic.png
rename to graphics/pokemon/rhyhorn/anim_front.png
diff --git a/graphics/pokemon/back_pics/rhyhorn_back_pic.png b/graphics/pokemon/rhyhorn/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/rhyhorn_back_pic.png
rename to graphics/pokemon/rhyhorn/back.png
diff --git a/graphics/pokemon/footprints/rhyhorn_footprint.png b/graphics/pokemon/rhyhorn/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/rhyhorn_footprint.png
rename to graphics/pokemon/rhyhorn/footprint.png
diff --git a/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png b/graphics/pokemon/rhyhorn/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/rhyhorn_still_front_pic.png
rename to graphics/pokemon/rhyhorn/front.png
diff --git a/graphics/pokemon/icons/rhyhorn_icon.png b/graphics/pokemon/rhyhorn/icon.png
similarity index 100%
rename from graphics/pokemon/icons/rhyhorn_icon.png
rename to graphics/pokemon/rhyhorn/icon.png
diff --git a/graphics/pokemon/palettes/rhyhorn_palette.pal b/graphics/pokemon/rhyhorn/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/rhyhorn_palette.pal
rename to graphics/pokemon/rhyhorn/normal.pal
diff --git a/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal b/graphics/pokemon/rhyhorn/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/rhyhorn_shiny_palette.pal
rename to graphics/pokemon/rhyhorn/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/roselia_front_pic.png b/graphics/pokemon/roselia/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/roselia_front_pic.png
rename to graphics/pokemon/roselia/anim_front.png
diff --git a/graphics/pokemon/back_pics/roselia_back_pic.png b/graphics/pokemon/roselia/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/roselia_back_pic.png
rename to graphics/pokemon/roselia/back.png
diff --git a/graphics/pokemon/footprints/roselia_footprint.png b/graphics/pokemon/roselia/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/roselia_footprint.png
rename to graphics/pokemon/roselia/footprint.png
diff --git a/graphics/pokemon/front_pics/roselia_still_front_pic.png b/graphics/pokemon/roselia/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/roselia_still_front_pic.png
rename to graphics/pokemon/roselia/front.png
diff --git a/graphics/pokemon/icons/roselia_icon.png b/graphics/pokemon/roselia/icon.png
similarity index 100%
rename from graphics/pokemon/icons/roselia_icon.png
rename to graphics/pokemon/roselia/icon.png
diff --git a/graphics/pokemon/palettes/roselia_palette.pal b/graphics/pokemon/roselia/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/roselia_palette.pal
rename to graphics/pokemon/roselia/normal.pal
diff --git a/graphics/pokemon/palettes/roselia_shiny_palette.pal b/graphics/pokemon/roselia/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/roselia_shiny_palette.pal
rename to graphics/pokemon/roselia/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sableye_front_pic.png b/graphics/pokemon/sableye/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sableye_front_pic.png
rename to graphics/pokemon/sableye/anim_front.png
diff --git a/graphics/pokemon/back_pics/sableye_back_pic.png b/graphics/pokemon/sableye/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sableye_back_pic.png
rename to graphics/pokemon/sableye/back.png
diff --git a/graphics/pokemon/footprints/sableye_footprint.png b/graphics/pokemon/sableye/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sableye_footprint.png
rename to graphics/pokemon/sableye/footprint.png
diff --git a/graphics/pokemon/front_pics/sableye_still_front_pic.png b/graphics/pokemon/sableye/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sableye_still_front_pic.png
rename to graphics/pokemon/sableye/front.png
diff --git a/graphics/pokemon/icons/sableye_icon.png b/graphics/pokemon/sableye/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sableye_icon.png
rename to graphics/pokemon/sableye/icon.png
diff --git a/graphics/pokemon/palettes/sableye_palette.pal b/graphics/pokemon/sableye/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sableye_palette.pal
rename to graphics/pokemon/sableye/normal.pal
diff --git a/graphics/pokemon/palettes/sableye_shiny_palette.pal b/graphics/pokemon/sableye/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sableye_shiny_palette.pal
rename to graphics/pokemon/sableye/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/salamence_front_pic.png b/graphics/pokemon/salamence/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/salamence_front_pic.png
rename to graphics/pokemon/salamence/anim_front.png
diff --git a/graphics/pokemon/back_pics/salamence_back_pic.png b/graphics/pokemon/salamence/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/salamence_back_pic.png
rename to graphics/pokemon/salamence/back.png
diff --git a/graphics/pokemon/footprints/salamence_footprint.png b/graphics/pokemon/salamence/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/salamence_footprint.png
rename to graphics/pokemon/salamence/footprint.png
diff --git a/graphics/pokemon/front_pics/salamence_still_front_pic.png b/graphics/pokemon/salamence/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/salamence_still_front_pic.png
rename to graphics/pokemon/salamence/front.png
diff --git a/graphics/pokemon/icons/salamence_icon.png b/graphics/pokemon/salamence/icon.png
similarity index 100%
rename from graphics/pokemon/icons/salamence_icon.png
rename to graphics/pokemon/salamence/icon.png
diff --git a/graphics/pokemon/palettes/salamence_palette.pal b/graphics/pokemon/salamence/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/salamence_palette.pal
rename to graphics/pokemon/salamence/normal.pal
diff --git a/graphics/pokemon/palettes/salamence_shiny_palette.pal b/graphics/pokemon/salamence/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/salamence_shiny_palette.pal
rename to graphics/pokemon/salamence/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sandshrew_front_pic.png b/graphics/pokemon/sandshrew/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sandshrew_front_pic.png
rename to graphics/pokemon/sandshrew/anim_front.png
diff --git a/graphics/pokemon/back_pics/sandshrew_back_pic.png b/graphics/pokemon/sandshrew/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sandshrew_back_pic.png
rename to graphics/pokemon/sandshrew/back.png
diff --git a/graphics/pokemon/footprints/sandshrew_footprint.png b/graphics/pokemon/sandshrew/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sandshrew_footprint.png
rename to graphics/pokemon/sandshrew/footprint.png
diff --git a/graphics/pokemon/front_pics/sandshrew_still_front_pic.png b/graphics/pokemon/sandshrew/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sandshrew_still_front_pic.png
rename to graphics/pokemon/sandshrew/front.png
diff --git a/graphics/pokemon/icons/sandshrew_icon.png b/graphics/pokemon/sandshrew/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sandshrew_icon.png
rename to graphics/pokemon/sandshrew/icon.png
diff --git a/graphics/pokemon/palettes/sandshrew_palette.pal b/graphics/pokemon/sandshrew/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sandshrew_palette.pal
rename to graphics/pokemon/sandshrew/normal.pal
diff --git a/graphics/pokemon/palettes/sandshrew_shiny_palette.pal b/graphics/pokemon/sandshrew/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sandshrew_shiny_palette.pal
rename to graphics/pokemon/sandshrew/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sandslash_front_pic.png b/graphics/pokemon/sandslash/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sandslash_front_pic.png
rename to graphics/pokemon/sandslash/anim_front.png
diff --git a/graphics/pokemon/back_pics/sandslash_back_pic.png b/graphics/pokemon/sandslash/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sandslash_back_pic.png
rename to graphics/pokemon/sandslash/back.png
diff --git a/graphics/pokemon/footprints/sandslash_footprint.png b/graphics/pokemon/sandslash/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sandslash_footprint.png
rename to graphics/pokemon/sandslash/footprint.png
diff --git a/graphics/pokemon/front_pics/sandslash_still_front_pic.png b/graphics/pokemon/sandslash/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sandslash_still_front_pic.png
rename to graphics/pokemon/sandslash/front.png
diff --git a/graphics/pokemon/icons/sandslash_icon.png b/graphics/pokemon/sandslash/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sandslash_icon.png
rename to graphics/pokemon/sandslash/icon.png
diff --git a/graphics/pokemon/palettes/sandslash_palette.pal b/graphics/pokemon/sandslash/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sandslash_palette.pal
rename to graphics/pokemon/sandslash/normal.pal
diff --git a/graphics/pokemon/palettes/sandslash_shiny_palette.pal b/graphics/pokemon/sandslash/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sandslash_shiny_palette.pal
rename to graphics/pokemon/sandslash/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sceptile_front_pic.png b/graphics/pokemon/sceptile/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sceptile_front_pic.png
rename to graphics/pokemon/sceptile/anim_front.png
diff --git a/graphics/pokemon/back_pics/sceptile_back_pic.png b/graphics/pokemon/sceptile/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sceptile_back_pic.png
rename to graphics/pokemon/sceptile/back.png
diff --git a/graphics/pokemon/footprints/sceptile_footprint.png b/graphics/pokemon/sceptile/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sceptile_footprint.png
rename to graphics/pokemon/sceptile/footprint.png
diff --git a/graphics/pokemon/front_pics/sceptile_still_front_pic.png b/graphics/pokemon/sceptile/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sceptile_still_front_pic.png
rename to graphics/pokemon/sceptile/front.png
diff --git a/graphics/pokemon/icons/sceptile_icon.png b/graphics/pokemon/sceptile/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sceptile_icon.png
rename to graphics/pokemon/sceptile/icon.png
diff --git a/graphics/pokemon/palettes/sceptile_palette.pal b/graphics/pokemon/sceptile/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sceptile_palette.pal
rename to graphics/pokemon/sceptile/normal.pal
diff --git a/graphics/pokemon/palettes/sceptile_shiny_palette.pal b/graphics/pokemon/sceptile/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sceptile_shiny_palette.pal
rename to graphics/pokemon/sceptile/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/scizor_front_pic.png b/graphics/pokemon/scizor/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/scizor_front_pic.png
rename to graphics/pokemon/scizor/anim_front.png
diff --git a/graphics/pokemon/back_pics/scizor_back_pic.png b/graphics/pokemon/scizor/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/scizor_back_pic.png
rename to graphics/pokemon/scizor/back.png
diff --git a/graphics/pokemon/footprints/scizor_footprint.png b/graphics/pokemon/scizor/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/scizor_footprint.png
rename to graphics/pokemon/scizor/footprint.png
diff --git a/graphics/pokemon/front_pics/scizor_still_front_pic.png b/graphics/pokemon/scizor/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/scizor_still_front_pic.png
rename to graphics/pokemon/scizor/front.png
diff --git a/graphics/pokemon/icons/scizor_icon.png b/graphics/pokemon/scizor/icon.png
similarity index 100%
rename from graphics/pokemon/icons/scizor_icon.png
rename to graphics/pokemon/scizor/icon.png
diff --git a/graphics/pokemon/palettes/scizor_palette.pal b/graphics/pokemon/scizor/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/scizor_palette.pal
rename to graphics/pokemon/scizor/normal.pal
diff --git a/graphics/pokemon/palettes/scizor_shiny_palette.pal b/graphics/pokemon/scizor/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/scizor_shiny_palette.pal
rename to graphics/pokemon/scizor/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/scyther_front_pic.png b/graphics/pokemon/scyther/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/scyther_front_pic.png
rename to graphics/pokemon/scyther/anim_front.png
diff --git a/graphics/pokemon/back_pics/scyther_back_pic.png b/graphics/pokemon/scyther/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/scyther_back_pic.png
rename to graphics/pokemon/scyther/back.png
diff --git a/graphics/pokemon/footprints/scyther_footprint.png b/graphics/pokemon/scyther/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/scyther_footprint.png
rename to graphics/pokemon/scyther/footprint.png
diff --git a/graphics/pokemon/front_pics/scyther_still_front_pic.png b/graphics/pokemon/scyther/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/scyther_still_front_pic.png
rename to graphics/pokemon/scyther/front.png
diff --git a/graphics/pokemon/icons/scyther_icon.png b/graphics/pokemon/scyther/icon.png
similarity index 100%
rename from graphics/pokemon/icons/scyther_icon.png
rename to graphics/pokemon/scyther/icon.png
diff --git a/graphics/pokemon/palettes/scyther_palette.pal b/graphics/pokemon/scyther/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/scyther_palette.pal
rename to graphics/pokemon/scyther/normal.pal
diff --git a/graphics/pokemon/palettes/scyther_shiny_palette.pal b/graphics/pokemon/scyther/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/scyther_shiny_palette.pal
rename to graphics/pokemon/scyther/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seadra_front_pic.png b/graphics/pokemon/seadra/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/seadra_front_pic.png
rename to graphics/pokemon/seadra/anim_front.png
diff --git a/graphics/pokemon/back_pics/seadra_back_pic.png b/graphics/pokemon/seadra/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/seadra_back_pic.png
rename to graphics/pokemon/seadra/back.png
diff --git a/graphics/pokemon/footprints/seadra_footprint.png b/graphics/pokemon/seadra/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/seadra_footprint.png
rename to graphics/pokemon/seadra/footprint.png
diff --git a/graphics/pokemon/front_pics/seadra_still_front_pic.png b/graphics/pokemon/seadra/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/seadra_still_front_pic.png
rename to graphics/pokemon/seadra/front.png
diff --git a/graphics/pokemon/icons/seadra_icon.png b/graphics/pokemon/seadra/icon.png
similarity index 100%
rename from graphics/pokemon/icons/seadra_icon.png
rename to graphics/pokemon/seadra/icon.png
diff --git a/graphics/pokemon/palettes/seadra_palette.pal b/graphics/pokemon/seadra/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/seadra_palette.pal
rename to graphics/pokemon/seadra/normal.pal
diff --git a/graphics/pokemon/palettes/seadra_shiny_palette.pal b/graphics/pokemon/seadra/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/seadra_shiny_palette.pal
rename to graphics/pokemon/seadra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seaking_front_pic.png b/graphics/pokemon/seaking/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/seaking_front_pic.png
rename to graphics/pokemon/seaking/anim_front.png
diff --git a/graphics/pokemon/back_pics/seaking_back_pic.png b/graphics/pokemon/seaking/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/seaking_back_pic.png
rename to graphics/pokemon/seaking/back.png
diff --git a/graphics/pokemon/footprints/seaking_footprint.png b/graphics/pokemon/seaking/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/seaking_footprint.png
rename to graphics/pokemon/seaking/footprint.png
diff --git a/graphics/pokemon/front_pics/seaking_still_front_pic.png b/graphics/pokemon/seaking/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/seaking_still_front_pic.png
rename to graphics/pokemon/seaking/front.png
diff --git a/graphics/pokemon/icons/seaking_icon.png b/graphics/pokemon/seaking/icon.png
similarity index 100%
rename from graphics/pokemon/icons/seaking_icon.png
rename to graphics/pokemon/seaking/icon.png
diff --git a/graphics/pokemon/palettes/seaking_palette.pal b/graphics/pokemon/seaking/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/seaking_palette.pal
rename to graphics/pokemon/seaking/normal.pal
diff --git a/graphics/pokemon/palettes/seaking_shiny_palette.pal b/graphics/pokemon/seaking/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/seaking_shiny_palette.pal
rename to graphics/pokemon/seaking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sealeo_front_pic.png b/graphics/pokemon/sealeo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sealeo_front_pic.png
rename to graphics/pokemon/sealeo/anim_front.png
diff --git a/graphics/pokemon/back_pics/sealeo_back_pic.png b/graphics/pokemon/sealeo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sealeo_back_pic.png
rename to graphics/pokemon/sealeo/back.png
diff --git a/graphics/pokemon/footprints/sealeo_footprint.png b/graphics/pokemon/sealeo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sealeo_footprint.png
rename to graphics/pokemon/sealeo/footprint.png
diff --git a/graphics/pokemon/front_pics/sealeo_still_front_pic.png b/graphics/pokemon/sealeo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sealeo_still_front_pic.png
rename to graphics/pokemon/sealeo/front.png
diff --git a/graphics/pokemon/icons/sealeo_icon.png b/graphics/pokemon/sealeo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sealeo_icon.png
rename to graphics/pokemon/sealeo/icon.png
diff --git a/graphics/pokemon/palettes/sealeo_palette.pal b/graphics/pokemon/sealeo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sealeo_palette.pal
rename to graphics/pokemon/sealeo/normal.pal
diff --git a/graphics/pokemon/palettes/sealeo_shiny_palette.pal b/graphics/pokemon/sealeo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sealeo_shiny_palette.pal
rename to graphics/pokemon/sealeo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seedot_front_pic.png b/graphics/pokemon/seedot/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/seedot_front_pic.png
rename to graphics/pokemon/seedot/anim_front.png
diff --git a/graphics/pokemon/back_pics/seedot_back_pic.png b/graphics/pokemon/seedot/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/seedot_back_pic.png
rename to graphics/pokemon/seedot/back.png
diff --git a/graphics/pokemon/footprints/seedot_footprint.png b/graphics/pokemon/seedot/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/seedot_footprint.png
rename to graphics/pokemon/seedot/footprint.png
diff --git a/graphics/pokemon/front_pics/seedot_still_front_pic.png b/graphics/pokemon/seedot/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/seedot_still_front_pic.png
rename to graphics/pokemon/seedot/front.png
diff --git a/graphics/pokemon/icons/seedot_icon.png b/graphics/pokemon/seedot/icon.png
similarity index 100%
rename from graphics/pokemon/icons/seedot_icon.png
rename to graphics/pokemon/seedot/icon.png
diff --git a/graphics/pokemon/palettes/seedot_palette.pal b/graphics/pokemon/seedot/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/seedot_palette.pal
rename to graphics/pokemon/seedot/normal.pal
diff --git a/graphics/pokemon/palettes/seedot_shiny_palette.pal b/graphics/pokemon/seedot/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/seedot_shiny_palette.pal
rename to graphics/pokemon/seedot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seel_front_pic.png b/graphics/pokemon/seel/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/seel_front_pic.png
rename to graphics/pokemon/seel/anim_front.png
diff --git a/graphics/pokemon/back_pics/seel_back_pic.png b/graphics/pokemon/seel/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/seel_back_pic.png
rename to graphics/pokemon/seel/back.png
diff --git a/graphics/pokemon/footprints/seel_footprint.png b/graphics/pokemon/seel/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/seel_footprint.png
rename to graphics/pokemon/seel/footprint.png
diff --git a/graphics/pokemon/front_pics/seel_still_front_pic.png b/graphics/pokemon/seel/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/seel_still_front_pic.png
rename to graphics/pokemon/seel/front.png
diff --git a/graphics/pokemon/icons/seel_icon.png b/graphics/pokemon/seel/icon.png
similarity index 100%
rename from graphics/pokemon/icons/seel_icon.png
rename to graphics/pokemon/seel/icon.png
diff --git a/graphics/pokemon/palettes/seel_palette.pal b/graphics/pokemon/seel/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/seel_palette.pal
rename to graphics/pokemon/seel/normal.pal
diff --git a/graphics/pokemon/palettes/seel_shiny_palette.pal b/graphics/pokemon/seel/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/seel_shiny_palette.pal
rename to graphics/pokemon/seel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sentret_front_pic.png b/graphics/pokemon/sentret/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sentret_front_pic.png
rename to graphics/pokemon/sentret/anim_front.png
diff --git a/graphics/pokemon/back_pics/sentret_back_pic.png b/graphics/pokemon/sentret/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sentret_back_pic.png
rename to graphics/pokemon/sentret/back.png
diff --git a/graphics/pokemon/footprints/sentret_footprint.png b/graphics/pokemon/sentret/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sentret_footprint.png
rename to graphics/pokemon/sentret/footprint.png
diff --git a/graphics/pokemon/front_pics/sentret_still_front_pic.png b/graphics/pokemon/sentret/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sentret_still_front_pic.png
rename to graphics/pokemon/sentret/front.png
diff --git a/graphics/pokemon/icons/sentret_icon.png b/graphics/pokemon/sentret/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sentret_icon.png
rename to graphics/pokemon/sentret/icon.png
diff --git a/graphics/pokemon/palettes/sentret_palette.pal b/graphics/pokemon/sentret/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sentret_palette.pal
rename to graphics/pokemon/sentret/normal.pal
diff --git a/graphics/pokemon/palettes/sentret_shiny_palette.pal b/graphics/pokemon/sentret/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sentret_shiny_palette.pal
rename to graphics/pokemon/sentret/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seviper_front_pic.png b/graphics/pokemon/seviper/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/seviper_front_pic.png
rename to graphics/pokemon/seviper/anim_front.png
diff --git a/graphics/pokemon/back_pics/seviper_back_pic.png b/graphics/pokemon/seviper/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/seviper_back_pic.png
rename to graphics/pokemon/seviper/back.png
diff --git a/graphics/pokemon/footprints/seviper_footprint.png b/graphics/pokemon/seviper/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/seviper_footprint.png
rename to graphics/pokemon/seviper/footprint.png
diff --git a/graphics/pokemon/front_pics/seviper_still_front_pic.png b/graphics/pokemon/seviper/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/seviper_still_front_pic.png
rename to graphics/pokemon/seviper/front.png
diff --git a/graphics/pokemon/icons/seviper_icon.png b/graphics/pokemon/seviper/icon.png
similarity index 100%
rename from graphics/pokemon/icons/seviper_icon.png
rename to graphics/pokemon/seviper/icon.png
diff --git a/graphics/pokemon/palettes/seviper_palette.pal b/graphics/pokemon/seviper/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/seviper_palette.pal
rename to graphics/pokemon/seviper/normal.pal
diff --git a/graphics/pokemon/palettes/seviper_shiny_palette.pal b/graphics/pokemon/seviper/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/seviper_shiny_palette.pal
rename to graphics/pokemon/seviper/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sharpedo_front_pic.png b/graphics/pokemon/sharpedo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sharpedo_front_pic.png
rename to graphics/pokemon/sharpedo/anim_front.png
diff --git a/graphics/pokemon/back_pics/sharpedo_back_pic.png b/graphics/pokemon/sharpedo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sharpedo_back_pic.png
rename to graphics/pokemon/sharpedo/back.png
diff --git a/graphics/pokemon/footprints/sharpedo_footprint.png b/graphics/pokemon/sharpedo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sharpedo_footprint.png
rename to graphics/pokemon/sharpedo/footprint.png
diff --git a/graphics/pokemon/front_pics/sharpedo_still_front_pic.png b/graphics/pokemon/sharpedo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sharpedo_still_front_pic.png
rename to graphics/pokemon/sharpedo/front.png
diff --git a/graphics/pokemon/icons/sharpedo_icon.png b/graphics/pokemon/sharpedo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sharpedo_icon.png
rename to graphics/pokemon/sharpedo/icon.png
diff --git a/graphics/pokemon/palettes/sharpedo_palette.pal b/graphics/pokemon/sharpedo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sharpedo_palette.pal
rename to graphics/pokemon/sharpedo/normal.pal
diff --git a/graphics/pokemon/palettes/sharpedo_shiny_palette.pal b/graphics/pokemon/sharpedo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sharpedo_shiny_palette.pal
rename to graphics/pokemon/sharpedo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shedinja_front_pic.png b/graphics/pokemon/shedinja/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shedinja_front_pic.png
rename to graphics/pokemon/shedinja/anim_front.png
diff --git a/graphics/pokemon/back_pics/shedinja_back_pic.png b/graphics/pokemon/shedinja/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shedinja_back_pic.png
rename to graphics/pokemon/shedinja/back.png
diff --git a/graphics/pokemon/footprints/shedinja_footprint.png b/graphics/pokemon/shedinja/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shedinja_footprint.png
rename to graphics/pokemon/shedinja/footprint.png
diff --git a/graphics/pokemon/front_pics/shedinja_still_front_pic.png b/graphics/pokemon/shedinja/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shedinja_still_front_pic.png
rename to graphics/pokemon/shedinja/front.png
diff --git a/graphics/pokemon/icons/shedinja_icon.png b/graphics/pokemon/shedinja/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shedinja_icon.png
rename to graphics/pokemon/shedinja/icon.png
diff --git a/graphics/pokemon/palettes/shedinja_palette.pal b/graphics/pokemon/shedinja/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shedinja_palette.pal
rename to graphics/pokemon/shedinja/normal.pal
diff --git a/graphics/pokemon/palettes/shedinja_shiny_palette.pal b/graphics/pokemon/shedinja/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shedinja_shiny_palette.pal
rename to graphics/pokemon/shedinja/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shelgon_front_pic.png b/graphics/pokemon/shelgon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shelgon_front_pic.png
rename to graphics/pokemon/shelgon/anim_front.png
diff --git a/graphics/pokemon/back_pics/shelgon_back_pic.png b/graphics/pokemon/shelgon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shelgon_back_pic.png
rename to graphics/pokemon/shelgon/back.png
diff --git a/graphics/pokemon/footprints/shelgon_footprint.png b/graphics/pokemon/shelgon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shelgon_footprint.png
rename to graphics/pokemon/shelgon/footprint.png
diff --git a/graphics/pokemon/front_pics/shelgon_still_front_pic.png b/graphics/pokemon/shelgon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shelgon_still_front_pic.png
rename to graphics/pokemon/shelgon/front.png
diff --git a/graphics/pokemon/icons/shelgon_icon.png b/graphics/pokemon/shelgon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shelgon_icon.png
rename to graphics/pokemon/shelgon/icon.png
diff --git a/graphics/pokemon/palettes/shelgon_palette.pal b/graphics/pokemon/shelgon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shelgon_palette.pal
rename to graphics/pokemon/shelgon/normal.pal
diff --git a/graphics/pokemon/palettes/shelgon_shiny_palette.pal b/graphics/pokemon/shelgon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shelgon_shiny_palette.pal
rename to graphics/pokemon/shelgon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shellder_front_pic.png b/graphics/pokemon/shellder/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shellder_front_pic.png
rename to graphics/pokemon/shellder/anim_front.png
diff --git a/graphics/pokemon/back_pics/shellder_back_pic.png b/graphics/pokemon/shellder/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shellder_back_pic.png
rename to graphics/pokemon/shellder/back.png
diff --git a/graphics/pokemon/footprints/shellder_footprint.png b/graphics/pokemon/shellder/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shellder_footprint.png
rename to graphics/pokemon/shellder/footprint.png
diff --git a/graphics/pokemon/front_pics/shellder_still_front_pic.png b/graphics/pokemon/shellder/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shellder_still_front_pic.png
rename to graphics/pokemon/shellder/front.png
diff --git a/graphics/pokemon/icons/shellder_icon.png b/graphics/pokemon/shellder/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shellder_icon.png
rename to graphics/pokemon/shellder/icon.png
diff --git a/graphics/pokemon/palettes/shellder_palette.pal b/graphics/pokemon/shellder/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shellder_palette.pal
rename to graphics/pokemon/shellder/normal.pal
diff --git a/graphics/pokemon/palettes/shellder_shiny_palette.pal b/graphics/pokemon/shellder/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shellder_shiny_palette.pal
rename to graphics/pokemon/shellder/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shiftry_front_pic.png b/graphics/pokemon/shiftry/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shiftry_front_pic.png
rename to graphics/pokemon/shiftry/anim_front.png
diff --git a/graphics/pokemon/back_pics/shiftry_back_pic.png b/graphics/pokemon/shiftry/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shiftry_back_pic.png
rename to graphics/pokemon/shiftry/back.png
diff --git a/graphics/pokemon/footprints/shiftry_footprint.png b/graphics/pokemon/shiftry/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shiftry_footprint.png
rename to graphics/pokemon/shiftry/footprint.png
diff --git a/graphics/pokemon/front_pics/shiftry_still_front_pic.png b/graphics/pokemon/shiftry/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shiftry_still_front_pic.png
rename to graphics/pokemon/shiftry/front.png
diff --git a/graphics/pokemon/icons/shiftry_icon.png b/graphics/pokemon/shiftry/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shiftry_icon.png
rename to graphics/pokemon/shiftry/icon.png
diff --git a/graphics/pokemon/palettes/shiftry_palette.pal b/graphics/pokemon/shiftry/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shiftry_palette.pal
rename to graphics/pokemon/shiftry/normal.pal
diff --git a/graphics/pokemon/palettes/shiftry_shiny_palette.pal b/graphics/pokemon/shiftry/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shiftry_shiny_palette.pal
rename to graphics/pokemon/shiftry/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shroomish_front_pic.png b/graphics/pokemon/shroomish/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shroomish_front_pic.png
rename to graphics/pokemon/shroomish/anim_front.png
diff --git a/graphics/pokemon/back_pics/shroomish_back_pic.png b/graphics/pokemon/shroomish/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shroomish_back_pic.png
rename to graphics/pokemon/shroomish/back.png
diff --git a/graphics/pokemon/footprints/shroomish_footprint.png b/graphics/pokemon/shroomish/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shroomish_footprint.png
rename to graphics/pokemon/shroomish/footprint.png
diff --git a/graphics/pokemon/front_pics/shroomish_still_front_pic.png b/graphics/pokemon/shroomish/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shroomish_still_front_pic.png
rename to graphics/pokemon/shroomish/front.png
diff --git a/graphics/pokemon/icons/shroomish_icon.png b/graphics/pokemon/shroomish/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shroomish_icon.png
rename to graphics/pokemon/shroomish/icon.png
diff --git a/graphics/pokemon/palettes/shroomish_palette.pal b/graphics/pokemon/shroomish/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shroomish_palette.pal
rename to graphics/pokemon/shroomish/normal.pal
diff --git a/graphics/pokemon/palettes/shroomish_shiny_palette.pal b/graphics/pokemon/shroomish/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shroomish_shiny_palette.pal
rename to graphics/pokemon/shroomish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shuckle_front_pic.png b/graphics/pokemon/shuckle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shuckle_front_pic.png
rename to graphics/pokemon/shuckle/anim_front.png
diff --git a/graphics/pokemon/back_pics/shuckle_back_pic.png b/graphics/pokemon/shuckle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shuckle_back_pic.png
rename to graphics/pokemon/shuckle/back.png
diff --git a/graphics/pokemon/footprints/shuckle_footprint.png b/graphics/pokemon/shuckle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shuckle_footprint.png
rename to graphics/pokemon/shuckle/footprint.png
diff --git a/graphics/pokemon/front_pics/shuckle_still_front_pic.png b/graphics/pokemon/shuckle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shuckle_still_front_pic.png
rename to graphics/pokemon/shuckle/front.png
diff --git a/graphics/pokemon/icons/shuckle_icon.png b/graphics/pokemon/shuckle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shuckle_icon.png
rename to graphics/pokemon/shuckle/icon.png
diff --git a/graphics/pokemon/palettes/shuckle_palette.pal b/graphics/pokemon/shuckle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shuckle_palette.pal
rename to graphics/pokemon/shuckle/normal.pal
diff --git a/graphics/pokemon/palettes/shuckle_shiny_palette.pal b/graphics/pokemon/shuckle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shuckle_shiny_palette.pal
rename to graphics/pokemon/shuckle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shuppet_front_pic.png b/graphics/pokemon/shuppet/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/shuppet_front_pic.png
rename to graphics/pokemon/shuppet/anim_front.png
diff --git a/graphics/pokemon/back_pics/shuppet_back_pic.png b/graphics/pokemon/shuppet/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/shuppet_back_pic.png
rename to graphics/pokemon/shuppet/back.png
diff --git a/graphics/pokemon/footprints/shuppet_footprint.png b/graphics/pokemon/shuppet/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/shuppet_footprint.png
rename to graphics/pokemon/shuppet/footprint.png
diff --git a/graphics/pokemon/front_pics/shuppet_still_front_pic.png b/graphics/pokemon/shuppet/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/shuppet_still_front_pic.png
rename to graphics/pokemon/shuppet/front.png
diff --git a/graphics/pokemon/icons/shuppet_icon.png b/graphics/pokemon/shuppet/icon.png
similarity index 100%
rename from graphics/pokemon/icons/shuppet_icon.png
rename to graphics/pokemon/shuppet/icon.png
diff --git a/graphics/pokemon/palettes/shuppet_palette.pal b/graphics/pokemon/shuppet/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/shuppet_palette.pal
rename to graphics/pokemon/shuppet/normal.pal
diff --git a/graphics/pokemon/palettes/shuppet_shiny_palette.pal b/graphics/pokemon/shuppet/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/shuppet_shiny_palette.pal
rename to graphics/pokemon/shuppet/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/silcoon_front_pic.png b/graphics/pokemon/silcoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/silcoon_front_pic.png
rename to graphics/pokemon/silcoon/anim_front.png
diff --git a/graphics/pokemon/back_pics/silcoon_back_pic.png b/graphics/pokemon/silcoon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/silcoon_back_pic.png
rename to graphics/pokemon/silcoon/back.png
diff --git a/graphics/pokemon/footprints/silcoon_footprint.png b/graphics/pokemon/silcoon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/silcoon_footprint.png
rename to graphics/pokemon/silcoon/footprint.png
diff --git a/graphics/pokemon/front_pics/silcoon_still_front_pic.png b/graphics/pokemon/silcoon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/silcoon_still_front_pic.png
rename to graphics/pokemon/silcoon/front.png
diff --git a/graphics/pokemon/icons/silcoon_icon.png b/graphics/pokemon/silcoon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/silcoon_icon.png
rename to graphics/pokemon/silcoon/icon.png
diff --git a/graphics/pokemon/palettes/silcoon_palette.pal b/graphics/pokemon/silcoon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/silcoon_palette.pal
rename to graphics/pokemon/silcoon/normal.pal
diff --git a/graphics/pokemon/palettes/silcoon_shiny_palette.pal b/graphics/pokemon/silcoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/silcoon_shiny_palette.pal
rename to graphics/pokemon/silcoon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/skarmory_front_pic.png b/graphics/pokemon/skarmory/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/skarmory_front_pic.png
rename to graphics/pokemon/skarmory/anim_front.png
diff --git a/graphics/pokemon/back_pics/skarmory_back_pic.png b/graphics/pokemon/skarmory/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/skarmory_back_pic.png
rename to graphics/pokemon/skarmory/back.png
diff --git a/graphics/pokemon/footprints/skarmory_footprint.png b/graphics/pokemon/skarmory/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/skarmory_footprint.png
rename to graphics/pokemon/skarmory/footprint.png
diff --git a/graphics/pokemon/front_pics/skarmory_still_front_pic.png b/graphics/pokemon/skarmory/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/skarmory_still_front_pic.png
rename to graphics/pokemon/skarmory/front.png
diff --git a/graphics/pokemon/icons/skarmory_icon.png b/graphics/pokemon/skarmory/icon.png
similarity index 100%
rename from graphics/pokemon/icons/skarmory_icon.png
rename to graphics/pokemon/skarmory/icon.png
diff --git a/graphics/pokemon/palettes/skarmory_palette.pal b/graphics/pokemon/skarmory/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/skarmory_palette.pal
rename to graphics/pokemon/skarmory/normal.pal
diff --git a/graphics/pokemon/palettes/skarmory_shiny_palette.pal b/graphics/pokemon/skarmory/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/skarmory_shiny_palette.pal
rename to graphics/pokemon/skarmory/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/skiploom_front_pic.png b/graphics/pokemon/skiploom/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/skiploom_front_pic.png
rename to graphics/pokemon/skiploom/anim_front.png
diff --git a/graphics/pokemon/back_pics/skiploom_back_pic.png b/graphics/pokemon/skiploom/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/skiploom_back_pic.png
rename to graphics/pokemon/skiploom/back.png
diff --git a/graphics/pokemon/footprints/skiploom_footprint.png b/graphics/pokemon/skiploom/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/skiploom_footprint.png
rename to graphics/pokemon/skiploom/footprint.png
diff --git a/graphics/pokemon/front_pics/skiploom_still_front_pic.png b/graphics/pokemon/skiploom/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/skiploom_still_front_pic.png
rename to graphics/pokemon/skiploom/front.png
diff --git a/graphics/pokemon/icons/skiploom_icon.png b/graphics/pokemon/skiploom/icon.png
similarity index 100%
rename from graphics/pokemon/icons/skiploom_icon.png
rename to graphics/pokemon/skiploom/icon.png
diff --git a/graphics/pokemon/palettes/skiploom_palette.pal b/graphics/pokemon/skiploom/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/skiploom_palette.pal
rename to graphics/pokemon/skiploom/normal.pal
diff --git a/graphics/pokemon/palettes/skiploom_shiny_palette.pal b/graphics/pokemon/skiploom/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/skiploom_shiny_palette.pal
rename to graphics/pokemon/skiploom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/skitty_front_pic.png b/graphics/pokemon/skitty/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/skitty_front_pic.png
rename to graphics/pokemon/skitty/anim_front.png
diff --git a/graphics/pokemon/back_pics/skitty_back_pic.png b/graphics/pokemon/skitty/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/skitty_back_pic.png
rename to graphics/pokemon/skitty/back.png
diff --git a/graphics/pokemon/footprints/skitty_footprint.png b/graphics/pokemon/skitty/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/skitty_footprint.png
rename to graphics/pokemon/skitty/footprint.png
diff --git a/graphics/pokemon/front_pics/skitty_still_front_pic.png b/graphics/pokemon/skitty/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/skitty_still_front_pic.png
rename to graphics/pokemon/skitty/front.png
diff --git a/graphics/pokemon/icons/skitty_icon.png b/graphics/pokemon/skitty/icon.png
similarity index 100%
rename from graphics/pokemon/icons/skitty_icon.png
rename to graphics/pokemon/skitty/icon.png
diff --git a/graphics/pokemon/palettes/skitty_palette.pal b/graphics/pokemon/skitty/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/skitty_palette.pal
rename to graphics/pokemon/skitty/normal.pal
diff --git a/graphics/pokemon/palettes/skitty_shiny_palette.pal b/graphics/pokemon/skitty/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/skitty_shiny_palette.pal
rename to graphics/pokemon/skitty/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slaking_front_pic.png b/graphics/pokemon/slaking/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/slaking_front_pic.png
rename to graphics/pokemon/slaking/anim_front.png
diff --git a/graphics/pokemon/back_pics/slaking_back_pic.png b/graphics/pokemon/slaking/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/slaking_back_pic.png
rename to graphics/pokemon/slaking/back.png
diff --git a/graphics/pokemon/footprints/slaking_footprint.png b/graphics/pokemon/slaking/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/slaking_footprint.png
rename to graphics/pokemon/slaking/footprint.png
diff --git a/graphics/pokemon/front_pics/slaking_still_front_pic.png b/graphics/pokemon/slaking/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/slaking_still_front_pic.png
rename to graphics/pokemon/slaking/front.png
diff --git a/graphics/pokemon/icons/slaking_icon.png b/graphics/pokemon/slaking/icon.png
similarity index 100%
rename from graphics/pokemon/icons/slaking_icon.png
rename to graphics/pokemon/slaking/icon.png
diff --git a/graphics/pokemon/palettes/slaking_palette.pal b/graphics/pokemon/slaking/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/slaking_palette.pal
rename to graphics/pokemon/slaking/normal.pal
diff --git a/graphics/pokemon/palettes/slaking_shiny_palette.pal b/graphics/pokemon/slaking/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/slaking_shiny_palette.pal
rename to graphics/pokemon/slaking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slakoth_front_pic.png b/graphics/pokemon/slakoth/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/slakoth_front_pic.png
rename to graphics/pokemon/slakoth/anim_front.png
diff --git a/graphics/pokemon/back_pics/slakoth_back_pic.png b/graphics/pokemon/slakoth/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/slakoth_back_pic.png
rename to graphics/pokemon/slakoth/back.png
diff --git a/graphics/pokemon/footprints/slakoth_footprint.png b/graphics/pokemon/slakoth/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/slakoth_footprint.png
rename to graphics/pokemon/slakoth/footprint.png
diff --git a/graphics/pokemon/front_pics/slakoth_still_front_pic.png b/graphics/pokemon/slakoth/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/slakoth_still_front_pic.png
rename to graphics/pokemon/slakoth/front.png
diff --git a/graphics/pokemon/icons/slakoth_icon.png b/graphics/pokemon/slakoth/icon.png
similarity index 100%
rename from graphics/pokemon/icons/slakoth_icon.png
rename to graphics/pokemon/slakoth/icon.png
diff --git a/graphics/pokemon/palettes/slakoth_palette.pal b/graphics/pokemon/slakoth/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/slakoth_palette.pal
rename to graphics/pokemon/slakoth/normal.pal
diff --git a/graphics/pokemon/palettes/slakoth_shiny_palette.pal b/graphics/pokemon/slakoth/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/slakoth_shiny_palette.pal
rename to graphics/pokemon/slakoth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slowbro_front_pic.png b/graphics/pokemon/slowbro/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/slowbro_front_pic.png
rename to graphics/pokemon/slowbro/anim_front.png
diff --git a/graphics/pokemon/back_pics/slowbro_back_pic.png b/graphics/pokemon/slowbro/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/slowbro_back_pic.png
rename to graphics/pokemon/slowbro/back.png
diff --git a/graphics/pokemon/footprints/slowbro_footprint.png b/graphics/pokemon/slowbro/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/slowbro_footprint.png
rename to graphics/pokemon/slowbro/footprint.png
diff --git a/graphics/pokemon/front_pics/slowbro_still_front_pic.png b/graphics/pokemon/slowbro/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/slowbro_still_front_pic.png
rename to graphics/pokemon/slowbro/front.png
diff --git a/graphics/pokemon/icons/slowbro_icon.png b/graphics/pokemon/slowbro/icon.png
similarity index 100%
rename from graphics/pokemon/icons/slowbro_icon.png
rename to graphics/pokemon/slowbro/icon.png
diff --git a/graphics/pokemon/palettes/slowbro_palette.pal b/graphics/pokemon/slowbro/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/slowbro_palette.pal
rename to graphics/pokemon/slowbro/normal.pal
diff --git a/graphics/pokemon/palettes/slowbro_shiny_palette.pal b/graphics/pokemon/slowbro/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/slowbro_shiny_palette.pal
rename to graphics/pokemon/slowbro/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slowking_front_pic.png b/graphics/pokemon/slowking/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/slowking_front_pic.png
rename to graphics/pokemon/slowking/anim_front.png
diff --git a/graphics/pokemon/back_pics/slowking_back_pic.png b/graphics/pokemon/slowking/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/slowking_back_pic.png
rename to graphics/pokemon/slowking/back.png
diff --git a/graphics/pokemon/footprints/slowking_footprint.png b/graphics/pokemon/slowking/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/slowking_footprint.png
rename to graphics/pokemon/slowking/footprint.png
diff --git a/graphics/pokemon/front_pics/slowking_still_front_pic.png b/graphics/pokemon/slowking/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/slowking_still_front_pic.png
rename to graphics/pokemon/slowking/front.png
diff --git a/graphics/pokemon/icons/slowking_icon.png b/graphics/pokemon/slowking/icon.png
similarity index 100%
rename from graphics/pokemon/icons/slowking_icon.png
rename to graphics/pokemon/slowking/icon.png
diff --git a/graphics/pokemon/palettes/slowking_palette.pal b/graphics/pokemon/slowking/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/slowking_palette.pal
rename to graphics/pokemon/slowking/normal.pal
diff --git a/graphics/pokemon/palettes/slowking_shiny_palette.pal b/graphics/pokemon/slowking/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/slowking_shiny_palette.pal
rename to graphics/pokemon/slowking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slowpoke_front_pic.png b/graphics/pokemon/slowpoke/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/slowpoke_front_pic.png
rename to graphics/pokemon/slowpoke/anim_front.png
diff --git a/graphics/pokemon/back_pics/slowpoke_back_pic.png b/graphics/pokemon/slowpoke/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/slowpoke_back_pic.png
rename to graphics/pokemon/slowpoke/back.png
diff --git a/graphics/pokemon/footprints/slowpoke_footprint.png b/graphics/pokemon/slowpoke/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/slowpoke_footprint.png
rename to graphics/pokemon/slowpoke/footprint.png
diff --git a/graphics/pokemon/front_pics/slowpoke_still_front_pic.png b/graphics/pokemon/slowpoke/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/slowpoke_still_front_pic.png
rename to graphics/pokemon/slowpoke/front.png
diff --git a/graphics/pokemon/icons/slowpoke_icon.png b/graphics/pokemon/slowpoke/icon.png
similarity index 100%
rename from graphics/pokemon/icons/slowpoke_icon.png
rename to graphics/pokemon/slowpoke/icon.png
diff --git a/graphics/pokemon/palettes/slowpoke_palette.pal b/graphics/pokemon/slowpoke/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/slowpoke_palette.pal
rename to graphics/pokemon/slowpoke/normal.pal
diff --git a/graphics/pokemon/palettes/slowpoke_shiny_palette.pal b/graphics/pokemon/slowpoke/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/slowpoke_shiny_palette.pal
rename to graphics/pokemon/slowpoke/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slugma_front_pic.png b/graphics/pokemon/slugma/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/slugma_front_pic.png
rename to graphics/pokemon/slugma/anim_front.png
diff --git a/graphics/pokemon/back_pics/slugma_back_pic.png b/graphics/pokemon/slugma/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/slugma_back_pic.png
rename to graphics/pokemon/slugma/back.png
diff --git a/graphics/pokemon/footprints/slugma_footprint.png b/graphics/pokemon/slugma/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/slugma_footprint.png
rename to graphics/pokemon/slugma/footprint.png
diff --git a/graphics/pokemon/front_pics/slugma_still_front_pic.png b/graphics/pokemon/slugma/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/slugma_still_front_pic.png
rename to graphics/pokemon/slugma/front.png
diff --git a/graphics/pokemon/icons/slugma_icon.png b/graphics/pokemon/slugma/icon.png
similarity index 100%
rename from graphics/pokemon/icons/slugma_icon.png
rename to graphics/pokemon/slugma/icon.png
diff --git a/graphics/pokemon/palettes/slugma_palette.pal b/graphics/pokemon/slugma/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/slugma_palette.pal
rename to graphics/pokemon/slugma/normal.pal
diff --git a/graphics/pokemon/palettes/slugma_shiny_palette.pal b/graphics/pokemon/slugma/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/slugma_shiny_palette.pal
rename to graphics/pokemon/slugma/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/smeargle_front_pic.png b/graphics/pokemon/smeargle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/smeargle_front_pic.png
rename to graphics/pokemon/smeargle/anim_front.png
diff --git a/graphics/pokemon/back_pics/smeargle_back_pic.png b/graphics/pokemon/smeargle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/smeargle_back_pic.png
rename to graphics/pokemon/smeargle/back.png
diff --git a/graphics/pokemon/footprints/smeargle_footprint.png b/graphics/pokemon/smeargle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/smeargle_footprint.png
rename to graphics/pokemon/smeargle/footprint.png
diff --git a/graphics/pokemon/front_pics/smeargle_still_front_pic.png b/graphics/pokemon/smeargle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/smeargle_still_front_pic.png
rename to graphics/pokemon/smeargle/front.png
diff --git a/graphics/pokemon/icons/smeargle_icon.png b/graphics/pokemon/smeargle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/smeargle_icon.png
rename to graphics/pokemon/smeargle/icon.png
diff --git a/graphics/pokemon/palettes/smeargle_palette.pal b/graphics/pokemon/smeargle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/smeargle_palette.pal
rename to graphics/pokemon/smeargle/normal.pal
diff --git a/graphics/pokemon/palettes/smeargle_shiny_palette.pal b/graphics/pokemon/smeargle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/smeargle_shiny_palette.pal
rename to graphics/pokemon/smeargle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/smoochum_front_pic.png b/graphics/pokemon/smoochum/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/smoochum_front_pic.png
rename to graphics/pokemon/smoochum/anim_front.png
diff --git a/graphics/pokemon/back_pics/smoochum_back_pic.png b/graphics/pokemon/smoochum/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/smoochum_back_pic.png
rename to graphics/pokemon/smoochum/back.png
diff --git a/graphics/pokemon/footprints/smoochum_footprint.png b/graphics/pokemon/smoochum/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/smoochum_footprint.png
rename to graphics/pokemon/smoochum/footprint.png
diff --git a/graphics/pokemon/front_pics/smoochum_still_front_pic.png b/graphics/pokemon/smoochum/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/smoochum_still_front_pic.png
rename to graphics/pokemon/smoochum/front.png
diff --git a/graphics/pokemon/icons/smoochum_icon.png b/graphics/pokemon/smoochum/icon.png
similarity index 100%
rename from graphics/pokemon/icons/smoochum_icon.png
rename to graphics/pokemon/smoochum/icon.png
diff --git a/graphics/pokemon/palettes/smoochum_palette.pal b/graphics/pokemon/smoochum/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/smoochum_palette.pal
rename to graphics/pokemon/smoochum/normal.pal
diff --git a/graphics/pokemon/palettes/smoochum_shiny_palette.pal b/graphics/pokemon/smoochum/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/smoochum_shiny_palette.pal
rename to graphics/pokemon/smoochum/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sneasel_front_pic.png b/graphics/pokemon/sneasel/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sneasel_front_pic.png
rename to graphics/pokemon/sneasel/anim_front.png
diff --git a/graphics/pokemon/back_pics/sneasel_back_pic.png b/graphics/pokemon/sneasel/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sneasel_back_pic.png
rename to graphics/pokemon/sneasel/back.png
diff --git a/graphics/pokemon/footprints/sneasel_footprint.png b/graphics/pokemon/sneasel/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sneasel_footprint.png
rename to graphics/pokemon/sneasel/footprint.png
diff --git a/graphics/pokemon/front_pics/sneasel_still_front_pic.png b/graphics/pokemon/sneasel/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sneasel_still_front_pic.png
rename to graphics/pokemon/sneasel/front.png
diff --git a/graphics/pokemon/icons/sneasel_icon.png b/graphics/pokemon/sneasel/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sneasel_icon.png
rename to graphics/pokemon/sneasel/icon.png
diff --git a/graphics/pokemon/palettes/sneasel_palette.pal b/graphics/pokemon/sneasel/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sneasel_palette.pal
rename to graphics/pokemon/sneasel/normal.pal
diff --git a/graphics/pokemon/palettes/sneasel_shiny_palette.pal b/graphics/pokemon/sneasel/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sneasel_shiny_palette.pal
rename to graphics/pokemon/sneasel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/snorlax_front_pic.png b/graphics/pokemon/snorlax/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/snorlax_front_pic.png
rename to graphics/pokemon/snorlax/anim_front.png
diff --git a/graphics/pokemon/back_pics/snorlax_back_pic.png b/graphics/pokemon/snorlax/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/snorlax_back_pic.png
rename to graphics/pokemon/snorlax/back.png
diff --git a/graphics/pokemon/footprints/snorlax_footprint.png b/graphics/pokemon/snorlax/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/snorlax_footprint.png
rename to graphics/pokemon/snorlax/footprint.png
diff --git a/graphics/pokemon/front_pics/snorlax_still_front_pic.png b/graphics/pokemon/snorlax/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/snorlax_still_front_pic.png
rename to graphics/pokemon/snorlax/front.png
diff --git a/graphics/pokemon/icons/snorlax_icon.png b/graphics/pokemon/snorlax/icon.png
similarity index 100%
rename from graphics/pokemon/icons/snorlax_icon.png
rename to graphics/pokemon/snorlax/icon.png
diff --git a/graphics/pokemon/palettes/snorlax_palette.pal b/graphics/pokemon/snorlax/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/snorlax_palette.pal
rename to graphics/pokemon/snorlax/normal.pal
diff --git a/graphics/pokemon/palettes/snorlax_shiny_palette.pal b/graphics/pokemon/snorlax/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/snorlax_shiny_palette.pal
rename to graphics/pokemon/snorlax/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/snorunt_front_pic.png b/graphics/pokemon/snorunt/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/snorunt_front_pic.png
rename to graphics/pokemon/snorunt/anim_front.png
diff --git a/graphics/pokemon/back_pics/snorunt_back_pic.png b/graphics/pokemon/snorunt/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/snorunt_back_pic.png
rename to graphics/pokemon/snorunt/back.png
diff --git a/graphics/pokemon/footprints/snorunt_footprint.png b/graphics/pokemon/snorunt/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/snorunt_footprint.png
rename to graphics/pokemon/snorunt/footprint.png
diff --git a/graphics/pokemon/front_pics/snorunt_still_front_pic.png b/graphics/pokemon/snorunt/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/snorunt_still_front_pic.png
rename to graphics/pokemon/snorunt/front.png
diff --git a/graphics/pokemon/icons/snorunt_icon.png b/graphics/pokemon/snorunt/icon.png
similarity index 100%
rename from graphics/pokemon/icons/snorunt_icon.png
rename to graphics/pokemon/snorunt/icon.png
diff --git a/graphics/pokemon/palettes/snorunt_palette.pal b/graphics/pokemon/snorunt/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/snorunt_palette.pal
rename to graphics/pokemon/snorunt/normal.pal
diff --git a/graphics/pokemon/palettes/snorunt_shiny_palette.pal b/graphics/pokemon/snorunt/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/snorunt_shiny_palette.pal
rename to graphics/pokemon/snorunt/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/snubbull_front_pic.png b/graphics/pokemon/snubbull/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/snubbull_front_pic.png
rename to graphics/pokemon/snubbull/anim_front.png
diff --git a/graphics/pokemon/back_pics/snubbull_back_pic.png b/graphics/pokemon/snubbull/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/snubbull_back_pic.png
rename to graphics/pokemon/snubbull/back.png
diff --git a/graphics/pokemon/footprints/snubbull_footprint.png b/graphics/pokemon/snubbull/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/snubbull_footprint.png
rename to graphics/pokemon/snubbull/footprint.png
diff --git a/graphics/pokemon/front_pics/snubbull_still_front_pic.png b/graphics/pokemon/snubbull/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/snubbull_still_front_pic.png
rename to graphics/pokemon/snubbull/front.png
diff --git a/graphics/pokemon/icons/snubbull_icon.png b/graphics/pokemon/snubbull/icon.png
similarity index 100%
rename from graphics/pokemon/icons/snubbull_icon.png
rename to graphics/pokemon/snubbull/icon.png
diff --git a/graphics/pokemon/palettes/snubbull_palette.pal b/graphics/pokemon/snubbull/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/snubbull_palette.pal
rename to graphics/pokemon/snubbull/normal.pal
diff --git a/graphics/pokemon/palettes/snubbull_shiny_palette.pal b/graphics/pokemon/snubbull/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/snubbull_shiny_palette.pal
rename to graphics/pokemon/snubbull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/solrock_front_pic.png b/graphics/pokemon/solrock/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/solrock_front_pic.png
rename to graphics/pokemon/solrock/anim_front.png
diff --git a/graphics/pokemon/back_pics/solrock_back_pic.png b/graphics/pokemon/solrock/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/solrock_back_pic.png
rename to graphics/pokemon/solrock/back.png
diff --git a/graphics/pokemon/footprints/solrock_footprint.png b/graphics/pokemon/solrock/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/solrock_footprint.png
rename to graphics/pokemon/solrock/footprint.png
diff --git a/graphics/pokemon/front_pics/solrock_still_front_pic.png b/graphics/pokemon/solrock/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/solrock_still_front_pic.png
rename to graphics/pokemon/solrock/front.png
diff --git a/graphics/pokemon/icons/solrock_icon.png b/graphics/pokemon/solrock/icon.png
similarity index 100%
rename from graphics/pokemon/icons/solrock_icon.png
rename to graphics/pokemon/solrock/icon.png
diff --git a/graphics/pokemon/palettes/solrock_palette.pal b/graphics/pokemon/solrock/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/solrock_palette.pal
rename to graphics/pokemon/solrock/normal.pal
diff --git a/graphics/pokemon/palettes/solrock_shiny_palette.pal b/graphics/pokemon/solrock/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/solrock_shiny_palette.pal
rename to graphics/pokemon/solrock/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spearow_front_pic.png b/graphics/pokemon/spearow/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/spearow_front_pic.png
rename to graphics/pokemon/spearow/anim_front.png
diff --git a/graphics/pokemon/back_pics/spearow_back_pic.png b/graphics/pokemon/spearow/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/spearow_back_pic.png
rename to graphics/pokemon/spearow/back.png
diff --git a/graphics/pokemon/footprints/spearow_footprint.png b/graphics/pokemon/spearow/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/spearow_footprint.png
rename to graphics/pokemon/spearow/footprint.png
diff --git a/graphics/pokemon/front_pics/spearow_still_front_pic.png b/graphics/pokemon/spearow/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/spearow_still_front_pic.png
rename to graphics/pokemon/spearow/front.png
diff --git a/graphics/pokemon/icons/spearow_icon.png b/graphics/pokemon/spearow/icon.png
similarity index 100%
rename from graphics/pokemon/icons/spearow_icon.png
rename to graphics/pokemon/spearow/icon.png
diff --git a/graphics/pokemon/palettes/spearow_palette.pal b/graphics/pokemon/spearow/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/spearow_palette.pal
rename to graphics/pokemon/spearow/normal.pal
diff --git a/graphics/pokemon/palettes/spearow_shiny_palette.pal b/graphics/pokemon/spearow/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/spearow_shiny_palette.pal
rename to graphics/pokemon/spearow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spheal_front_pic.png b/graphics/pokemon/spheal/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/spheal_front_pic.png
rename to graphics/pokemon/spheal/anim_front.png
diff --git a/graphics/pokemon/back_pics/spheal_back_pic.png b/graphics/pokemon/spheal/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/spheal_back_pic.png
rename to graphics/pokemon/spheal/back.png
diff --git a/graphics/pokemon/footprints/spheal_footprint.png b/graphics/pokemon/spheal/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/spheal_footprint.png
rename to graphics/pokemon/spheal/footprint.png
diff --git a/graphics/pokemon/front_pics/spheal_still_front_pic.png b/graphics/pokemon/spheal/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/spheal_still_front_pic.png
rename to graphics/pokemon/spheal/front.png
diff --git a/graphics/pokemon/icons/spheal_icon.png b/graphics/pokemon/spheal/icon.png
similarity index 100%
rename from graphics/pokemon/icons/spheal_icon.png
rename to graphics/pokemon/spheal/icon.png
diff --git a/graphics/pokemon/palettes/spheal_palette.pal b/graphics/pokemon/spheal/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/spheal_palette.pal
rename to graphics/pokemon/spheal/normal.pal
diff --git a/graphics/pokemon/palettes/spheal_shiny_palette.pal b/graphics/pokemon/spheal/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/spheal_shiny_palette.pal
rename to graphics/pokemon/spheal/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spinarak_front_pic.png b/graphics/pokemon/spinarak/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/spinarak_front_pic.png
rename to graphics/pokemon/spinarak/anim_front.png
diff --git a/graphics/pokemon/back_pics/spinarak_back_pic.png b/graphics/pokemon/spinarak/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/spinarak_back_pic.png
rename to graphics/pokemon/spinarak/back.png
diff --git a/graphics/pokemon/footprints/spinarak_footprint.png b/graphics/pokemon/spinarak/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/spinarak_footprint.png
rename to graphics/pokemon/spinarak/footprint.png
diff --git a/graphics/pokemon/front_pics/spinarak_still_front_pic.png b/graphics/pokemon/spinarak/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/spinarak_still_front_pic.png
rename to graphics/pokemon/spinarak/front.png
diff --git a/graphics/pokemon/icons/spinarak_icon.png b/graphics/pokemon/spinarak/icon.png
similarity index 100%
rename from graphics/pokemon/icons/spinarak_icon.png
rename to graphics/pokemon/spinarak/icon.png
diff --git a/graphics/pokemon/palettes/spinarak_palette.pal b/graphics/pokemon/spinarak/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/spinarak_palette.pal
rename to graphics/pokemon/spinarak/normal.pal
diff --git a/graphics/pokemon/palettes/spinarak_shiny_palette.pal b/graphics/pokemon/spinarak/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/spinarak_shiny_palette.pal
rename to graphics/pokemon/spinarak/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spinda_front_pic.png b/graphics/pokemon/spinda/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/spinda_front_pic.png
rename to graphics/pokemon/spinda/anim_front.png
diff --git a/graphics/pokemon/back_pics/spinda_back_pic.png b/graphics/pokemon/spinda/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/spinda_back_pic.png
rename to graphics/pokemon/spinda/back.png
diff --git a/graphics/pokemon/footprints/spinda_footprint.png b/graphics/pokemon/spinda/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/spinda_footprint.png
rename to graphics/pokemon/spinda/footprint.png
diff --git a/graphics/pokemon/front_pics/spinda_still_front_pic.png b/graphics/pokemon/spinda/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/spinda_still_front_pic.png
rename to graphics/pokemon/spinda/front.png
diff --git a/graphics/pokemon/icons/spinda_icon.png b/graphics/pokemon/spinda/icon.png
similarity index 100%
rename from graphics/pokemon/icons/spinda_icon.png
rename to graphics/pokemon/spinda/icon.png
diff --git a/graphics/pokemon/palettes/spinda_palette.pal b/graphics/pokemon/spinda/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/spinda_palette.pal
rename to graphics/pokemon/spinda/normal.pal
diff --git a/graphics/pokemon/palettes/spinda_shiny_palette.pal b/graphics/pokemon/spinda/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/spinda_shiny_palette.pal
rename to graphics/pokemon/spinda/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spoink_front_pic.png b/graphics/pokemon/spoink/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/spoink_front_pic.png
rename to graphics/pokemon/spoink/anim_front.png
diff --git a/graphics/pokemon/back_pics/spoink_back_pic.png b/graphics/pokemon/spoink/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/spoink_back_pic.png
rename to graphics/pokemon/spoink/back.png
diff --git a/graphics/pokemon/footprints/spoink_footprint.png b/graphics/pokemon/spoink/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/spoink_footprint.png
rename to graphics/pokemon/spoink/footprint.png
diff --git a/graphics/pokemon/front_pics/spoink_still_front_pic.png b/graphics/pokemon/spoink/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/spoink_still_front_pic.png
rename to graphics/pokemon/spoink/front.png
diff --git a/graphics/pokemon/icons/spoink_icon.png b/graphics/pokemon/spoink/icon.png
similarity index 100%
rename from graphics/pokemon/icons/spoink_icon.png
rename to graphics/pokemon/spoink/icon.png
diff --git a/graphics/pokemon/palettes/spoink_palette.pal b/graphics/pokemon/spoink/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/spoink_palette.pal
rename to graphics/pokemon/spoink/normal.pal
diff --git a/graphics/pokemon/palettes/spoink_shiny_palette.pal b/graphics/pokemon/spoink/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/spoink_shiny_palette.pal
rename to graphics/pokemon/spoink/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/squirtle_front_pic.png b/graphics/pokemon/squirtle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/squirtle_front_pic.png
rename to graphics/pokemon/squirtle/anim_front.png
diff --git a/graphics/pokemon/back_pics/squirtle_back_pic.png b/graphics/pokemon/squirtle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/squirtle_back_pic.png
rename to graphics/pokemon/squirtle/back.png
diff --git a/graphics/pokemon/footprints/squirtle_footprint.png b/graphics/pokemon/squirtle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/squirtle_footprint.png
rename to graphics/pokemon/squirtle/footprint.png
diff --git a/graphics/pokemon/front_pics/squirtle_still_front_pic.png b/graphics/pokemon/squirtle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/squirtle_still_front_pic.png
rename to graphics/pokemon/squirtle/front.png
diff --git a/graphics/pokemon/icons/squirtle_icon.png b/graphics/pokemon/squirtle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/squirtle_icon.png
rename to graphics/pokemon/squirtle/icon.png
diff --git a/graphics/pokemon/palettes/squirtle_palette.pal b/graphics/pokemon/squirtle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/squirtle_palette.pal
rename to graphics/pokemon/squirtle/normal.pal
diff --git a/graphics/pokemon/palettes/squirtle_shiny_palette.pal b/graphics/pokemon/squirtle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/squirtle_shiny_palette.pal
rename to graphics/pokemon/squirtle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/stantler_front_pic.png b/graphics/pokemon/stantler/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/stantler_front_pic.png
rename to graphics/pokemon/stantler/anim_front.png
diff --git a/graphics/pokemon/back_pics/stantler_back_pic.png b/graphics/pokemon/stantler/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/stantler_back_pic.png
rename to graphics/pokemon/stantler/back.png
diff --git a/graphics/pokemon/footprints/stantler_footprint.png b/graphics/pokemon/stantler/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/stantler_footprint.png
rename to graphics/pokemon/stantler/footprint.png
diff --git a/graphics/pokemon/front_pics/stantler_still_front_pic.png b/graphics/pokemon/stantler/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/stantler_still_front_pic.png
rename to graphics/pokemon/stantler/front.png
diff --git a/graphics/pokemon/icons/stantler_icon.png b/graphics/pokemon/stantler/icon.png
similarity index 100%
rename from graphics/pokemon/icons/stantler_icon.png
rename to graphics/pokemon/stantler/icon.png
diff --git a/graphics/pokemon/palettes/stantler_palette.pal b/graphics/pokemon/stantler/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/stantler_palette.pal
rename to graphics/pokemon/stantler/normal.pal
diff --git a/graphics/pokemon/palettes/stantler_shiny_palette.pal b/graphics/pokemon/stantler/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/stantler_shiny_palette.pal
rename to graphics/pokemon/stantler/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/starmie_front_pic.png b/graphics/pokemon/starmie/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/starmie_front_pic.png
rename to graphics/pokemon/starmie/anim_front.png
diff --git a/graphics/pokemon/back_pics/starmie_back_pic.png b/graphics/pokemon/starmie/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/starmie_back_pic.png
rename to graphics/pokemon/starmie/back.png
diff --git a/graphics/pokemon/footprints/starmie_footprint.png b/graphics/pokemon/starmie/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/starmie_footprint.png
rename to graphics/pokemon/starmie/footprint.png
diff --git a/graphics/pokemon/front_pics/starmie_still_front_pic.png b/graphics/pokemon/starmie/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/starmie_still_front_pic.png
rename to graphics/pokemon/starmie/front.png
diff --git a/graphics/pokemon/icons/starmie_icon.png b/graphics/pokemon/starmie/icon.png
similarity index 100%
rename from graphics/pokemon/icons/starmie_icon.png
rename to graphics/pokemon/starmie/icon.png
diff --git a/graphics/pokemon/palettes/starmie_palette.pal b/graphics/pokemon/starmie/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/starmie_palette.pal
rename to graphics/pokemon/starmie/normal.pal
diff --git a/graphics/pokemon/palettes/starmie_shiny_palette.pal b/graphics/pokemon/starmie/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/starmie_shiny_palette.pal
rename to graphics/pokemon/starmie/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/staryu_front_pic.png b/graphics/pokemon/staryu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/staryu_front_pic.png
rename to graphics/pokemon/staryu/anim_front.png
diff --git a/graphics/pokemon/back_pics/staryu_back_pic.png b/graphics/pokemon/staryu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/staryu_back_pic.png
rename to graphics/pokemon/staryu/back.png
diff --git a/graphics/pokemon/footprints/staryu_footprint.png b/graphics/pokemon/staryu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/staryu_footprint.png
rename to graphics/pokemon/staryu/footprint.png
diff --git a/graphics/pokemon/front_pics/staryu_still_front_pic.png b/graphics/pokemon/staryu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/staryu_still_front_pic.png
rename to graphics/pokemon/staryu/front.png
diff --git a/graphics/pokemon/icons/staryu_icon.png b/graphics/pokemon/staryu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/staryu_icon.png
rename to graphics/pokemon/staryu/icon.png
diff --git a/graphics/pokemon/palettes/staryu_palette.pal b/graphics/pokemon/staryu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/staryu_palette.pal
rename to graphics/pokemon/staryu/normal.pal
diff --git a/graphics/pokemon/palettes/staryu_shiny_palette.pal b/graphics/pokemon/staryu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/staryu_shiny_palette.pal
rename to graphics/pokemon/staryu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/steelix_front_pic.png b/graphics/pokemon/steelix/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/steelix_front_pic.png
rename to graphics/pokemon/steelix/anim_front.png
diff --git a/graphics/pokemon/back_pics/steelix_back_pic.png b/graphics/pokemon/steelix/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/steelix_back_pic.png
rename to graphics/pokemon/steelix/back.png
diff --git a/graphics/pokemon/footprints/steelix_footprint.png b/graphics/pokemon/steelix/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/steelix_footprint.png
rename to graphics/pokemon/steelix/footprint.png
diff --git a/graphics/pokemon/front_pics/steelix_still_front_pic.png b/graphics/pokemon/steelix/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/steelix_still_front_pic.png
rename to graphics/pokemon/steelix/front.png
diff --git a/graphics/pokemon/icons/steelix_icon.png b/graphics/pokemon/steelix/icon.png
similarity index 100%
rename from graphics/pokemon/icons/steelix_icon.png
rename to graphics/pokemon/steelix/icon.png
diff --git a/graphics/pokemon/palettes/steelix_palette.pal b/graphics/pokemon/steelix/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/steelix_palette.pal
rename to graphics/pokemon/steelix/normal.pal
diff --git a/graphics/pokemon/palettes/steelix_shiny_palette.pal b/graphics/pokemon/steelix/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/steelix_shiny_palette.pal
rename to graphics/pokemon/steelix/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sudowoodo_front_pic.png b/graphics/pokemon/sudowoodo/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sudowoodo_front_pic.png
rename to graphics/pokemon/sudowoodo/anim_front.png
diff --git a/graphics/pokemon/back_pics/sudowoodo_back_pic.png b/graphics/pokemon/sudowoodo/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sudowoodo_back_pic.png
rename to graphics/pokemon/sudowoodo/back.png
diff --git a/graphics/pokemon/footprints/sudowoodo_footprint.png b/graphics/pokemon/sudowoodo/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sudowoodo_footprint.png
rename to graphics/pokemon/sudowoodo/footprint.png
diff --git a/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png b/graphics/pokemon/sudowoodo/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sudowoodo_still_front_pic.png
rename to graphics/pokemon/sudowoodo/front.png
diff --git a/graphics/pokemon/icons/sudowoodo_icon.png b/graphics/pokemon/sudowoodo/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sudowoodo_icon.png
rename to graphics/pokemon/sudowoodo/icon.png
diff --git a/graphics/pokemon/palettes/sudowoodo_palette.pal b/graphics/pokemon/sudowoodo/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sudowoodo_palette.pal
rename to graphics/pokemon/sudowoodo/normal.pal
diff --git a/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal b/graphics/pokemon/sudowoodo/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sudowoodo_shiny_palette.pal
rename to graphics/pokemon/sudowoodo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/suicune_front_pic.png b/graphics/pokemon/suicune/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/suicune_front_pic.png
rename to graphics/pokemon/suicune/anim_front.png
diff --git a/graphics/pokemon/back_pics/suicune_back_pic.png b/graphics/pokemon/suicune/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/suicune_back_pic.png
rename to graphics/pokemon/suicune/back.png
diff --git a/graphics/pokemon/footprints/suicune_footprint.png b/graphics/pokemon/suicune/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/suicune_footprint.png
rename to graphics/pokemon/suicune/footprint.png
diff --git a/graphics/pokemon/front_pics/suicune_still_front_pic.png b/graphics/pokemon/suicune/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/suicune_still_front_pic.png
rename to graphics/pokemon/suicune/front.png
diff --git a/graphics/pokemon/icons/suicune_icon.png b/graphics/pokemon/suicune/icon.png
similarity index 100%
rename from graphics/pokemon/icons/suicune_icon.png
rename to graphics/pokemon/suicune/icon.png
diff --git a/graphics/pokemon/palettes/suicune_palette.pal b/graphics/pokemon/suicune/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/suicune_palette.pal
rename to graphics/pokemon/suicune/normal.pal
diff --git a/graphics/pokemon/palettes/suicune_shiny_palette.pal b/graphics/pokemon/suicune/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/suicune_shiny_palette.pal
rename to graphics/pokemon/suicune/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sunflora_front_pic.png b/graphics/pokemon/sunflora/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sunflora_front_pic.png
rename to graphics/pokemon/sunflora/anim_front.png
diff --git a/graphics/pokemon/back_pics/sunflora_back_pic.png b/graphics/pokemon/sunflora/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sunflora_back_pic.png
rename to graphics/pokemon/sunflora/back.png
diff --git a/graphics/pokemon/footprints/sunflora_footprint.png b/graphics/pokemon/sunflora/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sunflora_footprint.png
rename to graphics/pokemon/sunflora/footprint.png
diff --git a/graphics/pokemon/front_pics/sunflora_still_front_pic.png b/graphics/pokemon/sunflora/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sunflora_still_front_pic.png
rename to graphics/pokemon/sunflora/front.png
diff --git a/graphics/pokemon/icons/sunflora_icon.png b/graphics/pokemon/sunflora/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sunflora_icon.png
rename to graphics/pokemon/sunflora/icon.png
diff --git a/graphics/pokemon/palettes/sunflora_palette.pal b/graphics/pokemon/sunflora/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sunflora_palette.pal
rename to graphics/pokemon/sunflora/normal.pal
diff --git a/graphics/pokemon/palettes/sunflora_shiny_palette.pal b/graphics/pokemon/sunflora/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sunflora_shiny_palette.pal
rename to graphics/pokemon/sunflora/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sunkern_front_pic.png b/graphics/pokemon/sunkern/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/sunkern_front_pic.png
rename to graphics/pokemon/sunkern/anim_front.png
diff --git a/graphics/pokemon/back_pics/sunkern_back_pic.png b/graphics/pokemon/sunkern/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/sunkern_back_pic.png
rename to graphics/pokemon/sunkern/back.png
diff --git a/graphics/pokemon/footprints/sunkern_footprint.png b/graphics/pokemon/sunkern/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/sunkern_footprint.png
rename to graphics/pokemon/sunkern/footprint.png
diff --git a/graphics/pokemon/front_pics/sunkern_still_front_pic.png b/graphics/pokemon/sunkern/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/sunkern_still_front_pic.png
rename to graphics/pokemon/sunkern/front.png
diff --git a/graphics/pokemon/icons/sunkern_icon.png b/graphics/pokemon/sunkern/icon.png
similarity index 100%
rename from graphics/pokemon/icons/sunkern_icon.png
rename to graphics/pokemon/sunkern/icon.png
diff --git a/graphics/pokemon/palettes/sunkern_palette.pal b/graphics/pokemon/sunkern/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/sunkern_palette.pal
rename to graphics/pokemon/sunkern/normal.pal
diff --git a/graphics/pokemon/palettes/sunkern_shiny_palette.pal b/graphics/pokemon/sunkern/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/sunkern_shiny_palette.pal
rename to graphics/pokemon/sunkern/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/surskit_front_pic.png b/graphics/pokemon/surskit/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/surskit_front_pic.png
rename to graphics/pokemon/surskit/anim_front.png
diff --git a/graphics/pokemon/back_pics/surskit_back_pic.png b/graphics/pokemon/surskit/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/surskit_back_pic.png
rename to graphics/pokemon/surskit/back.png
diff --git a/graphics/pokemon/footprints/surskit_footprint.png b/graphics/pokemon/surskit/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/surskit_footprint.png
rename to graphics/pokemon/surskit/footprint.png
diff --git a/graphics/pokemon/front_pics/surskit_still_front_pic.png b/graphics/pokemon/surskit/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/surskit_still_front_pic.png
rename to graphics/pokemon/surskit/front.png
diff --git a/graphics/pokemon/icons/surskit_icon.png b/graphics/pokemon/surskit/icon.png
similarity index 100%
rename from graphics/pokemon/icons/surskit_icon.png
rename to graphics/pokemon/surskit/icon.png
diff --git a/graphics/pokemon/palettes/surskit_palette.pal b/graphics/pokemon/surskit/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/surskit_palette.pal
rename to graphics/pokemon/surskit/normal.pal
diff --git a/graphics/pokemon/palettes/surskit_shiny_palette.pal b/graphics/pokemon/surskit/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/surskit_shiny_palette.pal
rename to graphics/pokemon/surskit/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swablu_front_pic.png b/graphics/pokemon/swablu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/swablu_front_pic.png
rename to graphics/pokemon/swablu/anim_front.png
diff --git a/graphics/pokemon/back_pics/swablu_back_pic.png b/graphics/pokemon/swablu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/swablu_back_pic.png
rename to graphics/pokemon/swablu/back.png
diff --git a/graphics/pokemon/footprints/swablu_footprint.png b/graphics/pokemon/swablu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/swablu_footprint.png
rename to graphics/pokemon/swablu/footprint.png
diff --git a/graphics/pokemon/front_pics/swablu_still_front_pic.png b/graphics/pokemon/swablu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/swablu_still_front_pic.png
rename to graphics/pokemon/swablu/front.png
diff --git a/graphics/pokemon/icons/swablu_icon.png b/graphics/pokemon/swablu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/swablu_icon.png
rename to graphics/pokemon/swablu/icon.png
diff --git a/graphics/pokemon/palettes/swablu_palette.pal b/graphics/pokemon/swablu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/swablu_palette.pal
rename to graphics/pokemon/swablu/normal.pal
diff --git a/graphics/pokemon/palettes/swablu_shiny_palette.pal b/graphics/pokemon/swablu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/swablu_shiny_palette.pal
rename to graphics/pokemon/swablu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swalot_front_pic.png b/graphics/pokemon/swalot/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/swalot_front_pic.png
rename to graphics/pokemon/swalot/anim_front.png
diff --git a/graphics/pokemon/back_pics/swalot_back_pic.png b/graphics/pokemon/swalot/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/swalot_back_pic.png
rename to graphics/pokemon/swalot/back.png
diff --git a/graphics/pokemon/footprints/swalot_footprint.png b/graphics/pokemon/swalot/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/swalot_footprint.png
rename to graphics/pokemon/swalot/footprint.png
diff --git a/graphics/pokemon/front_pics/swalot_still_front_pic.png b/graphics/pokemon/swalot/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/swalot_still_front_pic.png
rename to graphics/pokemon/swalot/front.png
diff --git a/graphics/pokemon/icons/swalot_icon.png b/graphics/pokemon/swalot/icon.png
similarity index 100%
rename from graphics/pokemon/icons/swalot_icon.png
rename to graphics/pokemon/swalot/icon.png
diff --git a/graphics/pokemon/palettes/swalot_palette.pal b/graphics/pokemon/swalot/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/swalot_palette.pal
rename to graphics/pokemon/swalot/normal.pal
diff --git a/graphics/pokemon/palettes/swalot_shiny_palette.pal b/graphics/pokemon/swalot/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/swalot_shiny_palette.pal
rename to graphics/pokemon/swalot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swampert_front_pic.png b/graphics/pokemon/swampert/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/swampert_front_pic.png
rename to graphics/pokemon/swampert/anim_front.png
diff --git a/graphics/pokemon/back_pics/swampert_back_pic.png b/graphics/pokemon/swampert/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/swampert_back_pic.png
rename to graphics/pokemon/swampert/back.png
diff --git a/graphics/pokemon/footprints/swampert_footprint.png b/graphics/pokemon/swampert/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/swampert_footprint.png
rename to graphics/pokemon/swampert/footprint.png
diff --git a/graphics/pokemon/front_pics/swampert_still_front_pic.png b/graphics/pokemon/swampert/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/swampert_still_front_pic.png
rename to graphics/pokemon/swampert/front.png
diff --git a/graphics/pokemon/icons/swampert_icon.png b/graphics/pokemon/swampert/icon.png
similarity index 100%
rename from graphics/pokemon/icons/swampert_icon.png
rename to graphics/pokemon/swampert/icon.png
diff --git a/graphics/pokemon/palettes/swampert_palette.pal b/graphics/pokemon/swampert/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/swampert_palette.pal
rename to graphics/pokemon/swampert/normal.pal
diff --git a/graphics/pokemon/palettes/swampert_shiny_palette.pal b/graphics/pokemon/swampert/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/swampert_shiny_palette.pal
rename to graphics/pokemon/swampert/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swellow_front_pic.png b/graphics/pokemon/swellow/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/swellow_front_pic.png
rename to graphics/pokemon/swellow/anim_front.png
diff --git a/graphics/pokemon/back_pics/swellow_back_pic.png b/graphics/pokemon/swellow/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/swellow_back_pic.png
rename to graphics/pokemon/swellow/back.png
diff --git a/graphics/pokemon/footprints/swellow_footprint.png b/graphics/pokemon/swellow/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/swellow_footprint.png
rename to graphics/pokemon/swellow/footprint.png
diff --git a/graphics/pokemon/front_pics/swellow_still_front_pic.png b/graphics/pokemon/swellow/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/swellow_still_front_pic.png
rename to graphics/pokemon/swellow/front.png
diff --git a/graphics/pokemon/icons/swellow_icon.png b/graphics/pokemon/swellow/icon.png
similarity index 100%
rename from graphics/pokemon/icons/swellow_icon.png
rename to graphics/pokemon/swellow/icon.png
diff --git a/graphics/pokemon/palettes/swellow_palette.pal b/graphics/pokemon/swellow/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/swellow_palette.pal
rename to graphics/pokemon/swellow/normal.pal
diff --git a/graphics/pokemon/palettes/swellow_shiny_palette.pal b/graphics/pokemon/swellow/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/swellow_shiny_palette.pal
rename to graphics/pokemon/swellow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swinub_front_pic.png b/graphics/pokemon/swinub/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/swinub_front_pic.png
rename to graphics/pokemon/swinub/anim_front.png
diff --git a/graphics/pokemon/back_pics/swinub_back_pic.png b/graphics/pokemon/swinub/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/swinub_back_pic.png
rename to graphics/pokemon/swinub/back.png
diff --git a/graphics/pokemon/footprints/swinub_footprint.png b/graphics/pokemon/swinub/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/swinub_footprint.png
rename to graphics/pokemon/swinub/footprint.png
diff --git a/graphics/pokemon/front_pics/swinub_still_front_pic.png b/graphics/pokemon/swinub/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/swinub_still_front_pic.png
rename to graphics/pokemon/swinub/front.png
diff --git a/graphics/pokemon/icons/swinub_icon.png b/graphics/pokemon/swinub/icon.png
similarity index 100%
rename from graphics/pokemon/icons/swinub_icon.png
rename to graphics/pokemon/swinub/icon.png
diff --git a/graphics/pokemon/palettes/swinub_palette.pal b/graphics/pokemon/swinub/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/swinub_palette.pal
rename to graphics/pokemon/swinub/normal.pal
diff --git a/graphics/pokemon/palettes/swinub_shiny_palette.pal b/graphics/pokemon/swinub/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/swinub_shiny_palette.pal
rename to graphics/pokemon/swinub/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/taillow_front_pic.png b/graphics/pokemon/taillow/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/taillow_front_pic.png
rename to graphics/pokemon/taillow/anim_front.png
diff --git a/graphics/pokemon/back_pics/taillow_back_pic.png b/graphics/pokemon/taillow/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/taillow_back_pic.png
rename to graphics/pokemon/taillow/back.png
diff --git a/graphics/pokemon/footprints/taillow_footprint.png b/graphics/pokemon/taillow/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/taillow_footprint.png
rename to graphics/pokemon/taillow/footprint.png
diff --git a/graphics/pokemon/front_pics/taillow_still_front_pic.png b/graphics/pokemon/taillow/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/taillow_still_front_pic.png
rename to graphics/pokemon/taillow/front.png
diff --git a/graphics/pokemon/icons/taillow_icon.png b/graphics/pokemon/taillow/icon.png
similarity index 100%
rename from graphics/pokemon/icons/taillow_icon.png
rename to graphics/pokemon/taillow/icon.png
diff --git a/graphics/pokemon/palettes/taillow_palette.pal b/graphics/pokemon/taillow/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/taillow_palette.pal
rename to graphics/pokemon/taillow/normal.pal
diff --git a/graphics/pokemon/palettes/taillow_shiny_palette.pal b/graphics/pokemon/taillow/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/taillow_shiny_palette.pal
rename to graphics/pokemon/taillow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tangela_front_pic.png b/graphics/pokemon/tangela/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tangela_front_pic.png
rename to graphics/pokemon/tangela/anim_front.png
diff --git a/graphics/pokemon/back_pics/tangela_back_pic.png b/graphics/pokemon/tangela/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tangela_back_pic.png
rename to graphics/pokemon/tangela/back.png
diff --git a/graphics/pokemon/footprints/tangela_footprint.png b/graphics/pokemon/tangela/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tangela_footprint.png
rename to graphics/pokemon/tangela/footprint.png
diff --git a/graphics/pokemon/front_pics/tangela_still_front_pic.png b/graphics/pokemon/tangela/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tangela_still_front_pic.png
rename to graphics/pokemon/tangela/front.png
diff --git a/graphics/pokemon/icons/tangela_icon.png b/graphics/pokemon/tangela/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tangela_icon.png
rename to graphics/pokemon/tangela/icon.png
diff --git a/graphics/pokemon/palettes/tangela_palette.pal b/graphics/pokemon/tangela/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tangela_palette.pal
rename to graphics/pokemon/tangela/normal.pal
diff --git a/graphics/pokemon/palettes/tangela_shiny_palette.pal b/graphics/pokemon/tangela/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tangela_shiny_palette.pal
rename to graphics/pokemon/tangela/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tauros_front_pic.png b/graphics/pokemon/tauros/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tauros_front_pic.png
rename to graphics/pokemon/tauros/anim_front.png
diff --git a/graphics/pokemon/back_pics/tauros_back_pic.png b/graphics/pokemon/tauros/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tauros_back_pic.png
rename to graphics/pokemon/tauros/back.png
diff --git a/graphics/pokemon/footprints/tauros_footprint.png b/graphics/pokemon/tauros/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tauros_footprint.png
rename to graphics/pokemon/tauros/footprint.png
diff --git a/graphics/pokemon/front_pics/tauros_still_front_pic.png b/graphics/pokemon/tauros/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tauros_still_front_pic.png
rename to graphics/pokemon/tauros/front.png
diff --git a/graphics/pokemon/icons/tauros_icon.png b/graphics/pokemon/tauros/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tauros_icon.png
rename to graphics/pokemon/tauros/icon.png
diff --git a/graphics/pokemon/palettes/tauros_palette.pal b/graphics/pokemon/tauros/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tauros_palette.pal
rename to graphics/pokemon/tauros/normal.pal
diff --git a/graphics/pokemon/palettes/tauros_shiny_palette.pal b/graphics/pokemon/tauros/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tauros_shiny_palette.pal
rename to graphics/pokemon/tauros/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/teddiursa_front_pic.png b/graphics/pokemon/teddiursa/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/teddiursa_front_pic.png
rename to graphics/pokemon/teddiursa/anim_front.png
diff --git a/graphics/pokemon/back_pics/teddiursa_back_pic.png b/graphics/pokemon/teddiursa/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/teddiursa_back_pic.png
rename to graphics/pokemon/teddiursa/back.png
diff --git a/graphics/pokemon/footprints/teddiursa_footprint.png b/graphics/pokemon/teddiursa/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/teddiursa_footprint.png
rename to graphics/pokemon/teddiursa/footprint.png
diff --git a/graphics/pokemon/front_pics/teddiursa_still_front_pic.png b/graphics/pokemon/teddiursa/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/teddiursa_still_front_pic.png
rename to graphics/pokemon/teddiursa/front.png
diff --git a/graphics/pokemon/icons/teddiursa_icon.png b/graphics/pokemon/teddiursa/icon.png
similarity index 100%
rename from graphics/pokemon/icons/teddiursa_icon.png
rename to graphics/pokemon/teddiursa/icon.png
diff --git a/graphics/pokemon/palettes/teddiursa_palette.pal b/graphics/pokemon/teddiursa/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/teddiursa_palette.pal
rename to graphics/pokemon/teddiursa/normal.pal
diff --git a/graphics/pokemon/palettes/teddiursa_shiny_palette.pal b/graphics/pokemon/teddiursa/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/teddiursa_shiny_palette.pal
rename to graphics/pokemon/teddiursa/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tentacool_front_pic.png b/graphics/pokemon/tentacool/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tentacool_front_pic.png
rename to graphics/pokemon/tentacool/anim_front.png
diff --git a/graphics/pokemon/back_pics/tentacool_back_pic.png b/graphics/pokemon/tentacool/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tentacool_back_pic.png
rename to graphics/pokemon/tentacool/back.png
diff --git a/graphics/pokemon/footprints/tentacool_footprint.png b/graphics/pokemon/tentacool/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tentacool_footprint.png
rename to graphics/pokemon/tentacool/footprint.png
diff --git a/graphics/pokemon/front_pics/tentacool_still_front_pic.png b/graphics/pokemon/tentacool/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tentacool_still_front_pic.png
rename to graphics/pokemon/tentacool/front.png
diff --git a/graphics/pokemon/icons/tentacool_icon.png b/graphics/pokemon/tentacool/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tentacool_icon.png
rename to graphics/pokemon/tentacool/icon.png
diff --git a/graphics/pokemon/palettes/tentacool_palette.pal b/graphics/pokemon/tentacool/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tentacool_palette.pal
rename to graphics/pokemon/tentacool/normal.pal
diff --git a/graphics/pokemon/palettes/tentacool_shiny_palette.pal b/graphics/pokemon/tentacool/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tentacool_shiny_palette.pal
rename to graphics/pokemon/tentacool/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tentacruel_front_pic.png b/graphics/pokemon/tentacruel/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tentacruel_front_pic.png
rename to graphics/pokemon/tentacruel/anim_front.png
diff --git a/graphics/pokemon/back_pics/tentacruel_back_pic.png b/graphics/pokemon/tentacruel/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tentacruel_back_pic.png
rename to graphics/pokemon/tentacruel/back.png
diff --git a/graphics/pokemon/footprints/tentacruel_footprint.png b/graphics/pokemon/tentacruel/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tentacruel_footprint.png
rename to graphics/pokemon/tentacruel/footprint.png
diff --git a/graphics/pokemon/front_pics/tentacruel_still_front_pic.png b/graphics/pokemon/tentacruel/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tentacruel_still_front_pic.png
rename to graphics/pokemon/tentacruel/front.png
diff --git a/graphics/pokemon/icons/tentacruel_icon.png b/graphics/pokemon/tentacruel/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tentacruel_icon.png
rename to graphics/pokemon/tentacruel/icon.png
diff --git a/graphics/pokemon/palettes/tentacruel_palette.pal b/graphics/pokemon/tentacruel/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tentacruel_palette.pal
rename to graphics/pokemon/tentacruel/normal.pal
diff --git a/graphics/pokemon/palettes/tentacruel_shiny_palette.pal b/graphics/pokemon/tentacruel/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tentacruel_shiny_palette.pal
rename to graphics/pokemon/tentacruel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/togepi_front_pic.png b/graphics/pokemon/togepi/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/togepi_front_pic.png
rename to graphics/pokemon/togepi/anim_front.png
diff --git a/graphics/pokemon/back_pics/togepi_back_pic.png b/graphics/pokemon/togepi/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/togepi_back_pic.png
rename to graphics/pokemon/togepi/back.png
diff --git a/graphics/pokemon/footprints/togepi_footprint.png b/graphics/pokemon/togepi/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/togepi_footprint.png
rename to graphics/pokemon/togepi/footprint.png
diff --git a/graphics/pokemon/front_pics/togepi_still_front_pic.png b/graphics/pokemon/togepi/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/togepi_still_front_pic.png
rename to graphics/pokemon/togepi/front.png
diff --git a/graphics/pokemon/icons/togepi_icon.png b/graphics/pokemon/togepi/icon.png
similarity index 100%
rename from graphics/pokemon/icons/togepi_icon.png
rename to graphics/pokemon/togepi/icon.png
diff --git a/graphics/pokemon/palettes/togepi_palette.pal b/graphics/pokemon/togepi/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/togepi_palette.pal
rename to graphics/pokemon/togepi/normal.pal
diff --git a/graphics/pokemon/palettes/togepi_shiny_palette.pal b/graphics/pokemon/togepi/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/togepi_shiny_palette.pal
rename to graphics/pokemon/togepi/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/togetic_front_pic.png b/graphics/pokemon/togetic/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/togetic_front_pic.png
rename to graphics/pokemon/togetic/anim_front.png
diff --git a/graphics/pokemon/back_pics/togetic_back_pic.png b/graphics/pokemon/togetic/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/togetic_back_pic.png
rename to graphics/pokemon/togetic/back.png
diff --git a/graphics/pokemon/footprints/togetic_footprint.png b/graphics/pokemon/togetic/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/togetic_footprint.png
rename to graphics/pokemon/togetic/footprint.png
diff --git a/graphics/pokemon/front_pics/togetic_still_front_pic.png b/graphics/pokemon/togetic/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/togetic_still_front_pic.png
rename to graphics/pokemon/togetic/front.png
diff --git a/graphics/pokemon/icons/togetic_icon.png b/graphics/pokemon/togetic/icon.png
similarity index 100%
rename from graphics/pokemon/icons/togetic_icon.png
rename to graphics/pokemon/togetic/icon.png
diff --git a/graphics/pokemon/palettes/togetic_palette.pal b/graphics/pokemon/togetic/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/togetic_palette.pal
rename to graphics/pokemon/togetic/normal.pal
diff --git a/graphics/pokemon/palettes/togetic_shiny_palette.pal b/graphics/pokemon/togetic/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/togetic_shiny_palette.pal
rename to graphics/pokemon/togetic/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/torchic_front_pic.png b/graphics/pokemon/torchic/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/torchic_front_pic.png
rename to graphics/pokemon/torchic/anim_front.png
diff --git a/graphics/pokemon/back_pics/torchic_back_pic.png b/graphics/pokemon/torchic/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/torchic_back_pic.png
rename to graphics/pokemon/torchic/back.png
diff --git a/graphics/pokemon/footprints/torchic_footprint.png b/graphics/pokemon/torchic/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/torchic_footprint.png
rename to graphics/pokemon/torchic/footprint.png
diff --git a/graphics/pokemon/front_pics/torchic_still_front_pic.png b/graphics/pokemon/torchic/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/torchic_still_front_pic.png
rename to graphics/pokemon/torchic/front.png
diff --git a/graphics/pokemon/icons/torchic_icon.png b/graphics/pokemon/torchic/icon.png
similarity index 100%
rename from graphics/pokemon/icons/torchic_icon.png
rename to graphics/pokemon/torchic/icon.png
diff --git a/graphics/pokemon/palettes/torchic_palette.pal b/graphics/pokemon/torchic/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/torchic_palette.pal
rename to graphics/pokemon/torchic/normal.pal
diff --git a/graphics/pokemon/palettes/torchic_shiny_palette.pal b/graphics/pokemon/torchic/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/torchic_shiny_palette.pal
rename to graphics/pokemon/torchic/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/torkoal_front_pic.png b/graphics/pokemon/torkoal/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/torkoal_front_pic.png
rename to graphics/pokemon/torkoal/anim_front.png
diff --git a/graphics/pokemon/back_pics/torkoal_back_pic.png b/graphics/pokemon/torkoal/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/torkoal_back_pic.png
rename to graphics/pokemon/torkoal/back.png
diff --git a/graphics/pokemon/footprints/torkoal_footprint.png b/graphics/pokemon/torkoal/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/torkoal_footprint.png
rename to graphics/pokemon/torkoal/footprint.png
diff --git a/graphics/pokemon/front_pics/torkoal_still_front_pic.png b/graphics/pokemon/torkoal/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/torkoal_still_front_pic.png
rename to graphics/pokemon/torkoal/front.png
diff --git a/graphics/pokemon/icons/torkoal_icon.png b/graphics/pokemon/torkoal/icon.png
similarity index 100%
rename from graphics/pokemon/icons/torkoal_icon.png
rename to graphics/pokemon/torkoal/icon.png
diff --git a/graphics/pokemon/palettes/torkoal_palette.pal b/graphics/pokemon/torkoal/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/torkoal_palette.pal
rename to graphics/pokemon/torkoal/normal.pal
diff --git a/graphics/pokemon/palettes/torkoal_shiny_palette.pal b/graphics/pokemon/torkoal/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/torkoal_shiny_palette.pal
rename to graphics/pokemon/torkoal/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/totodile_front_pic.png b/graphics/pokemon/totodile/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/totodile_front_pic.png
rename to graphics/pokemon/totodile/anim_front.png
diff --git a/graphics/pokemon/back_pics/totodile_back_pic.png b/graphics/pokemon/totodile/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/totodile_back_pic.png
rename to graphics/pokemon/totodile/back.png
diff --git a/graphics/pokemon/footprints/totodile_footprint.png b/graphics/pokemon/totodile/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/totodile_footprint.png
rename to graphics/pokemon/totodile/footprint.png
diff --git a/graphics/pokemon/front_pics/totodile_still_front_pic.png b/graphics/pokemon/totodile/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/totodile_still_front_pic.png
rename to graphics/pokemon/totodile/front.png
diff --git a/graphics/pokemon/icons/totodile_icon.png b/graphics/pokemon/totodile/icon.png
similarity index 100%
rename from graphics/pokemon/icons/totodile_icon.png
rename to graphics/pokemon/totodile/icon.png
diff --git a/graphics/pokemon/palettes/totodile_palette.pal b/graphics/pokemon/totodile/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/totodile_palette.pal
rename to graphics/pokemon/totodile/normal.pal
diff --git a/graphics/pokemon/palettes/totodile_shiny_palette.pal b/graphics/pokemon/totodile/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/totodile_shiny_palette.pal
rename to graphics/pokemon/totodile/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/trapinch_front_pic.png b/graphics/pokemon/trapinch/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/trapinch_front_pic.png
rename to graphics/pokemon/trapinch/anim_front.png
diff --git a/graphics/pokemon/back_pics/trapinch_back_pic.png b/graphics/pokemon/trapinch/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/trapinch_back_pic.png
rename to graphics/pokemon/trapinch/back.png
diff --git a/graphics/pokemon/footprints/trapinch_footprint.png b/graphics/pokemon/trapinch/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/trapinch_footprint.png
rename to graphics/pokemon/trapinch/footprint.png
diff --git a/graphics/pokemon/front_pics/trapinch_still_front_pic.png b/graphics/pokemon/trapinch/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/trapinch_still_front_pic.png
rename to graphics/pokemon/trapinch/front.png
diff --git a/graphics/pokemon/icons/trapinch_icon.png b/graphics/pokemon/trapinch/icon.png
similarity index 100%
rename from graphics/pokemon/icons/trapinch_icon.png
rename to graphics/pokemon/trapinch/icon.png
diff --git a/graphics/pokemon/palettes/trapinch_palette.pal b/graphics/pokemon/trapinch/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/trapinch_palette.pal
rename to graphics/pokemon/trapinch/normal.pal
diff --git a/graphics/pokemon/palettes/trapinch_shiny_palette.pal b/graphics/pokemon/trapinch/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/trapinch_shiny_palette.pal
rename to graphics/pokemon/trapinch/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/treecko_front_pic.png b/graphics/pokemon/treecko/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/treecko_front_pic.png
rename to graphics/pokemon/treecko/anim_front.png
diff --git a/graphics/pokemon/back_pics/treecko_back_pic.png b/graphics/pokemon/treecko/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/treecko_back_pic.png
rename to graphics/pokemon/treecko/back.png
diff --git a/graphics/pokemon/footprints/treecko_footprint.png b/graphics/pokemon/treecko/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/treecko_footprint.png
rename to graphics/pokemon/treecko/footprint.png
diff --git a/graphics/pokemon/front_pics/treecko_still_front_pic.png b/graphics/pokemon/treecko/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/treecko_still_front_pic.png
rename to graphics/pokemon/treecko/front.png
diff --git a/graphics/pokemon/icons/treecko_icon.png b/graphics/pokemon/treecko/icon.png
similarity index 100%
rename from graphics/pokemon/icons/treecko_icon.png
rename to graphics/pokemon/treecko/icon.png
diff --git a/graphics/pokemon/palettes/treecko_palette.pal b/graphics/pokemon/treecko/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/treecko_palette.pal
rename to graphics/pokemon/treecko/normal.pal
diff --git a/graphics/pokemon/palettes/treecko_shiny_palette.pal b/graphics/pokemon/treecko/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/treecko_shiny_palette.pal
rename to graphics/pokemon/treecko/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tropius_front_pic.png b/graphics/pokemon/tropius/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tropius_front_pic.png
rename to graphics/pokemon/tropius/anim_front.png
diff --git a/graphics/pokemon/back_pics/tropius_back_pic.png b/graphics/pokemon/tropius/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tropius_back_pic.png
rename to graphics/pokemon/tropius/back.png
diff --git a/graphics/pokemon/footprints/tropius_footprint.png b/graphics/pokemon/tropius/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tropius_footprint.png
rename to graphics/pokemon/tropius/footprint.png
diff --git a/graphics/pokemon/front_pics/tropius_still_front_pic.png b/graphics/pokemon/tropius/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tropius_still_front_pic.png
rename to graphics/pokemon/tropius/front.png
diff --git a/graphics/pokemon/icons/tropius_icon.png b/graphics/pokemon/tropius/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tropius_icon.png
rename to graphics/pokemon/tropius/icon.png
diff --git a/graphics/pokemon/palettes/tropius_palette.pal b/graphics/pokemon/tropius/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tropius_palette.pal
rename to graphics/pokemon/tropius/normal.pal
diff --git a/graphics/pokemon/palettes/tropius_shiny_palette.pal b/graphics/pokemon/tropius/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tropius_shiny_palette.pal
rename to graphics/pokemon/tropius/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/typhlosion_front_pic.png b/graphics/pokemon/typhlosion/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/typhlosion_front_pic.png
rename to graphics/pokemon/typhlosion/anim_front.png
diff --git a/graphics/pokemon/back_pics/typhlosion_back_pic.png b/graphics/pokemon/typhlosion/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/typhlosion_back_pic.png
rename to graphics/pokemon/typhlosion/back.png
diff --git a/graphics/pokemon/footprints/typhlosion_footprint.png b/graphics/pokemon/typhlosion/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/typhlosion_footprint.png
rename to graphics/pokemon/typhlosion/footprint.png
diff --git a/graphics/pokemon/front_pics/typhlosion_still_front_pic.png b/graphics/pokemon/typhlosion/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/typhlosion_still_front_pic.png
rename to graphics/pokemon/typhlosion/front.png
diff --git a/graphics/pokemon/icons/typhlosion_icon.png b/graphics/pokemon/typhlosion/icon.png
similarity index 100%
rename from graphics/pokemon/icons/typhlosion_icon.png
rename to graphics/pokemon/typhlosion/icon.png
diff --git a/graphics/pokemon/palettes/typhlosion_palette.pal b/graphics/pokemon/typhlosion/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/typhlosion_palette.pal
rename to graphics/pokemon/typhlosion/normal.pal
diff --git a/graphics/pokemon/palettes/typhlosion_shiny_palette.pal b/graphics/pokemon/typhlosion/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/typhlosion_shiny_palette.pal
rename to graphics/pokemon/typhlosion/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tyranitar_front_pic.png b/graphics/pokemon/tyranitar/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tyranitar_front_pic.png
rename to graphics/pokemon/tyranitar/anim_front.png
diff --git a/graphics/pokemon/back_pics/tyranitar_back_pic.png b/graphics/pokemon/tyranitar/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tyranitar_back_pic.png
rename to graphics/pokemon/tyranitar/back.png
diff --git a/graphics/pokemon/footprints/tyranitar_footprint.png b/graphics/pokemon/tyranitar/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tyranitar_footprint.png
rename to graphics/pokemon/tyranitar/footprint.png
diff --git a/graphics/pokemon/front_pics/tyranitar_still_front_pic.png b/graphics/pokemon/tyranitar/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tyranitar_still_front_pic.png
rename to graphics/pokemon/tyranitar/front.png
diff --git a/graphics/pokemon/icons/tyranitar_icon.png b/graphics/pokemon/tyranitar/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tyranitar_icon.png
rename to graphics/pokemon/tyranitar/icon.png
diff --git a/graphics/pokemon/palettes/tyranitar_palette.pal b/graphics/pokemon/tyranitar/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tyranitar_palette.pal
rename to graphics/pokemon/tyranitar/normal.pal
diff --git a/graphics/pokemon/palettes/tyranitar_shiny_palette.pal b/graphics/pokemon/tyranitar/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tyranitar_shiny_palette.pal
rename to graphics/pokemon/tyranitar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tyrogue_front_pic.png b/graphics/pokemon/tyrogue/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/tyrogue_front_pic.png
rename to graphics/pokemon/tyrogue/anim_front.png
diff --git a/graphics/pokemon/back_pics/tyrogue_back_pic.png b/graphics/pokemon/tyrogue/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/tyrogue_back_pic.png
rename to graphics/pokemon/tyrogue/back.png
diff --git a/graphics/pokemon/footprints/tyrogue_footprint.png b/graphics/pokemon/tyrogue/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/tyrogue_footprint.png
rename to graphics/pokemon/tyrogue/footprint.png
diff --git a/graphics/pokemon/front_pics/tyrogue_still_front_pic.png b/graphics/pokemon/tyrogue/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/tyrogue_still_front_pic.png
rename to graphics/pokemon/tyrogue/front.png
diff --git a/graphics/pokemon/icons/tyrogue_icon.png b/graphics/pokemon/tyrogue/icon.png
similarity index 100%
rename from graphics/pokemon/icons/tyrogue_icon.png
rename to graphics/pokemon/tyrogue/icon.png
diff --git a/graphics/pokemon/palettes/tyrogue_palette.pal b/graphics/pokemon/tyrogue/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/tyrogue_palette.pal
rename to graphics/pokemon/tyrogue/normal.pal
diff --git a/graphics/pokemon/palettes/tyrogue_shiny_palette.pal b/graphics/pokemon/tyrogue/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/tyrogue_shiny_palette.pal
rename to graphics/pokemon/tyrogue/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/umbreon_front_pic.png b/graphics/pokemon/umbreon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/umbreon_front_pic.png
rename to graphics/pokemon/umbreon/anim_front.png
diff --git a/graphics/pokemon/back_pics/umbreon_back_pic.png b/graphics/pokemon/umbreon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/umbreon_back_pic.png
rename to graphics/pokemon/umbreon/back.png
diff --git a/graphics/pokemon/footprints/umbreon_footprint.png b/graphics/pokemon/umbreon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/umbreon_footprint.png
rename to graphics/pokemon/umbreon/footprint.png
diff --git a/graphics/pokemon/front_pics/umbreon_still_front_pic.png b/graphics/pokemon/umbreon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/umbreon_still_front_pic.png
rename to graphics/pokemon/umbreon/front.png
diff --git a/graphics/pokemon/icons/umbreon_icon.png b/graphics/pokemon/umbreon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/umbreon_icon.png
rename to graphics/pokemon/umbreon/icon.png
diff --git a/graphics/pokemon/palettes/umbreon_palette.pal b/graphics/pokemon/umbreon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/umbreon_palette.pal
rename to graphics/pokemon/umbreon/normal.pal
diff --git a/graphics/pokemon/palettes/umbreon_shiny_palette.pal b/graphics/pokemon/umbreon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/umbreon_shiny_palette.pal
rename to graphics/pokemon/umbreon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/unown_a_front_pic.png b/graphics/pokemon/unown/anim_front_a.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_a_front_pic.png
rename to graphics/pokemon/unown/anim_front_a.png
diff --git a/graphics/pokemon/anim_front_pics/unown_b_front_pic.png b/graphics/pokemon/unown/anim_front_b.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_b_front_pic.png
rename to graphics/pokemon/unown/anim_front_b.png
diff --git a/graphics/pokemon/anim_front_pics/unown_c_front_pic.png b/graphics/pokemon/unown/anim_front_c.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_c_front_pic.png
rename to graphics/pokemon/unown/anim_front_c.png
diff --git a/graphics/pokemon/anim_front_pics/unown_d_front_pic.png b/graphics/pokemon/unown/anim_front_d.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_d_front_pic.png
rename to graphics/pokemon/unown/anim_front_d.png
diff --git a/graphics/pokemon/anim_front_pics/unown_e_front_pic.png b/graphics/pokemon/unown/anim_front_e.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_e_front_pic.png
rename to graphics/pokemon/unown/anim_front_e.png
diff --git a/graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.png b/graphics/pokemon/unown/anim_front_exclamation_mark.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.png
rename to graphics/pokemon/unown/anim_front_exclamation_mark.png
diff --git a/graphics/pokemon/anim_front_pics/unown_f_front_pic.png b/graphics/pokemon/unown/anim_front_f.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_f_front_pic.png
rename to graphics/pokemon/unown/anim_front_f.png
diff --git a/graphics/pokemon/anim_front_pics/unown_g_front_pic.png b/graphics/pokemon/unown/anim_front_g.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_g_front_pic.png
rename to graphics/pokemon/unown/anim_front_g.png
diff --git a/graphics/pokemon/anim_front_pics/unown_h_front_pic.png b/graphics/pokemon/unown/anim_front_h.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_h_front_pic.png
rename to graphics/pokemon/unown/anim_front_h.png
diff --git a/graphics/pokemon/anim_front_pics/unown_i_front_pic.png b/graphics/pokemon/unown/anim_front_i.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_i_front_pic.png
rename to graphics/pokemon/unown/anim_front_i.png
diff --git a/graphics/pokemon/anim_front_pics/unown_j_front_pic.png b/graphics/pokemon/unown/anim_front_j.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_j_front_pic.png
rename to graphics/pokemon/unown/anim_front_j.png
diff --git a/graphics/pokemon/anim_front_pics/unown_k_front_pic.png b/graphics/pokemon/unown/anim_front_k.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_k_front_pic.png
rename to graphics/pokemon/unown/anim_front_k.png
diff --git a/graphics/pokemon/anim_front_pics/unown_l_front_pic.png b/graphics/pokemon/unown/anim_front_l.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_l_front_pic.png
rename to graphics/pokemon/unown/anim_front_l.png
diff --git a/graphics/pokemon/anim_front_pics/unown_m_front_pic.png b/graphics/pokemon/unown/anim_front_m.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_m_front_pic.png
rename to graphics/pokemon/unown/anim_front_m.png
diff --git a/graphics/pokemon/anim_front_pics/unown_n_front_pic.png b/graphics/pokemon/unown/anim_front_n.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_n_front_pic.png
rename to graphics/pokemon/unown/anim_front_n.png
diff --git a/graphics/pokemon/anim_front_pics/unown_o_front_pic.png b/graphics/pokemon/unown/anim_front_o.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_o_front_pic.png
rename to graphics/pokemon/unown/anim_front_o.png
diff --git a/graphics/pokemon/anim_front_pics/unown_p_front_pic.png b/graphics/pokemon/unown/anim_front_p.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_p_front_pic.png
rename to graphics/pokemon/unown/anim_front_p.png
diff --git a/graphics/pokemon/anim_front_pics/unown_q_front_pic.png b/graphics/pokemon/unown/anim_front_q.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_q_front_pic.png
rename to graphics/pokemon/unown/anim_front_q.png
diff --git a/graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.png b/graphics/pokemon/unown/anim_front_question_mark.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.png
rename to graphics/pokemon/unown/anim_front_question_mark.png
diff --git a/graphics/pokemon/anim_front_pics/unown_r_front_pic.png b/graphics/pokemon/unown/anim_front_r.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_r_front_pic.png
rename to graphics/pokemon/unown/anim_front_r.png
diff --git a/graphics/pokemon/anim_front_pics/unown_s_front_pic.png b/graphics/pokemon/unown/anim_front_s.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_s_front_pic.png
rename to graphics/pokemon/unown/anim_front_s.png
diff --git a/graphics/pokemon/anim_front_pics/unown_t_front_pic.png b/graphics/pokemon/unown/anim_front_t.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_t_front_pic.png
rename to graphics/pokemon/unown/anim_front_t.png
diff --git a/graphics/pokemon/anim_front_pics/unown_u_front_pic.png b/graphics/pokemon/unown/anim_front_u.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_u_front_pic.png
rename to graphics/pokemon/unown/anim_front_u.png
diff --git a/graphics/pokemon/anim_front_pics/unown_v_front_pic.png b/graphics/pokemon/unown/anim_front_v.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_v_front_pic.png
rename to graphics/pokemon/unown/anim_front_v.png
diff --git a/graphics/pokemon/anim_front_pics/unown_w_front_pic.png b/graphics/pokemon/unown/anim_front_w.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_w_front_pic.png
rename to graphics/pokemon/unown/anim_front_w.png
diff --git a/graphics/pokemon/anim_front_pics/unown_x_front_pic.png b/graphics/pokemon/unown/anim_front_x.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_x_front_pic.png
rename to graphics/pokemon/unown/anim_front_x.png
diff --git a/graphics/pokemon/anim_front_pics/unown_y_front_pic.png b/graphics/pokemon/unown/anim_front_y.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_y_front_pic.png
rename to graphics/pokemon/unown/anim_front_y.png
diff --git a/graphics/pokemon/anim_front_pics/unown_z_front_pic.png b/graphics/pokemon/unown/anim_front_z.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/unown_z_front_pic.png
rename to graphics/pokemon/unown/anim_front_z.png
diff --git a/graphics/pokemon/back_pics/unown_a_back_pic.png b/graphics/pokemon/unown/back_a.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_a_back_pic.png
rename to graphics/pokemon/unown/back_a.png
diff --git a/graphics/pokemon/back_pics/unown_b_back_pic.png b/graphics/pokemon/unown/back_b.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_b_back_pic.png
rename to graphics/pokemon/unown/back_b.png
diff --git a/graphics/pokemon/back_pics/unown_c_back_pic.png b/graphics/pokemon/unown/back_c.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_c_back_pic.png
rename to graphics/pokemon/unown/back_c.png
diff --git a/graphics/pokemon/back_pics/unown_d_back_pic.png b/graphics/pokemon/unown/back_d.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_d_back_pic.png
rename to graphics/pokemon/unown/back_d.png
diff --git a/graphics/pokemon/back_pics/unown_e_back_pic.png b/graphics/pokemon/unown/back_e.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_e_back_pic.png
rename to graphics/pokemon/unown/back_e.png
diff --git a/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png b/graphics/pokemon/unown/back_exclamation_mark.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png
rename to graphics/pokemon/unown/back_exclamation_mark.png
diff --git a/graphics/pokemon/back_pics/unown_f_back_pic.png b/graphics/pokemon/unown/back_f.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_f_back_pic.png
rename to graphics/pokemon/unown/back_f.png
diff --git a/graphics/pokemon/back_pics/unown_g_back_pic.png b/graphics/pokemon/unown/back_g.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_g_back_pic.png
rename to graphics/pokemon/unown/back_g.png
diff --git a/graphics/pokemon/back_pics/unown_h_back_pic.png b/graphics/pokemon/unown/back_h.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_h_back_pic.png
rename to graphics/pokemon/unown/back_h.png
diff --git a/graphics/pokemon/back_pics/unown_i_back_pic.png b/graphics/pokemon/unown/back_i.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_i_back_pic.png
rename to graphics/pokemon/unown/back_i.png
diff --git a/graphics/pokemon/back_pics/unown_j_back_pic.png b/graphics/pokemon/unown/back_j.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_j_back_pic.png
rename to graphics/pokemon/unown/back_j.png
diff --git a/graphics/pokemon/back_pics/unown_k_back_pic.png b/graphics/pokemon/unown/back_k.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_k_back_pic.png
rename to graphics/pokemon/unown/back_k.png
diff --git a/graphics/pokemon/back_pics/unown_l_back_pic.png b/graphics/pokemon/unown/back_l.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_l_back_pic.png
rename to graphics/pokemon/unown/back_l.png
diff --git a/graphics/pokemon/back_pics/unown_m_back_pic.png b/graphics/pokemon/unown/back_m.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_m_back_pic.png
rename to graphics/pokemon/unown/back_m.png
diff --git a/graphics/pokemon/back_pics/unown_n_back_pic.png b/graphics/pokemon/unown/back_n.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_n_back_pic.png
rename to graphics/pokemon/unown/back_n.png
diff --git a/graphics/pokemon/back_pics/unown_o_back_pic.png b/graphics/pokemon/unown/back_o.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_o_back_pic.png
rename to graphics/pokemon/unown/back_o.png
diff --git a/graphics/pokemon/back_pics/unown_p_back_pic.png b/graphics/pokemon/unown/back_p.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_p_back_pic.png
rename to graphics/pokemon/unown/back_p.png
diff --git a/graphics/pokemon/back_pics/unown_q_back_pic.png b/graphics/pokemon/unown/back_q.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_q_back_pic.png
rename to graphics/pokemon/unown/back_q.png
diff --git a/graphics/pokemon/back_pics/unown_question_mark_back_pic.png b/graphics/pokemon/unown/back_question_mark.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_question_mark_back_pic.png
rename to graphics/pokemon/unown/back_question_mark.png
diff --git a/graphics/pokemon/back_pics/unown_r_back_pic.png b/graphics/pokemon/unown/back_r.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_r_back_pic.png
rename to graphics/pokemon/unown/back_r.png
diff --git a/graphics/pokemon/back_pics/unown_s_back_pic.png b/graphics/pokemon/unown/back_s.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_s_back_pic.png
rename to graphics/pokemon/unown/back_s.png
diff --git a/graphics/pokemon/back_pics/unown_t_back_pic.png b/graphics/pokemon/unown/back_t.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_t_back_pic.png
rename to graphics/pokemon/unown/back_t.png
diff --git a/graphics/pokemon/back_pics/unown_u_back_pic.png b/graphics/pokemon/unown/back_u.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_u_back_pic.png
rename to graphics/pokemon/unown/back_u.png
diff --git a/graphics/pokemon/back_pics/unown_v_back_pic.png b/graphics/pokemon/unown/back_v.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_v_back_pic.png
rename to graphics/pokemon/unown/back_v.png
diff --git a/graphics/pokemon/back_pics/unown_w_back_pic.png b/graphics/pokemon/unown/back_w.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_w_back_pic.png
rename to graphics/pokemon/unown/back_w.png
diff --git a/graphics/pokemon/back_pics/unown_x_back_pic.png b/graphics/pokemon/unown/back_x.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_x_back_pic.png
rename to graphics/pokemon/unown/back_x.png
diff --git a/graphics/pokemon/back_pics/unown_y_back_pic.png b/graphics/pokemon/unown/back_y.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_y_back_pic.png
rename to graphics/pokemon/unown/back_y.png
diff --git a/graphics/pokemon/back_pics/unown_z_back_pic.png b/graphics/pokemon/unown/back_z.png
similarity index 100%
rename from graphics/pokemon/back_pics/unown_z_back_pic.png
rename to graphics/pokemon/unown/back_z.png
diff --git a/graphics/pokemon/footprints/unown_footprint.png b/graphics/pokemon/unown/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/unown_footprint.png
rename to graphics/pokemon/unown/footprint.png
diff --git a/graphics/pokemon/front_pics/unown_a_still_front_pic.png b/graphics/pokemon/unown/front_a.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_a_still_front_pic.png
rename to graphics/pokemon/unown/front_a.png
diff --git a/graphics/pokemon/front_pics/unown_b_still_front_pic.png b/graphics/pokemon/unown/front_b.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_b_still_front_pic.png
rename to graphics/pokemon/unown/front_b.png
diff --git a/graphics/pokemon/front_pics/unown_c_still_front_pic.png b/graphics/pokemon/unown/front_c.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_c_still_front_pic.png
rename to graphics/pokemon/unown/front_c.png
diff --git a/graphics/pokemon/front_pics/unown_d_still_front_pic.png b/graphics/pokemon/unown/front_d.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_d_still_front_pic.png
rename to graphics/pokemon/unown/front_d.png
diff --git a/graphics/pokemon/front_pics/unown_e_still_front_pic.png b/graphics/pokemon/unown/front_e.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_e_still_front_pic.png
rename to graphics/pokemon/unown/front_e.png
diff --git a/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png b/graphics/pokemon/unown/front_exclamation_mark.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png
rename to graphics/pokemon/unown/front_exclamation_mark.png
diff --git a/graphics/pokemon/front_pics/unown_f_still_front_pic.png b/graphics/pokemon/unown/front_f.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_f_still_front_pic.png
rename to graphics/pokemon/unown/front_f.png
diff --git a/graphics/pokemon/front_pics/unown_g_still_front_pic.png b/graphics/pokemon/unown/front_g.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_g_still_front_pic.png
rename to graphics/pokemon/unown/front_g.png
diff --git a/graphics/pokemon/front_pics/unown_h_still_front_pic.png b/graphics/pokemon/unown/front_h.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_h_still_front_pic.png
rename to graphics/pokemon/unown/front_h.png
diff --git a/graphics/pokemon/front_pics/unown_i_still_front_pic.png b/graphics/pokemon/unown/front_i.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_i_still_front_pic.png
rename to graphics/pokemon/unown/front_i.png
diff --git a/graphics/pokemon/front_pics/unown_j_still_front_pic.png b/graphics/pokemon/unown/front_j.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_j_still_front_pic.png
rename to graphics/pokemon/unown/front_j.png
diff --git a/graphics/pokemon/front_pics/unown_k_still_front_pic.png b/graphics/pokemon/unown/front_k.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_k_still_front_pic.png
rename to graphics/pokemon/unown/front_k.png
diff --git a/graphics/pokemon/front_pics/unown_l_still_front_pic.png b/graphics/pokemon/unown/front_l.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_l_still_front_pic.png
rename to graphics/pokemon/unown/front_l.png
diff --git a/graphics/pokemon/front_pics/unown_m_still_front_pic.png b/graphics/pokemon/unown/front_m.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_m_still_front_pic.png
rename to graphics/pokemon/unown/front_m.png
diff --git a/graphics/pokemon/front_pics/unown_n_still_front_pic.png b/graphics/pokemon/unown/front_n.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_n_still_front_pic.png
rename to graphics/pokemon/unown/front_n.png
diff --git a/graphics/pokemon/front_pics/unown_o_still_front_pic.png b/graphics/pokemon/unown/front_o.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_o_still_front_pic.png
rename to graphics/pokemon/unown/front_o.png
diff --git a/graphics/pokemon/front_pics/unown_p_still_front_pic.png b/graphics/pokemon/unown/front_p.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_p_still_front_pic.png
rename to graphics/pokemon/unown/front_p.png
diff --git a/graphics/pokemon/front_pics/unown_q_still_front_pic.png b/graphics/pokemon/unown/front_q.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_q_still_front_pic.png
rename to graphics/pokemon/unown/front_q.png
diff --git a/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png b/graphics/pokemon/unown/front_question_mark.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png
rename to graphics/pokemon/unown/front_question_mark.png
diff --git a/graphics/pokemon/front_pics/unown_r_still_front_pic.png b/graphics/pokemon/unown/front_r.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_r_still_front_pic.png
rename to graphics/pokemon/unown/front_r.png
diff --git a/graphics/pokemon/front_pics/unown_s_still_front_pic.png b/graphics/pokemon/unown/front_s.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_s_still_front_pic.png
rename to graphics/pokemon/unown/front_s.png
diff --git a/graphics/pokemon/front_pics/unown_t_still_front_pic.png b/graphics/pokemon/unown/front_t.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_t_still_front_pic.png
rename to graphics/pokemon/unown/front_t.png
diff --git a/graphics/pokemon/front_pics/unown_u_still_front_pic.png b/graphics/pokemon/unown/front_u.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_u_still_front_pic.png
rename to graphics/pokemon/unown/front_u.png
diff --git a/graphics/pokemon/front_pics/unown_v_still_front_pic.png b/graphics/pokemon/unown/front_v.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_v_still_front_pic.png
rename to graphics/pokemon/unown/front_v.png
diff --git a/graphics/pokemon/front_pics/unown_w_still_front_pic.png b/graphics/pokemon/unown/front_w.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_w_still_front_pic.png
rename to graphics/pokemon/unown/front_w.png
diff --git a/graphics/pokemon/front_pics/unown_x_still_front_pic.png b/graphics/pokemon/unown/front_x.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_x_still_front_pic.png
rename to graphics/pokemon/unown/front_x.png
diff --git a/graphics/pokemon/front_pics/unown_y_still_front_pic.png b/graphics/pokemon/unown/front_y.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_y_still_front_pic.png
rename to graphics/pokemon/unown/front_y.png
diff --git a/graphics/pokemon/front_pics/unown_z_still_front_pic.png b/graphics/pokemon/unown/front_z.png
similarity index 100%
rename from graphics/pokemon/front_pics/unown_z_still_front_pic.png
rename to graphics/pokemon/unown/front_z.png
diff --git a/graphics/pokemon/icons/unown_a_icon.png b/graphics/pokemon/unown/icon_a.png
similarity index 100%
rename from graphics/pokemon/icons/unown_a_icon.png
rename to graphics/pokemon/unown/icon_a.png
diff --git a/graphics/pokemon/icons/unown_B_icon.png b/graphics/pokemon/unown/icon_b.png
similarity index 100%
rename from graphics/pokemon/icons/unown_B_icon.png
rename to graphics/pokemon/unown/icon_b.png
diff --git a/graphics/pokemon/icons/unown_C_icon.png b/graphics/pokemon/unown/icon_c.png
similarity index 100%
rename from graphics/pokemon/icons/unown_C_icon.png
rename to graphics/pokemon/unown/icon_c.png
diff --git a/graphics/pokemon/icons/unown_D_icon.png b/graphics/pokemon/unown/icon_d.png
similarity index 100%
rename from graphics/pokemon/icons/unown_D_icon.png
rename to graphics/pokemon/unown/icon_d.png
diff --git a/graphics/pokemon/icons/unown_E_icon.png b/graphics/pokemon/unown/icon_e.png
similarity index 100%
rename from graphics/pokemon/icons/unown_E_icon.png
rename to graphics/pokemon/unown/icon_e.png
diff --git a/graphics/pokemon/icons/unown_exclamation_mark_icon.png b/graphics/pokemon/unown/icon_exclamation_mark.png
similarity index 100%
rename from graphics/pokemon/icons/unown_exclamation_mark_icon.png
rename to graphics/pokemon/unown/icon_exclamation_mark.png
diff --git a/graphics/pokemon/icons/unown_F_icon.png b/graphics/pokemon/unown/icon_f.png
similarity index 100%
rename from graphics/pokemon/icons/unown_F_icon.png
rename to graphics/pokemon/unown/icon_f.png
diff --git a/graphics/pokemon/icons/unown_G_icon.png b/graphics/pokemon/unown/icon_g.png
similarity index 100%
rename from graphics/pokemon/icons/unown_G_icon.png
rename to graphics/pokemon/unown/icon_g.png
diff --git a/graphics/pokemon/icons/unown_H_icon.png b/graphics/pokemon/unown/icon_h.png
similarity index 100%
rename from graphics/pokemon/icons/unown_H_icon.png
rename to graphics/pokemon/unown/icon_h.png
diff --git a/graphics/pokemon/icons/unown_I_icon.png b/graphics/pokemon/unown/icon_i.png
similarity index 100%
rename from graphics/pokemon/icons/unown_I_icon.png
rename to graphics/pokemon/unown/icon_i.png
diff --git a/graphics/pokemon/icons/unown_J_icon.png b/graphics/pokemon/unown/icon_j.png
similarity index 100%
rename from graphics/pokemon/icons/unown_J_icon.png
rename to graphics/pokemon/unown/icon_j.png
diff --git a/graphics/pokemon/icons/unown_K_icon.png b/graphics/pokemon/unown/icon_k.png
similarity index 100%
rename from graphics/pokemon/icons/unown_K_icon.png
rename to graphics/pokemon/unown/icon_k.png
diff --git a/graphics/pokemon/icons/unown_L_icon.png b/graphics/pokemon/unown/icon_l.png
similarity index 100%
rename from graphics/pokemon/icons/unown_L_icon.png
rename to graphics/pokemon/unown/icon_l.png
diff --git a/graphics/pokemon/icons/unown_M_icon.png b/graphics/pokemon/unown/icon_m.png
similarity index 100%
rename from graphics/pokemon/icons/unown_M_icon.png
rename to graphics/pokemon/unown/icon_m.png
diff --git a/graphics/pokemon/icons/unown_N_icon.png b/graphics/pokemon/unown/icon_n.png
similarity index 100%
rename from graphics/pokemon/icons/unown_N_icon.png
rename to graphics/pokemon/unown/icon_n.png
diff --git a/graphics/pokemon/icons/unown_O_icon.png b/graphics/pokemon/unown/icon_o.png
similarity index 100%
rename from graphics/pokemon/icons/unown_O_icon.png
rename to graphics/pokemon/unown/icon_o.png
diff --git a/graphics/pokemon/icons/unown_P_icon.png b/graphics/pokemon/unown/icon_p.png
similarity index 100%
rename from graphics/pokemon/icons/unown_P_icon.png
rename to graphics/pokemon/unown/icon_p.png
diff --git a/graphics/pokemon/icons/unown_Q_icon.png b/graphics/pokemon/unown/icon_q.png
similarity index 100%
rename from graphics/pokemon/icons/unown_Q_icon.png
rename to graphics/pokemon/unown/icon_q.png
diff --git a/graphics/pokemon/icons/unown_question_mark_icon.png b/graphics/pokemon/unown/icon_question_mark.png
similarity index 100%
rename from graphics/pokemon/icons/unown_question_mark_icon.png
rename to graphics/pokemon/unown/icon_question_mark.png
diff --git a/graphics/pokemon/icons/unown_R_icon.png b/graphics/pokemon/unown/icon_r.png
similarity index 100%
rename from graphics/pokemon/icons/unown_R_icon.png
rename to graphics/pokemon/unown/icon_r.png
diff --git a/graphics/pokemon/icons/unown_S_icon.png b/graphics/pokemon/unown/icon_s.png
similarity index 100%
rename from graphics/pokemon/icons/unown_S_icon.png
rename to graphics/pokemon/unown/icon_s.png
diff --git a/graphics/pokemon/icons/unown_T_icon.png b/graphics/pokemon/unown/icon_t.png
similarity index 100%
rename from graphics/pokemon/icons/unown_T_icon.png
rename to graphics/pokemon/unown/icon_t.png
diff --git a/graphics/pokemon/icons/unown_U_icon.png b/graphics/pokemon/unown/icon_u.png
similarity index 100%
rename from graphics/pokemon/icons/unown_U_icon.png
rename to graphics/pokemon/unown/icon_u.png
diff --git a/graphics/pokemon/icons/unown_V_icon.png b/graphics/pokemon/unown/icon_v.png
similarity index 100%
rename from graphics/pokemon/icons/unown_V_icon.png
rename to graphics/pokemon/unown/icon_v.png
diff --git a/graphics/pokemon/icons/unown_W_icon.png b/graphics/pokemon/unown/icon_w.png
similarity index 100%
rename from graphics/pokemon/icons/unown_W_icon.png
rename to graphics/pokemon/unown/icon_w.png
diff --git a/graphics/pokemon/icons/unown_X_icon.png b/graphics/pokemon/unown/icon_x.png
similarity index 100%
rename from graphics/pokemon/icons/unown_X_icon.png
rename to graphics/pokemon/unown/icon_x.png
diff --git a/graphics/pokemon/icons/unown_Y_icon.png b/graphics/pokemon/unown/icon_y.png
similarity index 100%
rename from graphics/pokemon/icons/unown_Y_icon.png
rename to graphics/pokemon/unown/icon_y.png
diff --git a/graphics/pokemon/icons/unown_Z_icon.png b/graphics/pokemon/unown/icon_z.png
similarity index 100%
rename from graphics/pokemon/icons/unown_Z_icon.png
rename to graphics/pokemon/unown/icon_z.png
diff --git a/graphics/pokemon/palettes/unown_palette.pal b/graphics/pokemon/unown/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/unown_palette.pal
rename to graphics/pokemon/unown/normal.pal
diff --git a/graphics/pokemon/palettes/unown_shiny_palette.pal b/graphics/pokemon/unown/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/unown_shiny_palette.pal
rename to graphics/pokemon/unown/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ursaring_front_pic.png b/graphics/pokemon/ursaring/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/ursaring_front_pic.png
rename to graphics/pokemon/ursaring/anim_front.png
diff --git a/graphics/pokemon/back_pics/ursaring_back_pic.png b/graphics/pokemon/ursaring/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/ursaring_back_pic.png
rename to graphics/pokemon/ursaring/back.png
diff --git a/graphics/pokemon/footprints/ursaring_footprint.png b/graphics/pokemon/ursaring/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/ursaring_footprint.png
rename to graphics/pokemon/ursaring/footprint.png
diff --git a/graphics/pokemon/front_pics/ursaring_still_front_pic.png b/graphics/pokemon/ursaring/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/ursaring_still_front_pic.png
rename to graphics/pokemon/ursaring/front.png
diff --git a/graphics/pokemon/icons/ursaring_icon.png b/graphics/pokemon/ursaring/icon.png
similarity index 100%
rename from graphics/pokemon/icons/ursaring_icon.png
rename to graphics/pokemon/ursaring/icon.png
diff --git a/graphics/pokemon/palettes/ursaring_palette.pal b/graphics/pokemon/ursaring/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/ursaring_palette.pal
rename to graphics/pokemon/ursaring/normal.pal
diff --git a/graphics/pokemon/palettes/ursaring_shiny_palette.pal b/graphics/pokemon/ursaring/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/ursaring_shiny_palette.pal
rename to graphics/pokemon/ursaring/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vaporeon_front_pic.png b/graphics/pokemon/vaporeon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/vaporeon_front_pic.png
rename to graphics/pokemon/vaporeon/anim_front.png
diff --git a/graphics/pokemon/back_pics/vaporeon_back_pic.png b/graphics/pokemon/vaporeon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/vaporeon_back_pic.png
rename to graphics/pokemon/vaporeon/back.png
diff --git a/graphics/pokemon/footprints/vaporeon_footprint.png b/graphics/pokemon/vaporeon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/vaporeon_footprint.png
rename to graphics/pokemon/vaporeon/footprint.png
diff --git a/graphics/pokemon/front_pics/vaporeon_still_front_pic.png b/graphics/pokemon/vaporeon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/vaporeon_still_front_pic.png
rename to graphics/pokemon/vaporeon/front.png
diff --git a/graphics/pokemon/icons/vaporeon_icon.png b/graphics/pokemon/vaporeon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/vaporeon_icon.png
rename to graphics/pokemon/vaporeon/icon.png
diff --git a/graphics/pokemon/palettes/vaporeon_palette.pal b/graphics/pokemon/vaporeon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/vaporeon_palette.pal
rename to graphics/pokemon/vaporeon/normal.pal
diff --git a/graphics/pokemon/palettes/vaporeon_shiny_palette.pal b/graphics/pokemon/vaporeon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/vaporeon_shiny_palette.pal
rename to graphics/pokemon/vaporeon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/venomoth_front_pic.png b/graphics/pokemon/venomoth/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/venomoth_front_pic.png
rename to graphics/pokemon/venomoth/anim_front.png
diff --git a/graphics/pokemon/back_pics/venomoth_back_pic.png b/graphics/pokemon/venomoth/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/venomoth_back_pic.png
rename to graphics/pokemon/venomoth/back.png
diff --git a/graphics/pokemon/footprints/venomoth_footprint.png b/graphics/pokemon/venomoth/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/venomoth_footprint.png
rename to graphics/pokemon/venomoth/footprint.png
diff --git a/graphics/pokemon/front_pics/venomoth_still_front_pic.png b/graphics/pokemon/venomoth/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/venomoth_still_front_pic.png
rename to graphics/pokemon/venomoth/front.png
diff --git a/graphics/pokemon/icons/venomoth_icon.png b/graphics/pokemon/venomoth/icon.png
similarity index 100%
rename from graphics/pokemon/icons/venomoth_icon.png
rename to graphics/pokemon/venomoth/icon.png
diff --git a/graphics/pokemon/palettes/venomoth_palette.pal b/graphics/pokemon/venomoth/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/venomoth_palette.pal
rename to graphics/pokemon/venomoth/normal.pal
diff --git a/graphics/pokemon/palettes/venomoth_shiny_palette.pal b/graphics/pokemon/venomoth/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/venomoth_shiny_palette.pal
rename to graphics/pokemon/venomoth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/venonat_front_pic.png b/graphics/pokemon/venonat/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/venonat_front_pic.png
rename to graphics/pokemon/venonat/anim_front.png
diff --git a/graphics/pokemon/back_pics/venonat_back_pic.png b/graphics/pokemon/venonat/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/venonat_back_pic.png
rename to graphics/pokemon/venonat/back.png
diff --git a/graphics/pokemon/footprints/venonat_footprint.png b/graphics/pokemon/venonat/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/venonat_footprint.png
rename to graphics/pokemon/venonat/footprint.png
diff --git a/graphics/pokemon/front_pics/venonat_still_front_pic.png b/graphics/pokemon/venonat/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/venonat_still_front_pic.png
rename to graphics/pokemon/venonat/front.png
diff --git a/graphics/pokemon/icons/venonat_icon.png b/graphics/pokemon/venonat/icon.png
similarity index 100%
rename from graphics/pokemon/icons/venonat_icon.png
rename to graphics/pokemon/venonat/icon.png
diff --git a/graphics/pokemon/palettes/venonat_palette.pal b/graphics/pokemon/venonat/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/venonat_palette.pal
rename to graphics/pokemon/venonat/normal.pal
diff --git a/graphics/pokemon/palettes/venonat_shiny_palette.pal b/graphics/pokemon/venonat/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/venonat_shiny_palette.pal
rename to graphics/pokemon/venonat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/venusaur_front_pic.png b/graphics/pokemon/venusaur/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/venusaur_front_pic.png
rename to graphics/pokemon/venusaur/anim_front.png
diff --git a/graphics/pokemon/back_pics/venusaur_back_pic.png b/graphics/pokemon/venusaur/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/venusaur_back_pic.png
rename to graphics/pokemon/venusaur/back.png
diff --git a/graphics/pokemon/footprints/venusaur_footprint.png b/graphics/pokemon/venusaur/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/venusaur_footprint.png
rename to graphics/pokemon/venusaur/footprint.png
diff --git a/graphics/pokemon/front_pics/venusaur_still_front_pic.png b/graphics/pokemon/venusaur/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/venusaur_still_front_pic.png
rename to graphics/pokemon/venusaur/front.png
diff --git a/graphics/pokemon/icons/venusaur_icon.png b/graphics/pokemon/venusaur/icon.png
similarity index 100%
rename from graphics/pokemon/icons/venusaur_icon.png
rename to graphics/pokemon/venusaur/icon.png
diff --git a/graphics/pokemon/palettes/venusaur_palette.pal b/graphics/pokemon/venusaur/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/venusaur_palette.pal
rename to graphics/pokemon/venusaur/normal.pal
diff --git a/graphics/pokemon/palettes/venusaur_shiny_palette.pal b/graphics/pokemon/venusaur/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/venusaur_shiny_palette.pal
rename to graphics/pokemon/venusaur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vibrava_front_pic.png b/graphics/pokemon/vibrava/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/vibrava_front_pic.png
rename to graphics/pokemon/vibrava/anim_front.png
diff --git a/graphics/pokemon/back_pics/vibrava_back_pic.png b/graphics/pokemon/vibrava/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/vibrava_back_pic.png
rename to graphics/pokemon/vibrava/back.png
diff --git a/graphics/pokemon/footprints/vibrava_footprint.png b/graphics/pokemon/vibrava/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/vibrava_footprint.png
rename to graphics/pokemon/vibrava/footprint.png
diff --git a/graphics/pokemon/front_pics/vibrava_still_front_pic.png b/graphics/pokemon/vibrava/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/vibrava_still_front_pic.png
rename to graphics/pokemon/vibrava/front.png
diff --git a/graphics/pokemon/icons/vibrava_icon.png b/graphics/pokemon/vibrava/icon.png
similarity index 100%
rename from graphics/pokemon/icons/vibrava_icon.png
rename to graphics/pokemon/vibrava/icon.png
diff --git a/graphics/pokemon/palettes/vibrava_palette.pal b/graphics/pokemon/vibrava/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/vibrava_palette.pal
rename to graphics/pokemon/vibrava/normal.pal
diff --git a/graphics/pokemon/palettes/vibrava_shiny_palette.pal b/graphics/pokemon/vibrava/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/vibrava_shiny_palette.pal
rename to graphics/pokemon/vibrava/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/victreebel_front_pic.png b/graphics/pokemon/victreebel/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/victreebel_front_pic.png
rename to graphics/pokemon/victreebel/anim_front.png
diff --git a/graphics/pokemon/back_pics/victreebel_back_pic.png b/graphics/pokemon/victreebel/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/victreebel_back_pic.png
rename to graphics/pokemon/victreebel/back.png
diff --git a/graphics/pokemon/footprints/victreebel_footprint.png b/graphics/pokemon/victreebel/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/victreebel_footprint.png
rename to graphics/pokemon/victreebel/footprint.png
diff --git a/graphics/pokemon/front_pics/victreebel_still_front_pic.png b/graphics/pokemon/victreebel/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/victreebel_still_front_pic.png
rename to graphics/pokemon/victreebel/front.png
diff --git a/graphics/pokemon/icons/victreebel_icon.png b/graphics/pokemon/victreebel/icon.png
similarity index 100%
rename from graphics/pokemon/icons/victreebel_icon.png
rename to graphics/pokemon/victreebel/icon.png
diff --git a/graphics/pokemon/palettes/victreebel_palette.pal b/graphics/pokemon/victreebel/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/victreebel_palette.pal
rename to graphics/pokemon/victreebel/normal.pal
diff --git a/graphics/pokemon/palettes/victreebel_shiny_palette.pal b/graphics/pokemon/victreebel/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/victreebel_shiny_palette.pal
rename to graphics/pokemon/victreebel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vigoroth_front_pic.png b/graphics/pokemon/vigoroth/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/vigoroth_front_pic.png
rename to graphics/pokemon/vigoroth/anim_front.png
diff --git a/graphics/pokemon/back_pics/vigoroth_back_pic.png b/graphics/pokemon/vigoroth/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/vigoroth_back_pic.png
rename to graphics/pokemon/vigoroth/back.png
diff --git a/graphics/pokemon/footprints/vigoroth_footprint.png b/graphics/pokemon/vigoroth/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/vigoroth_footprint.png
rename to graphics/pokemon/vigoroth/footprint.png
diff --git a/graphics/pokemon/front_pics/vigoroth_still_front_pic.png b/graphics/pokemon/vigoroth/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/vigoroth_still_front_pic.png
rename to graphics/pokemon/vigoroth/front.png
diff --git a/graphics/pokemon/icons/vigoroth_icon.png b/graphics/pokemon/vigoroth/icon.png
similarity index 100%
rename from graphics/pokemon/icons/vigoroth_icon.png
rename to graphics/pokemon/vigoroth/icon.png
diff --git a/graphics/pokemon/palettes/vigoroth_palette.pal b/graphics/pokemon/vigoroth/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/vigoroth_palette.pal
rename to graphics/pokemon/vigoroth/normal.pal
diff --git a/graphics/pokemon/palettes/vigoroth_shiny_palette.pal b/graphics/pokemon/vigoroth/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/vigoroth_shiny_palette.pal
rename to graphics/pokemon/vigoroth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vileplume_front_pic.png b/graphics/pokemon/vileplume/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/vileplume_front_pic.png
rename to graphics/pokemon/vileplume/anim_front.png
diff --git a/graphics/pokemon/back_pics/vileplume_back_pic.png b/graphics/pokemon/vileplume/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/vileplume_back_pic.png
rename to graphics/pokemon/vileplume/back.png
diff --git a/graphics/pokemon/footprints/vileplume_footprint.png b/graphics/pokemon/vileplume/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/vileplume_footprint.png
rename to graphics/pokemon/vileplume/footprint.png
diff --git a/graphics/pokemon/front_pics/vileplume_still_front_pic.png b/graphics/pokemon/vileplume/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/vileplume_still_front_pic.png
rename to graphics/pokemon/vileplume/front.png
diff --git a/graphics/pokemon/icons/vileplume_icon.png b/graphics/pokemon/vileplume/icon.png
similarity index 100%
rename from graphics/pokemon/icons/vileplume_icon.png
rename to graphics/pokemon/vileplume/icon.png
diff --git a/graphics/pokemon/palettes/vileplume_palette.pal b/graphics/pokemon/vileplume/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/vileplume_palette.pal
rename to graphics/pokemon/vileplume/normal.pal
diff --git a/graphics/pokemon/palettes/vileplume_shiny_palette.pal b/graphics/pokemon/vileplume/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/vileplume_shiny_palette.pal
rename to graphics/pokemon/vileplume/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/volbeat_front_pic.png b/graphics/pokemon/volbeat/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/volbeat_front_pic.png
rename to graphics/pokemon/volbeat/anim_front.png
diff --git a/graphics/pokemon/back_pics/volbeat_back_pic.png b/graphics/pokemon/volbeat/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/volbeat_back_pic.png
rename to graphics/pokemon/volbeat/back.png
diff --git a/graphics/pokemon/footprints/volbeat_footprint.png b/graphics/pokemon/volbeat/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/volbeat_footprint.png
rename to graphics/pokemon/volbeat/footprint.png
diff --git a/graphics/pokemon/front_pics/volbeat_still_front_pic.png b/graphics/pokemon/volbeat/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/volbeat_still_front_pic.png
rename to graphics/pokemon/volbeat/front.png
diff --git a/graphics/pokemon/icons/volbeat_icon.png b/graphics/pokemon/volbeat/icon.png
similarity index 100%
rename from graphics/pokemon/icons/volbeat_icon.png
rename to graphics/pokemon/volbeat/icon.png
diff --git a/graphics/pokemon/palettes/volbeat_palette.pal b/graphics/pokemon/volbeat/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/volbeat_palette.pal
rename to graphics/pokemon/volbeat/normal.pal
diff --git a/graphics/pokemon/palettes/volbeat_shiny_palette.pal b/graphics/pokemon/volbeat/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/volbeat_shiny_palette.pal
rename to graphics/pokemon/volbeat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/voltorb_front_pic.png b/graphics/pokemon/voltorb/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/voltorb_front_pic.png
rename to graphics/pokemon/voltorb/anim_front.png
diff --git a/graphics/pokemon/back_pics/voltorb_back_pic.png b/graphics/pokemon/voltorb/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/voltorb_back_pic.png
rename to graphics/pokemon/voltorb/back.png
diff --git a/graphics/pokemon/footprints/voltorb_footprint.png b/graphics/pokemon/voltorb/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/voltorb_footprint.png
rename to graphics/pokemon/voltorb/footprint.png
diff --git a/graphics/pokemon/front_pics/voltorb_still_front_pic.png b/graphics/pokemon/voltorb/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/voltorb_still_front_pic.png
rename to graphics/pokemon/voltorb/front.png
diff --git a/graphics/pokemon/icons/voltorb_icon.png b/graphics/pokemon/voltorb/icon.png
similarity index 100%
rename from graphics/pokemon/icons/voltorb_icon.png
rename to graphics/pokemon/voltorb/icon.png
diff --git a/graphics/pokemon/palettes/voltorb_palette.pal b/graphics/pokemon/voltorb/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/voltorb_palette.pal
rename to graphics/pokemon/voltorb/normal.pal
diff --git a/graphics/pokemon/palettes/voltorb_shiny_palette.pal b/graphics/pokemon/voltorb/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/voltorb_shiny_palette.pal
rename to graphics/pokemon/voltorb/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vulpix_front_pic.png b/graphics/pokemon/vulpix/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/vulpix_front_pic.png
rename to graphics/pokemon/vulpix/anim_front.png
diff --git a/graphics/pokemon/back_pics/vulpix_back_pic.png b/graphics/pokemon/vulpix/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/vulpix_back_pic.png
rename to graphics/pokemon/vulpix/back.png
diff --git a/graphics/pokemon/footprints/vulpix_footprint.png b/graphics/pokemon/vulpix/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/vulpix_footprint.png
rename to graphics/pokemon/vulpix/footprint.png
diff --git a/graphics/pokemon/front_pics/vulpix_still_front_pic.png b/graphics/pokemon/vulpix/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/vulpix_still_front_pic.png
rename to graphics/pokemon/vulpix/front.png
diff --git a/graphics/pokemon/icons/vulpix_icon.png b/graphics/pokemon/vulpix/icon.png
similarity index 100%
rename from graphics/pokemon/icons/vulpix_icon.png
rename to graphics/pokemon/vulpix/icon.png
diff --git a/graphics/pokemon/palettes/vulpix_palette.pal b/graphics/pokemon/vulpix/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/vulpix_palette.pal
rename to graphics/pokemon/vulpix/normal.pal
diff --git a/graphics/pokemon/palettes/vulpix_shiny_palette.pal b/graphics/pokemon/vulpix/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/vulpix_shiny_palette.pal
rename to graphics/pokemon/vulpix/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wailmer_front_pic.png b/graphics/pokemon/wailmer/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wailmer_front_pic.png
rename to graphics/pokemon/wailmer/anim_front.png
diff --git a/graphics/pokemon/back_pics/wailmer_back_pic.png b/graphics/pokemon/wailmer/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wailmer_back_pic.png
rename to graphics/pokemon/wailmer/back.png
diff --git a/graphics/pokemon/footprints/wailmer_footprint.png b/graphics/pokemon/wailmer/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wailmer_footprint.png
rename to graphics/pokemon/wailmer/footprint.png
diff --git a/graphics/pokemon/front_pics/wailmer_still_front_pic.png b/graphics/pokemon/wailmer/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wailmer_still_front_pic.png
rename to graphics/pokemon/wailmer/front.png
diff --git a/graphics/pokemon/icons/wailmer_icon.png b/graphics/pokemon/wailmer/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wailmer_icon.png
rename to graphics/pokemon/wailmer/icon.png
diff --git a/graphics/pokemon/palettes/wailmer_palette.pal b/graphics/pokemon/wailmer/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wailmer_palette.pal
rename to graphics/pokemon/wailmer/normal.pal
diff --git a/graphics/pokemon/palettes/wailmer_shiny_palette.pal b/graphics/pokemon/wailmer/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wailmer_shiny_palette.pal
rename to graphics/pokemon/wailmer/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wailord_front_pic.png b/graphics/pokemon/wailord/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wailord_front_pic.png
rename to graphics/pokemon/wailord/anim_front.png
diff --git a/graphics/pokemon/back_pics/wailord_back_pic.png b/graphics/pokemon/wailord/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wailord_back_pic.png
rename to graphics/pokemon/wailord/back.png
diff --git a/graphics/pokemon/footprints/wailord_footprint.png b/graphics/pokemon/wailord/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wailord_footprint.png
rename to graphics/pokemon/wailord/footprint.png
diff --git a/graphics/pokemon/front_pics/wailord_still_front_pic.png b/graphics/pokemon/wailord/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wailord_still_front_pic.png
rename to graphics/pokemon/wailord/front.png
diff --git a/graphics/pokemon/icons/wailord_icon.png b/graphics/pokemon/wailord/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wailord_icon.png
rename to graphics/pokemon/wailord/icon.png
diff --git a/graphics/pokemon/palettes/wailord_palette.pal b/graphics/pokemon/wailord/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wailord_palette.pal
rename to graphics/pokemon/wailord/normal.pal
diff --git a/graphics/pokemon/palettes/wailord_shiny_palette.pal b/graphics/pokemon/wailord/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wailord_shiny_palette.pal
rename to graphics/pokemon/wailord/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/walrein_front_pic.png b/graphics/pokemon/walrein/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/walrein_front_pic.png
rename to graphics/pokemon/walrein/anim_front.png
diff --git a/graphics/pokemon/back_pics/walrein_back_pic.png b/graphics/pokemon/walrein/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/walrein_back_pic.png
rename to graphics/pokemon/walrein/back.png
diff --git a/graphics/pokemon/footprints/walrein_footprint.png b/graphics/pokemon/walrein/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/walrein_footprint.png
rename to graphics/pokemon/walrein/footprint.png
diff --git a/graphics/pokemon/front_pics/walrein_still_front_pic.png b/graphics/pokemon/walrein/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/walrein_still_front_pic.png
rename to graphics/pokemon/walrein/front.png
diff --git a/graphics/pokemon/icons/walrein_icon.png b/graphics/pokemon/walrein/icon.png
similarity index 100%
rename from graphics/pokemon/icons/walrein_icon.png
rename to graphics/pokemon/walrein/icon.png
diff --git a/graphics/pokemon/palettes/walrein_palette.pal b/graphics/pokemon/walrein/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/walrein_palette.pal
rename to graphics/pokemon/walrein/normal.pal
diff --git a/graphics/pokemon/palettes/walrein_shiny_palette.pal b/graphics/pokemon/walrein/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/walrein_shiny_palette.pal
rename to graphics/pokemon/walrein/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wartortle_front_pic.png b/graphics/pokemon/wartortle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wartortle_front_pic.png
rename to graphics/pokemon/wartortle/anim_front.png
diff --git a/graphics/pokemon/back_pics/wartortle_back_pic.png b/graphics/pokemon/wartortle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wartortle_back_pic.png
rename to graphics/pokemon/wartortle/back.png
diff --git a/graphics/pokemon/footprints/wartortle_footprint.png b/graphics/pokemon/wartortle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wartortle_footprint.png
rename to graphics/pokemon/wartortle/footprint.png
diff --git a/graphics/pokemon/front_pics/wartortle_still_front_pic.png b/graphics/pokemon/wartortle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wartortle_still_front_pic.png
rename to graphics/pokemon/wartortle/front.png
diff --git a/graphics/pokemon/icons/wartortle_icon.png b/graphics/pokemon/wartortle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wartortle_icon.png
rename to graphics/pokemon/wartortle/icon.png
diff --git a/graphics/pokemon/palettes/wartortle_palette.pal b/graphics/pokemon/wartortle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wartortle_palette.pal
rename to graphics/pokemon/wartortle/normal.pal
diff --git a/graphics/pokemon/palettes/wartortle_shiny_palette.pal b/graphics/pokemon/wartortle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wartortle_shiny_palette.pal
rename to graphics/pokemon/wartortle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/weedle_front_pic.png b/graphics/pokemon/weedle/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/weedle_front_pic.png
rename to graphics/pokemon/weedle/anim_front.png
diff --git a/graphics/pokemon/back_pics/weedle_back_pic.png b/graphics/pokemon/weedle/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/weedle_back_pic.png
rename to graphics/pokemon/weedle/back.png
diff --git a/graphics/pokemon/footprints/weedle_footprint.png b/graphics/pokemon/weedle/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/weedle_footprint.png
rename to graphics/pokemon/weedle/footprint.png
diff --git a/graphics/pokemon/front_pics/weedle_still_front_pic.png b/graphics/pokemon/weedle/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/weedle_still_front_pic.png
rename to graphics/pokemon/weedle/front.png
diff --git a/graphics/pokemon/icons/weedle_icon.png b/graphics/pokemon/weedle/icon.png
similarity index 100%
rename from graphics/pokemon/icons/weedle_icon.png
rename to graphics/pokemon/weedle/icon.png
diff --git a/graphics/pokemon/palettes/weedle_palette.pal b/graphics/pokemon/weedle/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/weedle_palette.pal
rename to graphics/pokemon/weedle/normal.pal
diff --git a/graphics/pokemon/palettes/weedle_shiny_palette.pal b/graphics/pokemon/weedle/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/weedle_shiny_palette.pal
rename to graphics/pokemon/weedle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/weepinbell_front_pic.png b/graphics/pokemon/weepinbell/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/weepinbell_front_pic.png
rename to graphics/pokemon/weepinbell/anim_front.png
diff --git a/graphics/pokemon/back_pics/weepinbell_back_pic.png b/graphics/pokemon/weepinbell/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/weepinbell_back_pic.png
rename to graphics/pokemon/weepinbell/back.png
diff --git a/graphics/pokemon/footprints/weepinbell_footprint.png b/graphics/pokemon/weepinbell/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/weepinbell_footprint.png
rename to graphics/pokemon/weepinbell/footprint.png
diff --git a/graphics/pokemon/front_pics/weepinbell_still_front_pic.png b/graphics/pokemon/weepinbell/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/weepinbell_still_front_pic.png
rename to graphics/pokemon/weepinbell/front.png
diff --git a/graphics/pokemon/icons/weepinbell_icon.png b/graphics/pokemon/weepinbell/icon.png
similarity index 100%
rename from graphics/pokemon/icons/weepinbell_icon.png
rename to graphics/pokemon/weepinbell/icon.png
diff --git a/graphics/pokemon/palettes/weepinbell_palette.pal b/graphics/pokemon/weepinbell/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/weepinbell_palette.pal
rename to graphics/pokemon/weepinbell/normal.pal
diff --git a/graphics/pokemon/palettes/weepinbell_shiny_palette.pal b/graphics/pokemon/weepinbell/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/weepinbell_shiny_palette.pal
rename to graphics/pokemon/weepinbell/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/weezing_front_pic.png b/graphics/pokemon/weezing/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/weezing_front_pic.png
rename to graphics/pokemon/weezing/anim_front.png
diff --git a/graphics/pokemon/back_pics/weezing_back_pic.png b/graphics/pokemon/weezing/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/weezing_back_pic.png
rename to graphics/pokemon/weezing/back.png
diff --git a/graphics/pokemon/footprints/weezing_footprint.png b/graphics/pokemon/weezing/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/weezing_footprint.png
rename to graphics/pokemon/weezing/footprint.png
diff --git a/graphics/pokemon/front_pics/weezing_still_front_pic.png b/graphics/pokemon/weezing/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/weezing_still_front_pic.png
rename to graphics/pokemon/weezing/front.png
diff --git a/graphics/pokemon/icons/weezing_icon.png b/graphics/pokemon/weezing/icon.png
similarity index 100%
rename from graphics/pokemon/icons/weezing_icon.png
rename to graphics/pokemon/weezing/icon.png
diff --git a/graphics/pokemon/palettes/weezing_palette.pal b/graphics/pokemon/weezing/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/weezing_palette.pal
rename to graphics/pokemon/weezing/normal.pal
diff --git a/graphics/pokemon/palettes/weezing_shiny_palette.pal b/graphics/pokemon/weezing/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/weezing_shiny_palette.pal
rename to graphics/pokemon/weezing/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/whiscash_front_pic.png b/graphics/pokemon/whiscash/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/whiscash_front_pic.png
rename to graphics/pokemon/whiscash/anim_front.png
diff --git a/graphics/pokemon/back_pics/whiscash_back_pic.png b/graphics/pokemon/whiscash/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/whiscash_back_pic.png
rename to graphics/pokemon/whiscash/back.png
diff --git a/graphics/pokemon/footprints/whiscash_footprint.png b/graphics/pokemon/whiscash/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/whiscash_footprint.png
rename to graphics/pokemon/whiscash/footprint.png
diff --git a/graphics/pokemon/front_pics/whiscash_still_front_pic.png b/graphics/pokemon/whiscash/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/whiscash_still_front_pic.png
rename to graphics/pokemon/whiscash/front.png
diff --git a/graphics/pokemon/icons/whiscash_icon.png b/graphics/pokemon/whiscash/icon.png
similarity index 100%
rename from graphics/pokemon/icons/whiscash_icon.png
rename to graphics/pokemon/whiscash/icon.png
diff --git a/graphics/pokemon/palettes/whiscash_palette.pal b/graphics/pokemon/whiscash/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/whiscash_palette.pal
rename to graphics/pokemon/whiscash/normal.pal
diff --git a/graphics/pokemon/palettes/whiscash_shiny_palette.pal b/graphics/pokemon/whiscash/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/whiscash_shiny_palette.pal
rename to graphics/pokemon/whiscash/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/whismur_front_pic.png b/graphics/pokemon/whismur/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/whismur_front_pic.png
rename to graphics/pokemon/whismur/anim_front.png
diff --git a/graphics/pokemon/back_pics/whismur_back_pic.png b/graphics/pokemon/whismur/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/whismur_back_pic.png
rename to graphics/pokemon/whismur/back.png
diff --git a/graphics/pokemon/footprints/whismur_footprint.png b/graphics/pokemon/whismur/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/whismur_footprint.png
rename to graphics/pokemon/whismur/footprint.png
diff --git a/graphics/pokemon/front_pics/whismur_still_front_pic.png b/graphics/pokemon/whismur/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/whismur_still_front_pic.png
rename to graphics/pokemon/whismur/front.png
diff --git a/graphics/pokemon/icons/whismur_icon.png b/graphics/pokemon/whismur/icon.png
similarity index 100%
rename from graphics/pokemon/icons/whismur_icon.png
rename to graphics/pokemon/whismur/icon.png
diff --git a/graphics/pokemon/palettes/whismur_palette.pal b/graphics/pokemon/whismur/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/whismur_palette.pal
rename to graphics/pokemon/whismur/normal.pal
diff --git a/graphics/pokemon/palettes/whismur_shiny_palette.pal b/graphics/pokemon/whismur/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/whismur_shiny_palette.pal
rename to graphics/pokemon/whismur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wigglytuff_front_pic.png b/graphics/pokemon/wigglytuff/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wigglytuff_front_pic.png
rename to graphics/pokemon/wigglytuff/anim_front.png
diff --git a/graphics/pokemon/back_pics/wigglytuff_back_pic.png b/graphics/pokemon/wigglytuff/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wigglytuff_back_pic.png
rename to graphics/pokemon/wigglytuff/back.png
diff --git a/graphics/pokemon/footprints/wigglytuff_footprint.png b/graphics/pokemon/wigglytuff/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wigglytuff_footprint.png
rename to graphics/pokemon/wigglytuff/footprint.png
diff --git a/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png b/graphics/pokemon/wigglytuff/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wigglytuff_still_front_pic.png
rename to graphics/pokemon/wigglytuff/front.png
diff --git a/graphics/pokemon/icons/wigglytuff_icon.png b/graphics/pokemon/wigglytuff/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wigglytuff_icon.png
rename to graphics/pokemon/wigglytuff/icon.png
diff --git a/graphics/pokemon/palettes/wigglytuff_palette.pal b/graphics/pokemon/wigglytuff/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wigglytuff_palette.pal
rename to graphics/pokemon/wigglytuff/normal.pal
diff --git a/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal b/graphics/pokemon/wigglytuff/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wigglytuff_shiny_palette.pal
rename to graphics/pokemon/wigglytuff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wingull_front_pic.png b/graphics/pokemon/wingull/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wingull_front_pic.png
rename to graphics/pokemon/wingull/anim_front.png
diff --git a/graphics/pokemon/back_pics/wingull_back_pic.png b/graphics/pokemon/wingull/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wingull_back_pic.png
rename to graphics/pokemon/wingull/back.png
diff --git a/graphics/pokemon/footprints/wingull_footprint.png b/graphics/pokemon/wingull/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wingull_footprint.png
rename to graphics/pokemon/wingull/footprint.png
diff --git a/graphics/pokemon/front_pics/wingull_still_front_pic.png b/graphics/pokemon/wingull/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wingull_still_front_pic.png
rename to graphics/pokemon/wingull/front.png
diff --git a/graphics/pokemon/icons/wingull_icon.png b/graphics/pokemon/wingull/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wingull_icon.png
rename to graphics/pokemon/wingull/icon.png
diff --git a/graphics/pokemon/palettes/wingull_palette.pal b/graphics/pokemon/wingull/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wingull_palette.pal
rename to graphics/pokemon/wingull/normal.pal
diff --git a/graphics/pokemon/palettes/wingull_shiny_palette.pal b/graphics/pokemon/wingull/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wingull_shiny_palette.pal
rename to graphics/pokemon/wingull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wobbuffet_front_pic.png b/graphics/pokemon/wobbuffet/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wobbuffet_front_pic.png
rename to graphics/pokemon/wobbuffet/anim_front.png
diff --git a/graphics/pokemon/back_pics/wobbuffet_back_pic.png b/graphics/pokemon/wobbuffet/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wobbuffet_back_pic.png
rename to graphics/pokemon/wobbuffet/back.png
diff --git a/graphics/pokemon/footprints/wobbuffet_footprint.png b/graphics/pokemon/wobbuffet/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wobbuffet_footprint.png
rename to graphics/pokemon/wobbuffet/footprint.png
diff --git a/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png b/graphics/pokemon/wobbuffet/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wobbuffet_still_front_pic.png
rename to graphics/pokemon/wobbuffet/front.png
diff --git a/graphics/pokemon/icons/wobbuffet_icon.png b/graphics/pokemon/wobbuffet/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wobbuffet_icon.png
rename to graphics/pokemon/wobbuffet/icon.png
diff --git a/graphics/pokemon/palettes/wobbuffet_palette.pal b/graphics/pokemon/wobbuffet/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wobbuffet_palette.pal
rename to graphics/pokemon/wobbuffet/normal.pal
diff --git a/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal b/graphics/pokemon/wobbuffet/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wobbuffet_shiny_palette.pal
rename to graphics/pokemon/wobbuffet/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wooper_front_pic.png b/graphics/pokemon/wooper/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wooper_front_pic.png
rename to graphics/pokemon/wooper/anim_front.png
diff --git a/graphics/pokemon/back_pics/wooper_back_pic.png b/graphics/pokemon/wooper/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wooper_back_pic.png
rename to graphics/pokemon/wooper/back.png
diff --git a/graphics/pokemon/footprints/wooper_footprint.png b/graphics/pokemon/wooper/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wooper_footprint.png
rename to graphics/pokemon/wooper/footprint.png
diff --git a/graphics/pokemon/front_pics/wooper_still_front_pic.png b/graphics/pokemon/wooper/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wooper_still_front_pic.png
rename to graphics/pokemon/wooper/front.png
diff --git a/graphics/pokemon/icons/wooper_icon.png b/graphics/pokemon/wooper/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wooper_icon.png
rename to graphics/pokemon/wooper/icon.png
diff --git a/graphics/pokemon/palettes/wooper_palette.pal b/graphics/pokemon/wooper/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wooper_palette.pal
rename to graphics/pokemon/wooper/normal.pal
diff --git a/graphics/pokemon/palettes/wooper_shiny_palette.pal b/graphics/pokemon/wooper/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wooper_shiny_palette.pal
rename to graphics/pokemon/wooper/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wurmple_front_pic.png b/graphics/pokemon/wurmple/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wurmple_front_pic.png
rename to graphics/pokemon/wurmple/anim_front.png
diff --git a/graphics/pokemon/back_pics/wurmple_back_pic.png b/graphics/pokemon/wurmple/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wurmple_back_pic.png
rename to graphics/pokemon/wurmple/back.png
diff --git a/graphics/pokemon/footprints/wurmple_footprint.png b/graphics/pokemon/wurmple/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wurmple_footprint.png
rename to graphics/pokemon/wurmple/footprint.png
diff --git a/graphics/pokemon/front_pics/wurmple_still_front_pic.png b/graphics/pokemon/wurmple/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wurmple_still_front_pic.png
rename to graphics/pokemon/wurmple/front.png
diff --git a/graphics/pokemon/icons/wurmple_icon.png b/graphics/pokemon/wurmple/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wurmple_icon.png
rename to graphics/pokemon/wurmple/icon.png
diff --git a/graphics/pokemon/palettes/wurmple_palette.pal b/graphics/pokemon/wurmple/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wurmple_palette.pal
rename to graphics/pokemon/wurmple/normal.pal
diff --git a/graphics/pokemon/palettes/wurmple_shiny_palette.pal b/graphics/pokemon/wurmple/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wurmple_shiny_palette.pal
rename to graphics/pokemon/wurmple/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wynaut_front_pic.png b/graphics/pokemon/wynaut/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/wynaut_front_pic.png
rename to graphics/pokemon/wynaut/anim_front.png
diff --git a/graphics/pokemon/back_pics/wynaut_back_pic.png b/graphics/pokemon/wynaut/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/wynaut_back_pic.png
rename to graphics/pokemon/wynaut/back.png
diff --git a/graphics/pokemon/footprints/wynaut_footprint.png b/graphics/pokemon/wynaut/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/wynaut_footprint.png
rename to graphics/pokemon/wynaut/footprint.png
diff --git a/graphics/pokemon/front_pics/wynaut_still_front_pic.png b/graphics/pokemon/wynaut/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/wynaut_still_front_pic.png
rename to graphics/pokemon/wynaut/front.png
diff --git a/graphics/pokemon/icons/wynaut_icon.png b/graphics/pokemon/wynaut/icon.png
similarity index 100%
rename from graphics/pokemon/icons/wynaut_icon.png
rename to graphics/pokemon/wynaut/icon.png
diff --git a/graphics/pokemon/palettes/wynaut_palette.pal b/graphics/pokemon/wynaut/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/wynaut_palette.pal
rename to graphics/pokemon/wynaut/normal.pal
diff --git a/graphics/pokemon/palettes/wynaut_shiny_palette.pal b/graphics/pokemon/wynaut/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/wynaut_shiny_palette.pal
rename to graphics/pokemon/wynaut/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/xatu_front_pic.png b/graphics/pokemon/xatu/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/xatu_front_pic.png
rename to graphics/pokemon/xatu/anim_front.png
diff --git a/graphics/pokemon/back_pics/xatu_back_pic.png b/graphics/pokemon/xatu/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/xatu_back_pic.png
rename to graphics/pokemon/xatu/back.png
diff --git a/graphics/pokemon/footprints/xatu_footprint.png b/graphics/pokemon/xatu/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/xatu_footprint.png
rename to graphics/pokemon/xatu/footprint.png
diff --git a/graphics/pokemon/front_pics/xatu_still_front_pic.png b/graphics/pokemon/xatu/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/xatu_still_front_pic.png
rename to graphics/pokemon/xatu/front.png
diff --git a/graphics/pokemon/icons/xatu_icon.png b/graphics/pokemon/xatu/icon.png
similarity index 100%
rename from graphics/pokemon/icons/xatu_icon.png
rename to graphics/pokemon/xatu/icon.png
diff --git a/graphics/pokemon/palettes/xatu_palette.pal b/graphics/pokemon/xatu/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/xatu_palette.pal
rename to graphics/pokemon/xatu/normal.pal
diff --git a/graphics/pokemon/palettes/xatu_shiny_palette.pal b/graphics/pokemon/xatu/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/xatu_shiny_palette.pal
rename to graphics/pokemon/xatu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/yanma_front_pic.png b/graphics/pokemon/yanma/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/yanma_front_pic.png
rename to graphics/pokemon/yanma/anim_front.png
diff --git a/graphics/pokemon/back_pics/yanma_back_pic.png b/graphics/pokemon/yanma/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/yanma_back_pic.png
rename to graphics/pokemon/yanma/back.png
diff --git a/graphics/pokemon/footprints/yanma_footprint.png b/graphics/pokemon/yanma/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/yanma_footprint.png
rename to graphics/pokemon/yanma/footprint.png
diff --git a/graphics/pokemon/front_pics/yanma_still_front_pic.png b/graphics/pokemon/yanma/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/yanma_still_front_pic.png
rename to graphics/pokemon/yanma/front.png
diff --git a/graphics/pokemon/icons/yanma_icon.png b/graphics/pokemon/yanma/icon.png
similarity index 100%
rename from graphics/pokemon/icons/yanma_icon.png
rename to graphics/pokemon/yanma/icon.png
diff --git a/graphics/pokemon/palettes/yanma_palette.pal b/graphics/pokemon/yanma/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/yanma_palette.pal
rename to graphics/pokemon/yanma/normal.pal
diff --git a/graphics/pokemon/palettes/yanma_shiny_palette.pal b/graphics/pokemon/yanma/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/yanma_shiny_palette.pal
rename to graphics/pokemon/yanma/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zangoose_front_pic.png b/graphics/pokemon/zangoose/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/zangoose_front_pic.png
rename to graphics/pokemon/zangoose/anim_front.png
diff --git a/graphics/pokemon/back_pics/zangoose_back_pic.png b/graphics/pokemon/zangoose/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/zangoose_back_pic.png
rename to graphics/pokemon/zangoose/back.png
diff --git a/graphics/pokemon/footprints/zangoose_footprint.png b/graphics/pokemon/zangoose/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/zangoose_footprint.png
rename to graphics/pokemon/zangoose/footprint.png
diff --git a/graphics/pokemon/front_pics/zangoose_still_front_pic.png b/graphics/pokemon/zangoose/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/zangoose_still_front_pic.png
rename to graphics/pokemon/zangoose/front.png
diff --git a/graphics/pokemon/icons/zangoose_icon.png b/graphics/pokemon/zangoose/icon.png
similarity index 100%
rename from graphics/pokemon/icons/zangoose_icon.png
rename to graphics/pokemon/zangoose/icon.png
diff --git a/graphics/pokemon/palettes/zangoose_palette.pal b/graphics/pokemon/zangoose/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/zangoose_palette.pal
rename to graphics/pokemon/zangoose/normal.pal
diff --git a/graphics/pokemon/palettes/zangoose_shiny_palette.pal b/graphics/pokemon/zangoose/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/zangoose_shiny_palette.pal
rename to graphics/pokemon/zangoose/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zapdos_front_pic.png b/graphics/pokemon/zapdos/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/zapdos_front_pic.png
rename to graphics/pokemon/zapdos/anim_front.png
diff --git a/graphics/pokemon/back_pics/zapdos_back_pic.png b/graphics/pokemon/zapdos/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/zapdos_back_pic.png
rename to graphics/pokemon/zapdos/back.png
diff --git a/graphics/pokemon/footprints/zapdos_footprint.png b/graphics/pokemon/zapdos/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/zapdos_footprint.png
rename to graphics/pokemon/zapdos/footprint.png
diff --git a/graphics/pokemon/front_pics/zapdos_still_front_pic.png b/graphics/pokemon/zapdos/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/zapdos_still_front_pic.png
rename to graphics/pokemon/zapdos/front.png
diff --git a/graphics/pokemon/icons/zapdos_icon.png b/graphics/pokemon/zapdos/icon.png
similarity index 100%
rename from graphics/pokemon/icons/zapdos_icon.png
rename to graphics/pokemon/zapdos/icon.png
diff --git a/graphics/pokemon/palettes/zapdos_palette.pal b/graphics/pokemon/zapdos/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/zapdos_palette.pal
rename to graphics/pokemon/zapdos/normal.pal
diff --git a/graphics/pokemon/palettes/zapdos_shiny_palette.pal b/graphics/pokemon/zapdos/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/zapdos_shiny_palette.pal
rename to graphics/pokemon/zapdos/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zigzagoon_front_pic.png b/graphics/pokemon/zigzagoon/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/zigzagoon_front_pic.png
rename to graphics/pokemon/zigzagoon/anim_front.png
diff --git a/graphics/pokemon/back_pics/zigzagoon_back_pic.png b/graphics/pokemon/zigzagoon/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/zigzagoon_back_pic.png
rename to graphics/pokemon/zigzagoon/back.png
diff --git a/graphics/pokemon/footprints/zigzagoon_footprint.png b/graphics/pokemon/zigzagoon/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/zigzagoon_footprint.png
rename to graphics/pokemon/zigzagoon/footprint.png
diff --git a/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png b/graphics/pokemon/zigzagoon/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/zigzagoon_still_front_pic.png
rename to graphics/pokemon/zigzagoon/front.png
diff --git a/graphics/pokemon/icons/zigzagoon_icon.png b/graphics/pokemon/zigzagoon/icon.png
similarity index 100%
rename from graphics/pokemon/icons/zigzagoon_icon.png
rename to graphics/pokemon/zigzagoon/icon.png
diff --git a/graphics/pokemon/palettes/zigzagoon_palette.pal b/graphics/pokemon/zigzagoon/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/zigzagoon_palette.pal
rename to graphics/pokemon/zigzagoon/normal.pal
diff --git a/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal b/graphics/pokemon/zigzagoon/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/zigzagoon_shiny_palette.pal
rename to graphics/pokemon/zigzagoon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zubat_front_pic.png b/graphics/pokemon/zubat/anim_front.png
similarity index 100%
rename from graphics/pokemon/anim_front_pics/zubat_front_pic.png
rename to graphics/pokemon/zubat/anim_front.png
diff --git a/graphics/pokemon/back_pics/zubat_back_pic.png b/graphics/pokemon/zubat/back.png
similarity index 100%
rename from graphics/pokemon/back_pics/zubat_back_pic.png
rename to graphics/pokemon/zubat/back.png
diff --git a/graphics/pokemon/footprints/zubat_footprint.png b/graphics/pokemon/zubat/footprint.png
similarity index 100%
rename from graphics/pokemon/footprints/zubat_footprint.png
rename to graphics/pokemon/zubat/footprint.png
diff --git a/graphics/pokemon/front_pics/zubat_still_front_pic.png b/graphics/pokemon/zubat/front.png
similarity index 100%
rename from graphics/pokemon/front_pics/zubat_still_front_pic.png
rename to graphics/pokemon/zubat/front.png
diff --git a/graphics/pokemon/icons/zubat_icon.png b/graphics/pokemon/zubat/icon.png
similarity index 100%
rename from graphics/pokemon/icons/zubat_icon.png
rename to graphics/pokemon/zubat/icon.png
diff --git a/graphics/pokemon/palettes/zubat_palette.pal b/graphics/pokemon/zubat/normal.pal
similarity index 100%
rename from graphics/pokemon/palettes/zubat_palette.pal
rename to graphics/pokemon/zubat/normal.pal
diff --git a/graphics/pokemon/palettes/zubat_shiny_palette.pal b/graphics/pokemon/zubat/shiny.pal
similarity index 100%
rename from graphics/pokemon/palettes/zubat_shiny_palette.pal
rename to graphics/pokemon/zubat/shiny.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 0a22a711c..0516a8a4d 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -1,7 +1,4 @@
-MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics
-MONBACKGFXDIR := graphics/pokemon/back_pics
-MONFRONTGFXDIR := graphics/pokemon/anim_front_pics
-MONPALDIR := graphics/pokemon/palettes
+CASTFORMGFXDIR := graphics/pokemon/castform
 TILESETGFXDIR := data/tilesets
 FONTGFXDIR := data/graphics/fonts
 INTERFACEGFXDIR := graphics/interface
@@ -24,36 +21,44 @@ MISCGFXDIR := graphics/misc
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
 
-$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \
-												   $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
-												   $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
-												   $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
+
+
+### Castform ###
+
+$(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/front_normal_form.4bpp \
+							  $(CASTFORMGFXDIR)/front_sunny_form.4bpp \
+							  $(CASTFORMGFXDIR)/front_rainy_form.4bpp \
+							  $(CASTFORMGFXDIR)/front_snowy_form.4bpp
 	@cat $^ >$@
 
-$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \
-									  $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
-									  $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
-									  $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
+$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/back_normal_form.4bpp \
+							 $(CASTFORMGFXDIR)/back_sunny_form.4bpp \
+							 $(CASTFORMGFXDIR)/back_rainy_form.4bpp \
+							 $(CASTFORMGFXDIR)/back_snowy_form.4bpp
 	@cat $^ >$@
 
-$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \
-										$(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
-										$(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
-										$(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
+$(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/anim_front_normal_form.4bpp \
+								   $(CASTFORMGFXDIR)/anim_front_sunny_form.4bpp \
+								   $(CASTFORMGFXDIR)/anim_front_rainy_form.4bpp \
+								   $(CASTFORMGFXDIR)/anim_front_snowy_form.4bpp
 	@cat $^ >$@
 
-$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \
-									  $(MONPALDIR)/castform_sunny_form_palette.gbapal \
-									  $(MONPALDIR)/castform_rainy_form_palette.gbapal \
-									  $(MONPALDIR)/castform_snowy_form_palette.gbapal
+$(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal_normal_form.gbapal \
+								 $(CASTFORMGFXDIR)/normal_sunny_form.gbapal \
+								 $(CASTFORMGFXDIR)/normal_rainy_form.gbapal \
+								 $(CASTFORMGFXDIR)/normal_snowy_form.gbapal
 	@cat $^ >$@
 
-$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \
-											$(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
-											$(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
-											$(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
+$(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
+								$(CASTFORMGFXDIR)/shiny_sunny_form.gbapal \
+								$(CASTFORMGFXDIR)/shiny_rainy_form.gbapal \
+								$(CASTFORMGFXDIR)/shiny_snowy_form.gbapal
 	@cat $^ >$@
 
+
+
+### Tilesets ###
+
 $(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 159
 
@@ -246,6 +251,10 @@ $(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.pn
 $(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 509
 
+
+
+### Fonts ###
+
 $(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png
 	$(GFX) $< $@
 
@@ -297,6 +306,9 @@ $(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png
 $(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png
 	$(GFX) $< $@
 
+
+
+### Miscellaneous ###
 graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
@@ -310,13 +322,13 @@ $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
 
 $(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
-						$(BATINTGFXDIR)/textbox_1.gbapal
+								$(BATINTGFXDIR)/textbox_1.gbapal
 	@cat $^ >$@
 
 $(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
-						  $(BTLANMSPRGFXDIR)/010_1.4bpp \
-						  $(BTLANMSPRGFXDIR)/010_2.4bpp \
-						  $(BTLANMSPRGFXDIR)/010_3.4bpp
+						 	 $(BTLANMSPRGFXDIR)/010_1.4bpp \
+						 	 $(BTLANMSPRGFXDIR)/010_2.4bpp \
+						 	 $(BTLANMSPRGFXDIR)/010_3.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \
@@ -340,8 +352,8 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
 	@cat $^ >$@
 
 $(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \
-							$(INTERFACEGFXDIR)/numbers1.4bpp \
-							$(INTERFACEGFXDIR)/numbers2.4bpp
+									$(INTERFACEGFXDIR)/numbers1.4bpp \
+									$(INTERFACEGFXDIR)/numbers2.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
@@ -472,6 +484,10 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
 $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 822
 
+
+
+### PSS ###
+
 $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 55
 
@@ -636,7 +652,11 @@ $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
 	
 $(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 43
-	
+
+
+
+### Pokenav ###
+
 $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
 								$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
 								$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
diff --git a/src/anim_mon_front_pics.c b/src/anim_mon_front_pics.c
index f2480ea20..b566b7760 100644
--- a/src/anim_mon_front_pics.c
+++ b/src/anim_mon_front_pics.c
@@ -235,7 +235,7 @@ const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_f
 const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz");
-const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon2_front_pic.4bpp.lz");
+const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz");
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 67d1fbd3f..07415949d 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -1621,12 +1621,12 @@ const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shin
 const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp");
 const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp");
 
-const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_palette.gbapal.lz");
-const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/icons/porygon2_icon.4bpp");
-const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/footprints/porygon2_footprint.1bpp");
+const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/front.4bpp.lz");
+const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/normal.gbapal.lz");
+const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz");
+const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/shiny.gbapal.lz");
+const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/icon.4bpp");
+const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp");
 
 const u32 gMonStillFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/front.4bpp.lz");
 const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/normal.gbapal.lz");
@@ -2695,7 +2695,7 @@ const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbap
 const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz");
 const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz");
 const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp");
-const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys_speed/icon.4bpp");
+const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/icon_speed.4bpp");
 const u8 gMonIcon_DeoxysSpeedWide[] = INCBIN_U8("graphics/unused/deoxys_speed_icon_wide.4bpp");
 
 asm(".space 0x6800");
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index a9b6001ec..68728f818 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -75,7 +75,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
 static IWRAM_DATA struct EggHatchData *sEggHatchData;
 
 // rom data
-static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal");
+static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/egg/normal.gbapal");
 static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp");
 static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp");
 
diff --git a/src/graphics.c b/src/graphics.c
index a3b9eb913..c243c64a5 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -4,10 +4,10 @@ const u32 gBattleTextboxTiles[] = INCBIN_U32("graphics/battle_interface/textbox.
 const u32 gBattleTextboxPalette[] = INCBIN_U32("graphics/battle_interface/textbox.gbapal.lz");
 const u32 gBattleTextboxTilemap[] = INCBIN_U32("graphics/battle_interface/textbox_map.bin.lz");
 
-const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz");
-const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz");
-const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz");
+const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/front.4bpp.lz");
+const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/back.4bpp.lz");
+const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/normal.gbapal.lz");
+const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/shiny.gbapal.lz");
 
 const u32 gUnusedGfx_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.4bpp.lz"); // japanese table and bunch of stuff
 const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.bin.lz");
@@ -953,8 +953,8 @@ const u32 gUnknownPal_C2F9E0[] = INCBIN_U32("graphics/unknown/unknown_C2F9E0.gba
 #include "data/graphics/pokemon.h"
 #include "data/graphics/trainers.h"
 
-const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/icons/question_mark_icon.4bpp");
-const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/footprints/question_mark_footprint.1bpp");
+const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
+const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
 
 const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame.4bpp.lz");
 const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz");
@@ -1064,7 +1064,7 @@ const u32 gEnemyMonShadow_Gfx[] = INCBIN_U32("graphics/battle_interface/enemy_mo
 
 const u32 gBattleInterface_BallStatusBarGfx[] = INCBIN_U32("graphics/battle_interface/ball_status_bar.4bpp.lz");
 
-const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/icons/egg_icon.4bpp");
+const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");
 
 const u32 gBattleAnimBackgroundImage_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.4bpp.lz");
 const u32 gBattleAnimBackgroundPalette_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.gbapal.lz");