From bca8523f4776a791eb4860d761cca461985c3b2c Mon Sep 17 00:00:00 2001 From: Marty-D Date: Mon, 11 May 2020 12:42:58 -0400 Subject: [PATCH] Sort trainers by game --- .../{ => gen1/red-blue}/acetrainer-gen1rb.png | Bin .../{ => gen1/red-blue}/acetrainerf-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/agatha-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/beauty-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/biker-gen1rb.png | Bin .../{ => gen1/red-blue}/birdkeeper-gen1rb.png | Bin .../{ => gen1/red-blue}/blackbelt-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/blaine-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/blue-gen1rb.png | Bin .../{ => gen1/red-blue}/blue-gen1rbchampion.png | Bin .../trainers/{ => gen1/red-blue}/blue-gen1rbtwo.png | Bin .../trainers/{ => gen1/red-blue}/brock-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/bruno-gen1rb.png | Bin .../{ => gen1/red-blue}/bugcatcher-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/burglar-gen1rb.png | Bin .../{ => gen1/red-blue}/channeler-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/cueball-gen1rb.png | Bin .../{ => gen1/red-blue}/engineer-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/erika-gen1rb.png | Bin .../{ => gen1/red-blue}/fisherman-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/gambler-gen1rb.png | Bin .../{ => gen1/red-blue}/gentleman-gen1rb.png | Bin .../{ => gen1/red-blue}/giovanni-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/hiker-gen1rb.png | Bin .../{ => gen1/red-blue}/jrtrainer-gen1rb.png | Bin .../{ => gen1/red-blue}/jrtrainerf-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/juggler-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/koga-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/lance-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/lass-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/lorelei-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/ltsurge-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/misty-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/oak-gen1rb.png | Bin .../{ => gen1/red-blue}/pokemaniac-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/psychic-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/red-gen1main.png | Bin .../trainers/{ => gen1/red-blue}/red-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/red-gen1title.png | Bin .../trainers/{ => gen1/red-blue}/rocker-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/rocket-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/sabrina-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/sailor-gen1rb.png | Bin .../{ => gen1/red-blue}/scientist-gen1rb.png | Bin .../{ => gen1/red-blue}/supernerd-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/swimmer-gen1rb.png | Bin .../trainers/{ => gen1/red-blue}/tamer-gen1rb.png | Bin .../{ => gen1/red-blue}/youngster-gen1rb.png | Bin .../trainers/{ => gen1/yellow}/acetrainer-gen1.png | Bin .../trainers/{ => gen1/yellow}/acetrainerf-gen1.png | Bin .../trainers/{ => gen1/yellow}/agatha-gen1.png | Bin .../trainers/{ => gen1/yellow}/beauty-gen1.png | Bin .../trainers/{ => gen1/yellow}/biker-gen1.png | Bin .../trainers/{ => gen1/yellow}/birdkeeper-gen1.png | Bin .../trainers/{ => gen1/yellow}/blackbelt-gen1.png | Bin .../trainers/{ => gen1/yellow}/blaine-gen1.png | Bin .../trainers/{ => gen1/yellow}/blue-gen1.png | Bin .../{ => gen1/yellow}/blue-gen1champion.png | Bin .../trainers/{ => gen1/yellow}/blue-gen1two.png | Bin .../trainers/{ => gen1/yellow}/brock-gen1.png | Bin .../trainers/{ => gen1/yellow}/bruno-gen1.png | Bin .../trainers/{ => gen1/yellow}/bugcatcher-gen1.png | Bin .../trainers/{ => gen1/yellow}/burglar-gen1.png | Bin .../trainers/{ => gen1/yellow}/channeler-gen1.png | Bin .../trainers/{ => gen1/yellow}/cueball-gen1.png | Bin .../trainers/{ => gen1/yellow}/engineer-gen1.png | Bin .../trainers/{ => gen1/yellow}/erika-gen1.png | Bin .../trainers/{ => gen1/yellow}/fisherman-gen1.png | Bin .../trainers/{ => gen1/yellow}/gambler-gen1.png | Bin .../trainers/{ => gen1/yellow}/gentleman-gen1.png | Bin .../trainers/{ => gen1/yellow}/giovanni-gen1.png | Bin .../trainers/{ => gen1/yellow}/hiker-gen1.png | Bin .../trainers/{ => gen1/yellow}/jessiejames-gen1.png | Bin .../trainers/{ => gen1/yellow}/jrtrainer-gen1.png | Bin .../trainers/{ => gen1/yellow}/jrtrainerf-gen1.png | Bin .../trainers/{ => gen1/yellow}/juggler-gen1.png | Bin .../trainers/{ => gen1/yellow}/koga-gen1.png | Bin .../trainers/{ => gen1/yellow}/lance-gen1.png | Bin .../trainers/{ => gen1/yellow}/lass-gen1.png | Bin .../trainers/{ => gen1/yellow}/lorelei-gen1.png | Bin .../trainers/{ => gen1/yellow}/ltsurge-gen1.png | Bin .../trainers/{ => gen1/yellow}/misty-gen1.png | Bin .../trainers/{ => gen1/yellow}/oak-gen1.png | Bin .../trainers/{ => gen1/yellow}/pokemaniac-gen1.png | Bin .../trainers/{ => gen1/yellow}/psychic-gen1.png | Bin .../trainers/{ => gen1/yellow}/red-gen1.png | Bin .../trainers/{ => gen1/yellow}/rocker-gen1.png | Bin .../trainers/{ => gen1/yellow}/rocket-gen1.png | Bin .../trainers/{ => gen1/yellow}/sabrina-gen1.png | Bin .../trainers/{ => gen1/yellow}/sailor-gen1.png | Bin .../trainers/{ => gen1/yellow}/scientist-gen1.png | Bin .../trainers/{ => gen1/yellow}/supernerd-gen1.png | Bin .../trainers/{ => gen1/yellow}/swimmer-gen1.png | Bin .../trainers/{ => gen1/yellow}/tamer-gen1.png | Bin .../trainers/{ => gen1/yellow}/youngster-gen1.png | Bin .../trainers/{ => gen2/crystal}/ethan-gen2.png | Bin .../trainers/{ => gen2/crystal}/ethan-gen2c.png | Bin .../trainers/{ => gen2/crystal}/eusine-gen2.png | Bin .../trainers/{ => gen2/crystal}/kris-gen2.png | Bin .../{ => gen2/gold-silver}/acetrainer-gen2.png | Bin .../{ => gen2/gold-silver}/acetrainerf-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/beauty-gen2.png | Bin .../{ => gen2/gold-silver}/beauty-gen2jp.png | Bin .../trainers/{ => gen2/gold-silver}/biker-gen2.png | Bin .../{ => gen2/gold-silver}/birdkeeper-gen2.png | Bin .../{ => gen2/gold-silver}/blackbelt-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/blaine-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/blue-gen2.png | Bin .../{ => gen2/gold-silver}/boarder-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/brock-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/bruno-gen2.png | Bin .../{ => gen2/gold-silver}/bugcatcher-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/bugsy-gen2.png | Bin .../{ => gen2/gold-silver}/burglar-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/camper-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/chuck-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/clair-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/erika-gen2.png | Bin .../{ => gen2/gold-silver}/falkner-gen2.png | Bin .../{ => gen2/gold-silver}/firebreather-gen2.png | Bin .../{ => gen2/gold-silver}/fisherman-gen2jp.png | Bin .../{ => gen2/gold-silver}/gentleman-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/hiker-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/janine-gen2.png | Bin .../{ => gen2/gold-silver}/jasmine-gen2.png | Bin .../{ => gen2/gold-silver}/juggler-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/karen-gen2.png | Bin .../{ => gen2/gold-silver}/kimonogirl-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/koga-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/lance-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/lass-gen2.png | Bin .../{ => gen2/gold-silver}/ltsurge-gen2.png | Bin .../{ => gen2/gold-silver}/medium-gen2jp.png | Bin .../trainers/{ => gen2/gold-silver}/misty-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/morty-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/oak-gen2.png | Bin .../{ => gen2/gold-silver}/officer-gen2.png | Bin .../{ => gen2/gold-silver}/picnicker-gen2.png | Bin .../{ => gen2/gold-silver}/pokefan-gen2.png | Bin .../{ => gen2/gold-silver}/pokefanf-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/pryce-gen2.png | Bin .../{ => gen2/gold-silver}/psychic-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/red-gen2.png | Bin .../{ => gen2/gold-silver}/rocketexecutive-gen2.png | Bin .../gold-silver}/rocketexecutivef-gen2.png | Bin .../{ => gen2/gold-silver}/rocketgrunt-gen2.png | Bin .../{ => gen2/gold-silver}/rocketgruntf-gen2.png | Bin .../{ => gen2/gold-silver}/sabrina-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/sage-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/sage-gen2jp.png | Bin .../trainers/{ => gen2/gold-silver}/sailor-gen2.png | Bin .../{ => gen2/gold-silver}/schoolboy-gen2.png | Bin .../{ => gen2/gold-silver}/scientist-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/silver-gen2.png | Bin .../{ => gen2/gold-silver}/silver-gen2kanto.png | Bin .../trainers/{ => gen2/gold-silver}/skier-gen2.png | Bin .../{ => gen2/gold-silver}/supernerd-gen2.png | Bin .../{ => gen2/gold-silver}/swimmerf-gen2.png | Bin .../{ => gen2/gold-silver}/swimmerfjp-gen2.png | Bin .../{ => gen2/gold-silver}/swimmerm-gen2.png | Bin .../{ => gen2/gold-silver}/teacher-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/twins-gen2.png | Bin .../{ => gen2/gold-silver}/whitney-gen2.png | Bin .../trainers/{ => gen2/gold-silver}/will-gen2.png | Bin .../{ => gen2/gold-silver}/youngster-gen2.png | Bin .../trainers/{ => gen3/emerald}/anabel-gen3.png | Bin .../trainers/{ => gen3/emerald}/brandon-gen3.png | Bin .../trainers/{ => gen3/emerald}/brendan-gen3.png | Bin .../trainers/{ => gen3/emerald}/greta-gen3.png | Bin .../trainers/{ => gen3/emerald}/juan-gen3.png | Bin .../trainers/{ => gen3/emerald}/lucy-gen3.png | Bin .../trainers/{ => gen3/emerald}/may-gen3.png | Bin .../trainers/{ => gen3/emerald}/noland-gen3.png | Bin .../trainers/{ => gen3/emerald}/spenser-gen3.png | Bin .../trainers/{ => gen3/emerald}/tucker-gen3.png | Bin .../trainers/{ => gen3/emerald}/wallace-gen3.png | Bin .../firered-leafgreen}/acetrainer-gen3.png | Bin .../firered-leafgreen}/acetrainercouple-gen3.png | Bin .../firered-leafgreen}/acetrainerf-gen3.png | Bin .../{ => gen3/firered-leafgreen}/agatha-gen3.png | Bin .../{ => gen3/firered-leafgreen}/aromalady-gen3.png | Bin .../{ => gen3/firered-leafgreen}/beauty-gen3.png | Bin .../{ => gen3/firered-leafgreen}/biker-gen3.png | Bin .../{ => gen3/firered-leafgreen}/bill-gen3.png | Bin .../firered-leafgreen}/birdkeeper-gen3.png | Bin .../{ => gen3/firered-leafgreen}/blackbelt-gen3.png | Bin .../{ => gen3/firered-leafgreen}/blaine-gen3.png | Bin .../{ => gen3/firered-leafgreen}/blue-gen3.png | Bin .../firered-leafgreen}/blue-gen3champion.png | Bin .../{ => gen3/firered-leafgreen}/blue-gen3two.png | Bin .../{ => gen3/firered-leafgreen}/brock-gen3.png | Bin .../{ => gen3/firered-leafgreen}/bruno-gen3.png | Bin .../firered-leafgreen}/bugcatcher-gen3.png | Bin .../{ => gen3/firered-leafgreen}/burglar-gen3.png | Bin .../{ => gen3/firered-leafgreen}/camper-gen3.png | Bin .../{ => gen3/firered-leafgreen}/channeler-gen3.png | Bin .../{ => gen3/firered-leafgreen}/crushgirl-gen3.png | Bin .../{ => gen3/firered-leafgreen}/crushkin-gen3.png | Bin .../{ => gen3/firered-leafgreen}/cueball-gen3.png | Bin .../{ => gen3/firered-leafgreen}/engineer-gen3.png | Bin .../{ => gen3/firered-leafgreen}/erika-gen3.png | Bin .../{ => gen3/firered-leafgreen}/fisherman-gen3.png | Bin .../{ => gen3/firered-leafgreen}/gamer-gen3.png | Bin .../{ => gen3/firered-leafgreen}/gentleman-gen3.png | Bin .../{ => gen3/firered-leafgreen}/giovanni-gen3.png | Bin .../{ => gen3/firered-leafgreen}/hiker-gen3.png | Bin .../{ => gen3/firered-leafgreen}/juggler-gen3.png | Bin .../{ => gen3/firered-leafgreen}/koga-gen3.png | Bin .../{ => gen3/firered-leafgreen}/lady-gen3.png | Bin .../{ => gen3/firered-leafgreen}/lance-gen3.png | Bin .../{ => gen3/firered-leafgreen}/lass-gen3.png | Bin .../{ => gen3/firered-leafgreen}/leaf-gen3.png | Bin .../{ => gen3/firered-leafgreen}/lorelei-gen3.png | Bin .../{ => gen3/firered-leafgreen}/ltsurge-gen3.png | Bin .../{ => gen3/firered-leafgreen}/misty-gen3.png | Bin .../{ => gen3/firered-leafgreen}/mrfuji-gen3.png | Bin .../{ => gen3/firered-leafgreen}/oak-gen3.png | Bin .../{ => gen3/firered-leafgreen}/painter-gen3.png | Bin .../{ => gen3/firered-leafgreen}/picnicker-gen3.png | Bin .../firered-leafgreen}/pokemaniac-gen3.png | Bin .../firered-leafgreen}/pokemonbreederf-gen3frlg.png | Bin .../firered-leafgreen}/pokemonranger-gen3.png | Bin .../firered-leafgreen}/pokemonrangerf-gen3.png | Bin .../{ => gen3/firered-leafgreen}/psychic-gen3.png | Bin .../{ => gen3/firered-leafgreen}/psychicf-gen3.png | Bin .../{ => gen3/firered-leafgreen}/red-gen3.png | Bin .../{ => gen3/firered-leafgreen}/rocker-gen3.png | Bin .../firered-leafgreen}/ruinmaniac-gen3.png | Bin .../{ => gen3/firered-leafgreen}/sabrina-gen3.png | Bin .../{ => gen3/firered-leafgreen}/sailor-gen3.png | Bin .../{ => gen3/firered-leafgreen}/scientist-gen3.png | Bin .../{ => gen3/firered-leafgreen}/sisandbro-gen3.png | Bin .../{ => gen3/firered-leafgreen}/supernerd-gen3.png | Bin .../{ => gen3/firered-leafgreen}/swimmerf-gen3.png | Bin .../{ => gen3/firered-leafgreen}/swimmerm-gen3.png | Bin .../{ => gen3/firered-leafgreen}/tamer-gen3.png | Bin .../firered-leafgreen}/teamrocketgruntf-gen3.png | Bin .../firered-leafgreen}/teamrocketgruntm-gen3.png | Bin .../{ => gen3/firered-leafgreen}/tuberf-gen3.png | Bin .../{ => gen3/firered-leafgreen}/twins-gen3.png | Bin .../firered-leafgreen}/youngcouple-gen3.png | Bin .../{ => gen3/firered-leafgreen}/youngster-gen3.png | Bin .../{ => gen3/ruby-sapphire}/acetrainer-gen3jp.png | Bin .../{ => gen3/ruby-sapphire}/acetrainer-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/acetrainerf-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/archie-gen3.png | Bin .../{ => gen3/ruby-sapphire}/aromalady-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/battlegirl-gen3.png | Bin .../{ => gen3/ruby-sapphire}/beauty-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/birch-gen3.png | Bin .../{ => gen3/ruby-sapphire}/birdkeeper-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/blackbelt-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/brawly-gen3.png | Bin .../{ => gen3/ruby-sapphire}/brendan-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/bugcatcher-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/bugmaniac-gen3.png | Bin .../{ => gen3/ruby-sapphire}/camper-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/collector-gen3.png | Bin .../{ => gen3/ruby-sapphire}/courtney-gen3.png | Bin .../{ => gen3/ruby-sapphire}/dragontamer-gen3.png | Bin .../{ => gen3/ruby-sapphire}/drake-gen3.png | Bin .../{ => gen3/ruby-sapphire}/expert-gen3.png | Bin .../{ => gen3/ruby-sapphire}/expertf-gen3.png | Bin .../{ => gen3/ruby-sapphire}/fisherman-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/flannery-gen3.png | Bin .../{ => gen3/ruby-sapphire}/gentleman-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/glacia-gen3.png | Bin .../{ => gen3/ruby-sapphire}/guitarist-gen3.png | Bin .../{ => gen3/ruby-sapphire}/hexmaniac-gen3.png | Bin .../{ => gen3/ruby-sapphire}/hexmaniac-gen3jp.png | Bin .../{ => gen3/ruby-sapphire}/hiker-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/interviewers-gen3.png | Bin .../{ => gen3/ruby-sapphire}/kindler-gen3.png | Bin .../{ => gen3/ruby-sapphire}/lady-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/lass-gen3rs.png | Bin .../trainers/{ => gen3/ruby-sapphire}/matt-gen3.png | Bin .../{ => gen3/ruby-sapphire}/maxie-gen3.png | Bin .../{ => gen3/ruby-sapphire}/may-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/ninjaboy-gen3.png | Bin .../{ => gen3/ruby-sapphire}/norman-gen3.png | Bin .../{ => gen3/ruby-sapphire}/oldcouple-gen3.png | Bin .../{ => gen3/ruby-sapphire}/parasollady-gen3.png | Bin .../{ => gen3/ruby-sapphire}/phoebe-gen3.png | Bin .../{ => gen3/ruby-sapphire}/picnicker-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/pokefan-gen3.png | Bin .../{ => gen3/ruby-sapphire}/pokefanf-gen3.png | Bin .../{ => gen3/ruby-sapphire}/pokemaniac-gen3rs.png | Bin .../ruby-sapphire}/pokemonbreeder-gen3.png | Bin .../ruby-sapphire}/pokemonbreederf-gen3.png | Bin .../ruby-sapphire}/pokemonranger-gen3rs.png | Bin .../ruby-sapphire}/pokemonrangerf-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/psychic-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/psychicf-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/psychicfjp-gen3.png | Bin .../{ => gen3/ruby-sapphire}/richboy-gen3.png | Bin .../{ => gen3/ruby-sapphire}/roxanne-gen3.png | Bin .../{ => gen3/ruby-sapphire}/ruinmaniac-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/sailor-gen3jp.png | Bin .../{ => gen3/ruby-sapphire}/sailor-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/schoolkid-gen3.png | Bin .../{ => gen3/ruby-sapphire}/schoolkidf-gen3.png | Bin .../{ => gen3/ruby-sapphire}/shelly-gen3.png | Bin .../{ => gen3/ruby-sapphire}/sidney-gen3.png | Bin .../{ => gen3/ruby-sapphire}/sisandbro-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/srandjr-gen3.png | Bin .../{ => gen3/ruby-sapphire}/steven-gen3.png | Bin .../{ => gen3/ruby-sapphire}/swimmerf-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/swimmerm-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/tabitha-gen3.png | Bin .../{ => gen3/ruby-sapphire}/tateandliza-gen3.png | Bin .../{ => gen3/ruby-sapphire}/teamaquabeta-gen3.png | Bin .../ruby-sapphire}/teamaquagruntf-gen3.png | Bin .../ruby-sapphire}/teamaquagruntm-gen3.png | Bin .../ruby-sapphire}/teammagmagruntf-gen3.png | Bin .../ruby-sapphire}/teammagmagruntm-gen3.png | Bin .../ruby-sapphire}/triathletebikerf-gen3.png | Bin .../ruby-sapphire}/triathletebikerm-gen3.png | Bin .../ruby-sapphire}/triathleterunnerf-gen3.png | Bin .../ruby-sapphire}/triathleterunnerm-gen3.png | Bin .../ruby-sapphire}/triathleteswimmerf-gen3.png | Bin .../ruby-sapphire}/triathleteswimmerm-gen3.png | Bin .../{ => gen3/ruby-sapphire}/tuber-gen3.png | Bin .../{ => gen3/ruby-sapphire}/tuberf-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/twins-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/wallace-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/wally-gen3.png | Bin .../{ => gen3/ruby-sapphire}/wattson-gen3.png | Bin .../{ => gen3/ruby-sapphire}/winona-gen3.png | Bin .../{ => gen3/ruby-sapphire}/youngcouple-gen3rs.png | Bin .../{ => gen3/ruby-sapphire}/youngster-gen3rs.png | Bin .../trainers/{ => gen4/diamond-pearl}/aaron.png | Bin .../{ => gen4/diamond-pearl}/acetrainer-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/acetrainerf-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/acetrainersnow.png | Bin .../{ => gen4/diamond-pearl}/acetrainersnowf.png | Bin .../trainers/{ => gen4/diamond-pearl}/aromalady.png | Bin .../{ => gen4/diamond-pearl}/artist-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/barry.png | Bin .../{ => gen4/diamond-pearl}/battlegirl-gen4.png | Bin .../{ => gen4/diamond-pearl}/beauty-gen4dp.png | Bin .../trainers/{ => gen4/diamond-pearl}/bellepa.png | Bin .../trainers/{ => gen4/diamond-pearl}/bertha.png | Bin .../{ => gen4/diamond-pearl}/birdkeeper-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/blackbelt-gen4dp.png | Bin .../trainers/{ => gen4/diamond-pearl}/buck.png | Bin .../{ => gen4/diamond-pearl}/bugcatcher.png | Bin .../trainers/{ => gen4/diamond-pearl}/byron.png | Bin .../trainers/{ => gen4/diamond-pearl}/cameraman.png | Bin .../trainers/{ => gen4/diamond-pearl}/camper.png | Bin .../trainers/{ => gen4/diamond-pearl}/candice.png | Bin .../trainers/{ => gen4/diamond-pearl}/cheryl.png | Bin .../trainers/{ => gen4/diamond-pearl}/clown.png | Bin .../trainers/{ => gen4/diamond-pearl}/collector.png | Bin .../trainers/{ => gen4/diamond-pearl}/cowgirl.png | Bin .../{ => gen4/diamond-pearl}/crasherwake.png | Bin .../{ => gen4/diamond-pearl}/cyclist-gen4.png | Bin .../{ => gen4/diamond-pearl}/cyclistf-gen4.png | Bin .../{ => gen4/diamond-pearl}/cynthia-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/cyrus.png | Bin .../trainers/{ => gen4/diamond-pearl}/dawn.png | Bin .../{ => gen4/diamond-pearl}/doubleteam.png | Bin .../{ => gen4/diamond-pearl}/dragontamer.png | Bin .../trainers/{ => gen4/diamond-pearl}/fantina.png | Bin .../{ => gen4/diamond-pearl}/fisherman-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/flint.png | Bin .../{ => gen4/diamond-pearl}/galacticgrunt.png | Bin .../{ => gen4/diamond-pearl}/galacticgruntf.png | Bin .../trainers/{ => gen4/diamond-pearl}/gambler.png | Bin .../trainers/{ => gen4/diamond-pearl}/gardenia.png | Bin .../{ => gen4/diamond-pearl}/gentleman-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/guitarist-gen4.png | Bin .../{ => gen4/diamond-pearl}/hiker-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/idol.png | Bin .../{ => gen4/diamond-pearl}/interviewers.png | Bin .../trainers/{ => gen4/diamond-pearl}/jogger.png | Bin .../trainers/{ => gen4/diamond-pearl}/jupiter.png | Bin .../trainers/{ => gen4/diamond-pearl}/lady-gen4.png | Bin .../{ => gen4/diamond-pearl}/lass-gen4dp.png | Bin .../trainers/{ => gen4/diamond-pearl}/lucas.png | Bin .../trainers/{ => gen4/diamond-pearl}/lucian.png | Bin .../{ => gen4/diamond-pearl}/madame-gen4.png | Bin .../{ => gen4/diamond-pearl}/madame-gen4dp.png | Bin .../trainers/{ => gen4/diamond-pearl}/marley.png | Bin .../trainers/{ => gen4/diamond-pearl}/mars.png | Bin .../trainers/{ => gen4/diamond-pearl}/maylene.png | Bin .../trainers/{ => gen4/diamond-pearl}/mira.png | Bin .../trainers/{ => gen4/diamond-pearl}/ninjaboy.png | Bin .../trainers/{ => gen4/diamond-pearl}/palmer.png | Bin .../{ => gen4/diamond-pearl}/parasollady-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/picnicker.png | Bin .../{ => gen4/diamond-pearl}/pokefan-gen4.png | Bin .../{ => gen4/diamond-pearl}/pokefanf-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/pokekid.png | Bin .../diamond-pearl}/pokemonbreeder-gen4.png | Bin .../diamond-pearl}/pokemonbreederf-gen4.png | Bin .../{ => gen4/diamond-pearl}/pokemonranger-gen4.png | Bin .../diamond-pearl}/pokemonrangerf-gen4.png | Bin .../{ => gen4/diamond-pearl}/policeman-gen4.png | Bin .../{ => gen4/diamond-pearl}/psychic-gen4.png | Bin .../{ => gen4/diamond-pearl}/psychicf-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/rancher.png | Bin .../trainers/{ => gen4/diamond-pearl}/reporter.png | Bin .../{ => gen4/diamond-pearl}/richboy-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/riley.png | Bin .../trainers/{ => gen4/diamond-pearl}/roark.png | Bin .../{ => gen4/diamond-pearl}/roughneck-gen4.png | Bin .../{ => gen4/diamond-pearl}/ruinmaniac.png | Bin .../trainers/{ => gen4/diamond-pearl}/sailor.png | Bin .../trainers/{ => gen4/diamond-pearl}/saturn.png | Bin .../{ => gen4/diamond-pearl}/schoolkid-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/schoolkidf-gen4.png | Bin .../{ => gen4/diamond-pearl}/scientist-gen4dp.png | Bin .../trainers/{ => gen4/diamond-pearl}/sisandbro.png | Bin .../trainers/{ => gen4/diamond-pearl}/skier.png | Bin .../{ => gen4/diamond-pearl}/skierf-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/swimmer-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/swimmerf-gen4dp.png | Bin .../trainers/{ => gen4/diamond-pearl}/tuber.png | Bin .../trainers/{ => gen4/diamond-pearl}/tuberf.png | Bin .../{ => gen4/diamond-pearl}/twins-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/veteran-gen4.png | Bin .../trainers/{ => gen4/diamond-pearl}/volkner.png | Bin .../{ => gen4/diamond-pearl}/waiter-gen4.png | Bin .../{ => gen4/diamond-pearl}/waiter-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/waitress-gen4.png | Bin .../{ => gen4/diamond-pearl}/worker-gen4.png | Bin .../{ => gen4/diamond-pearl}/youngcouple-gen4dp.png | Bin .../{ => gen4/diamond-pearl}/youngster-gen4.png | Bin .../heartgold-soulsilver}/acetrainer-gen4.png | Bin .../heartgold-soulsilver}/acetrainercouple.png | Bin .../heartgold-soulsilver}/acetrainerf-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/archer.png | Bin .../{ => gen4/heartgold-soulsilver}/ariana.png | Bin .../{ => gen4/heartgold-soulsilver}/beauty.png | Bin .../{ => gen4/heartgold-soulsilver}/biker-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/birdkeeper.png | Bin .../heartgold-soulsilver}/blackbelt-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/blaine.png | Bin .../{ => gen4/heartgold-soulsilver}/blue.png | Bin .../{ => gen4/heartgold-soulsilver}/boarder.png | Bin .../{ => gen4/heartgold-soulsilver}/brock.png | Bin .../{ => gen4/heartgold-soulsilver}/bruno.png | Bin .../{ => gen4/heartgold-soulsilver}/bugsy.png | Bin .../{ => gen4/heartgold-soulsilver}/burglar.png | Bin .../{ => gen4/heartgold-soulsilver}/chuck.png | Bin .../{ => gen4/heartgold-soulsilver}/clair.png | Bin .../{ => gen4/heartgold-soulsilver}/erika.png | Bin .../{ => gen4/heartgold-soulsilver}/ethan.png | Bin .../{ => gen4/heartgold-soulsilver}/eusine.png | Bin .../{ => gen4/heartgold-soulsilver}/falkner.png | Bin .../heartgold-soulsilver}/firebreather.png | Bin .../heartgold-soulsilver}/gentleman-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/giovanni.png | Bin .../{ => gen4/heartgold-soulsilver}/janine.png | Bin .../{ => gen4/heartgold-soulsilver}/jasmine.png | Bin .../{ => gen4/heartgold-soulsilver}/juggler.png | Bin .../{ => gen4/heartgold-soulsilver}/karen.png | Bin .../{ => gen4/heartgold-soulsilver}/kimonogirl.png | Bin .../{ => gen4/heartgold-soulsilver}/koga.png | Bin .../{ => gen4/heartgold-soulsilver}/lance.png | Bin .../{ => gen4/heartgold-soulsilver}/lass-gen4.png | Bin .../trainers/{ => gen4/heartgold-soulsilver}/li.png | Bin .../{ => gen4/heartgold-soulsilver}/ltsurge.png | Bin .../{ => gen4/heartgold-soulsilver}/lyra.png | Bin .../{ => gen4/heartgold-soulsilver}/medium.png | Bin .../{ => gen4/heartgold-soulsilver}/misty.png | Bin .../{ => gen4/heartgold-soulsilver}/morty.png | Bin .../{ => gen4/heartgold-soulsilver}/petrel.png | Bin .../{ => gen4/heartgold-soulsilver}/pokemaniac.png | Bin .../{ => gen4/heartgold-soulsilver}/proton.png | Bin .../{ => gen4/heartgold-soulsilver}/pryce.png | Bin .../{ => gen4/heartgold-soulsilver}/red.png | Bin .../{ => gen4/heartgold-soulsilver}/rocketgrunt.png | Bin .../heartgold-soulsilver}/rocketgruntf.png | Bin .../{ => gen4/heartgold-soulsilver}/sabrina.png | Bin .../{ => gen4/heartgold-soulsilver}/sage.png | Bin .../heartgold-soulsilver}/schoolkid-gen4.png | Bin .../heartgold-soulsilver}/scientist-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/silver.png | Bin .../{ => gen4/heartgold-soulsilver}/skierf.png | Bin .../{ => gen4/heartgold-soulsilver}/supernerd.png | Bin .../heartgold-soulsilver}/swimmer-gen4.png | Bin .../heartgold-soulsilver}/swimmerf-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/teacher.png | Bin .../{ => gen4/heartgold-soulsilver}/twins-gen4.png | Bin .../{ => gen4/heartgold-soulsilver}/whitney.png | Bin .../{ => gen4/heartgold-soulsilver}/will.png | Bin .../{ => gen4/heartgold-soulsilver}/youngcouple.png | Bin .../trainers/{ => gen4/platinum}/argenta.png | Bin .../trainers/{ => gen4/platinum}/dahlia.png | Bin .../trainers/{ => gen4/platinum}/darach.png | Bin .../trainers/{ => gen4/platinum}/dawn-gen4pt.png | Bin .../trainers/{ => gen4/platinum}/lucas-gen4pt.png | Bin .../trainers/{ => gen4/platinum}/thorton.png | Bin .../trainers/{ => gen5/black-white}/acetrainer.png | Bin .../trainers/{ => gen5/black-white}/acetrainerf.png | Bin .../trainers/{ => gen5/black-white}/alder.png | Bin .../trainers/{ => gen5/black-white}/artist.png | Bin .../trainers/{ => gen5/black-white}/backers.png | Bin .../trainers/{ => gen5/black-white}/backersf.png | Bin .../trainers/{ => gen5/black-white}/backpacker.png | Bin .../trainers/{ => gen5/black-white}/backpackerf.png | Bin .../trainers/{ => gen5/black-white}/baker.png | Bin .../trainers/{ => gen5/black-white}/battlegirl.png | Bin .../trainers/{ => gen5/black-white}/bianca.png | Bin .../trainers/{ => gen5/black-white}/biker.png | Bin .../trainers/{ => gen5/black-white}/blackbelt.png | Bin .../trainers/{ => gen5/black-white}/brycen.png | Bin .../trainers/{ => gen5/black-white}/burgh.png | Bin .../trainers/{ => gen5/black-white}/caitlin.png | Bin .../trainers/{ => gen5/black-white}/cheren.png | Bin .../trainers/{ => gen5/black-white}/chili.png | Bin .../trainers/{ => gen5/black-white}/cilan.png | Bin .../trainers/{ => gen5/black-white}/clay.png | Bin .../trainers/{ => gen5/black-white}/clerk-boss.png | Bin .../trainers/{ => gen5/black-white}/clerk.png | Bin .../trainers/{ => gen5/black-white}/clerkf.png | Bin .../trainers/{ => gen5/black-white}/cress.png | Bin .../trainers/{ => gen5/black-white}/cyclist.png | Bin .../trainers/{ => gen5/black-white}/cyclistf.png | Bin .../trainers/{ => gen5/black-white}/cynthia.png | Bin .../trainers/{ => gen5/black-white}/dancer.png | Bin .../trainers/{ => gen5/black-white}/depotagent.png | Bin .../trainers/{ => gen5/black-white}/doctor.png | Bin .../trainers/{ => gen5/black-white}/drayden.png | Bin .../trainers/{ => gen5/black-white}/elesa.png | Bin .../trainers/{ => gen5/black-white}/emmet.png | Bin .../trainers/{ => gen5/black-white}/fisherman.png | Bin .../trainers/{ => gen5/black-white}/gentleman.png | Bin .../{ => gen5/black-white}/ghetsis-gen5bw.png | Bin .../trainers/{ => gen5/black-white}/grimsley.png | Bin .../trainers/{ => gen5/black-white}/harlequin.png | Bin .../trainers/{ => gen5/black-white}/hiker.png | Bin .../{ => gen5/black-white}/hilbert-dueldisk.png | Bin .../trainers/{ => gen5/black-white}/hilbert.png | Bin .../{ => gen5/black-white}/hilda-dueldisk.png | Bin .../trainers/{ => gen5/black-white}/hilda.png | Bin .../trainers/{ => gen5/black-white}/hooligans.png | Bin .../trainers/{ => gen5/black-white}/hoopster.png | Bin .../trainers/{ => gen5/black-white}/infielder.png | Bin .../trainers/{ => gen5/black-white}/ingo.png | Bin .../trainers/{ => gen5/black-white}/iris.png | Bin .../trainers/{ => gen5/black-white}/janitor.png | Bin .../trainers/{ => gen5/black-white}/lady.png | Bin .../trainers/{ => gen5/black-white}/lass.png | Bin .../trainers/{ => gen5/black-white}/lenora.png | Bin .../trainers/{ => gen5/black-white}/linebacker.png | Bin .../trainers/{ => gen5/black-white}/madame.png | Bin .../trainers/{ => gen5/black-white}/maid.png | Bin .../trainers/{ => gen5/black-white}/marshal.png | Bin .../trainers/{ => gen5/black-white}/musician.png | Bin src/canonical/trainers/{ => gen5/black-white}/n.png | Bin .../trainers/{ => gen5/black-white}/nurse.png | Bin .../trainers/{ => gen5/black-white}/nurseryaide.png | Bin .../trainers/{ => gen5/black-white}/parasollady.png | Bin .../trainers/{ => gen5/black-white}/pilot.png | Bin .../{ => gen5/black-white}/plasmagrunt-gen5bw.png | Bin .../{ => gen5/black-white}/plasmagruntf-gen5bw.png | Bin .../trainers/{ => gen5/black-white}/pokefan.png | Bin .../trainers/{ => gen5/black-white}/pokefanf.png | Bin .../{ => gen5/black-white}/pokemonbreeder.png | Bin .../{ => gen5/black-white}/pokemonbreederf.png | Bin .../{ => gen5/black-white}/pokemonranger.png | Bin .../{ => gen5/black-white}/pokemonrangerf.png | Bin .../trainers/{ => gen5/black-white}/policeman.png | Bin .../trainers/{ => gen5/black-white}/preschooler.png | Bin .../{ => gen5/black-white}/preschoolerf.png | Bin .../trainers/{ => gen5/black-white}/psychic.png | Bin .../trainers/{ => gen5/black-white}/psychicf.png | Bin .../trainers/{ => gen5/black-white}/richboy.png | Bin .../trainers/{ => gen5/black-white}/roughneck.png | Bin .../trainers/{ => gen5/black-white}/schoolkid.png | Bin .../trainers/{ => gen5/black-white}/schoolkidf.png | Bin .../trainers/{ => gen5/black-white}/scientist.png | Bin .../trainers/{ => gen5/black-white}/scientistf.png | Bin .../trainers/{ => gen5/black-white}/shauntal.png | Bin .../trainers/{ => gen5/black-white}/skyla.png | Bin .../trainers/{ => gen5/black-white}/smasher.png | Bin .../trainers/{ => gen5/black-white}/striker.png | Bin .../trainers/{ => gen5/black-white}/swimmer.png | Bin .../trainers/{ => gen5/black-white}/swimmerf.png | Bin .../trainers/{ => gen5/black-white}/twins.png | Bin .../trainers/{ => gen5/black-white}/veteran.png | Bin .../trainers/{ => gen5/black-white}/veteranf.png | Bin .../trainers/{ => gen5/black-white}/waiter.png | Bin .../trainers/{ => gen5/black-white}/waitress.png | Bin .../trainers/{ => gen5/black-white}/worker.png | Bin .../trainers/{ => gen5/black-white}/workerice.png | Bin .../trainers/{ => gen5/black-white}/youngster.png | Bin .../{ => gen5/black2-white2}/beauty-gen5bw2.png | Bin .../trainers/{ => gen5/black2-white2}/bellelba.png | Bin .../trainers/{ => gen5/black2-white2}/benga.png | Bin .../{ => gen5/black2-white2}/bianca-pwt.png | Bin .../trainers/{ => gen5/black2-white2}/brawly.png | Bin .../trainers/{ => gen5/black2-white2}/brycenman.png | Bin .../{ => gen5/black2-white2}/cheren-gen5bw2.png | Bin .../trainers/{ => gen5/black2-white2}/colress.png | Bin .../{ => gen5/black2-white2}/elesa-gen5bw2.png | Bin .../trainers/{ => gen5/black2-white2}/flannery.png | Bin .../trainers/{ => gen5/black2-white2}/ghetsis.png | Bin .../trainers/{ => gen5/black2-white2}/guitarist.png | Bin .../trainers/{ => gen5/black2-white2}/hugh.png | Bin .../{ => gen5/black2-white2}/iris-gen5bw2.png | Bin .../trainers/{ => gen5/black2-white2}/juan.png | Bin .../trainers/{ => gen5/black2-white2}/liza.png | Bin .../trainers/{ => gen5/black2-white2}/marlon.png | Bin .../{ => gen5/black2-white2}/nate-dueldisk.png | Bin .../trainers/{ => gen5/black2-white2}/nate.png | Bin .../trainers/{ => gen5/black2-white2}/norman.png | Bin .../{ => gen5/black2-white2}/plasmagrunt.png | Bin .../{ => gen5/black2-white2}/plasmagruntf.png | Bin .../trainers/{ => gen5/black2-white2}/rood.png | Bin .../{ => gen5/black2-white2}/rosa-dueldisk.png | Bin .../trainers/{ => gen5/black2-white2}/rosa.png | Bin .../trainers/{ => gen5/black2-white2}/roxanne.png | Bin .../trainers/{ => gen5/black2-white2}/roxie.png | Bin .../{ => gen5/black2-white2}/shadowtriad.png | Bin .../trainers/{ => gen5/black2-white2}/steven.png | Bin .../trainers/{ => gen5/black2-white2}/tate.png | Bin .../trainers/{ => gen5/black2-white2}/wallace.png | Bin .../trainers/{ => gen5/black2-white2}/wattson.png | Bin .../trainers/{ => gen5/black2-white2}/winona.png | Bin .../trainers/{ => gen5/black2-white2}/zinzolin.png | Bin .../trainers/gen5/black-white}/juniper.png | Bin .../trainers/gen5/black-white}/youngn.png | Bin .../gen6/omegaruby-alphasapphire}/brawly-gen6.png | Bin .../gen6/omegaruby-alphasapphire}/shelly.png | Bin .../gen6/omegaruby-alphasapphire}/sidney.png | Bin .../gen6/omegaruby-alphasapphire}/wallace-gen6.png | Bin .../gen6/omegaruby-alphasapphire}/wally.png | Bin .../gen6/omegaruby-alphasapphire}/winona-gen6.png | Bin .../gen6/omegaruby-alphasapphire}/zinnia.png | Bin .../trainers/gen6/x-y}/az.png | Bin .../trainers/gen6/x-y}/bryony.png | Bin .../trainers/gen6/x-y}/clemont.png | Bin .../trainers/gen6/x-y}/drasna.png | Bin .../trainers/gen6/x-y}/evelyn.png | Bin .../trainers/gen6/x-y}/furisodegirl-black.png | Bin .../trainers/gen6/x-y}/furisodegirl-pink.png | Bin .../trainers/gen6/x-y}/korrina.png | Bin .../trainers/gen6/x-y}/malva.png | Bin .../trainers/gen6/x-y}/nita.png | Bin .../trainers/gen6/x-y}/olympia.png | Bin .../trainers/gen6/x-y}/ramos.png | Bin .../trainers/gen6/x-y}/siebold.png | Bin .../trainers/gen6/x-y}/tierno.png | Bin .../trainers/gen6/x-y}/valerie.png | Bin .../trainers/gen6/x-y}/viola.png | Bin .../trainers/gen6/x-y}/wikstrom.png | Bin .../trainers/gen6/x-y}/wulfric.png | Bin .../trainers/gen6/x-y}/xerosic.png | Bin .../trainers/gen7/sun-moon}/acerola.png | Bin .../trainers/gen7/sun-moon}/aetheremployee.png | Bin .../trainers/gen7/sun-moon}/aetheremployeef.png | Bin .../trainers/gen7/sun-moon}/aetherfoundation.png | Bin .../trainers/gen7/sun-moon}/aetherfoundationf.png | Bin .../trainers/gen7/sun-moon}/anabel.png | Bin .../trainers/gen7/sun-moon}/beauty-gen7.png | Bin .../trainers/gen7/sun-moon}/blue-gen7.png | Bin .../trainers/gen7/sun-moon}/burnet.png | Bin .../trainers/gen7/sun-moon}/colress-gen7.png | Bin .../trainers/gen7/sun-moon}/dexio.png | Bin .../trainers/gen7/sun-moon}/elio.png | Bin .../trainers/gen7/sun-moon}/faba.png | Bin .../trainers/gen7/sun-moon}/gladion-stance.png | Bin .../trainers/gen7/sun-moon}/gladion.png | Bin .../trainers/gen7/sun-moon}/grimsley-gen7.png | Bin .../trainers/gen7/sun-moon}/guzma.png | Bin .../trainers/gen7/sun-moon}/hala.png | Bin .../trainers/gen7/sun-moon}/hapu.png | Bin .../trainers/gen7/sun-moon}/hau-stance.png | Bin .../trainers/gen7/sun-moon}/hau.png | Bin .../trainers/gen7/sun-moon}/hiker-gen7.png | Bin .../trainers/gen7/sun-moon}/ilima.png | Bin .../trainers/gen7/sun-moon}/kahili.png | Bin .../trainers/gen7/sun-moon}/kiawe.png | Bin .../trainers/gen7/sun-moon}/kukui-stand.png | Bin .../trainers/gen7/sun-moon}/kukui.png | Bin .../trainers/gen7/sun-moon}/lana.png | Bin .../trainers/gen7/sun-moon}/lass-gen7.png | Bin .../trainers/gen7/sun-moon}/lillie-z.png | Bin .../trainers/gen7/sun-moon}/lillie.png | Bin .../trainers/gen7/sun-moon}/lusamine-nihilego.png | Bin .../trainers/gen7/sun-moon}/lusamine.png | Bin .../trainers/gen7/sun-moon}/mallow.png | Bin .../trainers/gen7/sun-moon}/mina.png | Bin .../trainers/gen7/sun-moon}/molayne.png | Bin .../trainers/gen7/sun-moon}/nanu.png | Bin .../trainers/gen7/sun-moon}/officeworker.png | Bin .../trainers/gen7/sun-moon}/olivia.png | Bin .../trainers/gen7/sun-moon}/plumeria.png | Bin .../trainers/gen7/sun-moon}/pokemonbreeder-gen7.png | Bin .../gen7/sun-moon}/pokemonbreederf-gen7.png | Bin .../trainers/gen7/sun-moon}/preschoolers.png | Bin .../trainers/gen7/sun-moon}/red-gen7.png | Bin .../trainers/gen7/sun-moon}/risingstar.png | Bin .../trainers/gen7/sun-moon}/risingstarf.png | Bin .../trainers/gen7/sun-moon}/ryuki.png | Bin .../trainers/gen7/sun-moon}/samsonoak.png | Bin .../trainers/gen7/sun-moon}/selene.png | Bin .../trainers/gen7/sun-moon}/sightseer.png | Bin .../trainers/gen7/sun-moon}/sina.png | Bin .../trainers/gen7/sun-moon}/sophocles.png | Bin .../trainers/gen7/sun-moon}/teacher-gen7.png | Bin .../trainers/gen7/sun-moon}/theroyal.png | Bin .../trainers/gen7/sun-moon}/wicke.png | Bin .../trainers/gen7/sun-moon}/youngathlete.png | Bin .../trainers/gen7/sun-moon}/youngathletef.png | Bin .../trainers/gen7/sun-moon}/youngster-gen7.png | Bin .../trainers/misc}/ash-alola.png | Bin .../trainers/misc}/ash-capbackward.png | Bin .../trainers/misc}/ash-hoenn.png | Bin .../trainers/misc}/ash-johto.png | Bin .../trainers/misc}/ash-kalos.png | Bin .../trainers/misc}/ash-sinnoh.png | Bin .../trainers/misc}/ash-unova.png | Bin .../trainers => noncanonical/trainers/misc}/ash.png | Bin .../trainers/misc}/teamrocket.png | Bin .../trainers/misc}/unknown.png | Bin .../trainers/misc}/unknownf.png | Bin .../trainers/misc}/yellow.png | Bin 721 files changed, 0 insertions(+), 0 deletions(-) rename src/canonical/trainers/{ => gen1/red-blue}/acetrainer-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/acetrainerf-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/agatha-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/beauty-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/biker-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/birdkeeper-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/blackbelt-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/blaine-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/blue-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/blue-gen1rbchampion.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/blue-gen1rbtwo.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/brock-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/bruno-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/bugcatcher-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/burglar-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/channeler-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/cueball-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/engineer-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/erika-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/fisherman-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/gambler-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/gentleman-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/giovanni-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/hiker-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/jrtrainer-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/jrtrainerf-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/juggler-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/koga-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/lance-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/lass-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/lorelei-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/ltsurge-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/misty-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/oak-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/pokemaniac-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/psychic-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/red-gen1main.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/red-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/red-gen1title.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/rocker-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/rocket-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/sabrina-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/sailor-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/scientist-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/supernerd-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/swimmer-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/tamer-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/red-blue}/youngster-gen1rb.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/acetrainer-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/acetrainerf-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/agatha-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/beauty-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/biker-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/birdkeeper-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/blackbelt-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/blaine-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/blue-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/blue-gen1champion.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/blue-gen1two.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/brock-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/bruno-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/bugcatcher-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/burglar-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/channeler-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/cueball-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/engineer-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/erika-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/fisherman-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/gambler-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/gentleman-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/giovanni-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/hiker-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/jessiejames-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/jrtrainer-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/jrtrainerf-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/juggler-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/koga-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/lance-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/lass-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/lorelei-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/ltsurge-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/misty-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/oak-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/pokemaniac-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/psychic-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/red-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/rocker-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/rocket-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/sabrina-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/sailor-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/scientist-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/supernerd-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/swimmer-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/tamer-gen1.png (100%) rename src/canonical/trainers/{ => gen1/yellow}/youngster-gen1.png (100%) rename src/canonical/trainers/{ => gen2/crystal}/ethan-gen2.png (100%) rename src/canonical/trainers/{ => gen2/crystal}/ethan-gen2c.png (100%) rename src/canonical/trainers/{ => gen2/crystal}/eusine-gen2.png (100%) rename src/canonical/trainers/{ => gen2/crystal}/kris-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/acetrainer-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/acetrainerf-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/beauty-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/beauty-gen2jp.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/biker-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/birdkeeper-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/blackbelt-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/blaine-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/blue-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/boarder-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/brock-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/bruno-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/bugcatcher-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/bugsy-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/burglar-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/camper-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/chuck-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/clair-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/erika-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/falkner-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/firebreather-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/fisherman-gen2jp.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/gentleman-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/hiker-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/janine-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/jasmine-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/juggler-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/karen-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/kimonogirl-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/koga-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/lance-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/lass-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/ltsurge-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/medium-gen2jp.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/misty-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/morty-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/oak-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/officer-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/picnicker-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/pokefan-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/pokefanf-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/pryce-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/psychic-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/red-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/rocketexecutive-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/rocketexecutivef-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/rocketgrunt-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/rocketgruntf-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/sabrina-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/sage-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/sage-gen2jp.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/sailor-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/schoolboy-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/scientist-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/silver-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/silver-gen2kanto.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/skier-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/supernerd-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/swimmerf-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/swimmerfjp-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/swimmerm-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/teacher-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/twins-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/whitney-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/will-gen2.png (100%) rename src/canonical/trainers/{ => gen2/gold-silver}/youngster-gen2.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/anabel-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/brandon-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/brendan-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/greta-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/juan-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/lucy-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/may-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/noland-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/spenser-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/tucker-gen3.png (100%) rename src/canonical/trainers/{ => gen3/emerald}/wallace-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/acetrainer-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/acetrainercouple-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/acetrainerf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/agatha-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/aromalady-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/beauty-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/biker-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/bill-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/birdkeeper-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/blackbelt-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/blaine-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/blue-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/blue-gen3champion.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/blue-gen3two.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/brock-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/bruno-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/bugcatcher-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/burglar-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/camper-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/channeler-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/crushgirl-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/crushkin-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/cueball-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/engineer-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/erika-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/fisherman-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/gamer-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/gentleman-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/giovanni-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/hiker-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/juggler-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/koga-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/lady-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/lance-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/lass-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/leaf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/lorelei-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/ltsurge-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/misty-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/mrfuji-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/oak-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/painter-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/picnicker-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/pokemaniac-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/pokemonbreederf-gen3frlg.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/pokemonranger-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/pokemonrangerf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/psychic-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/psychicf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/red-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/rocker-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/ruinmaniac-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/sabrina-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/sailor-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/scientist-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/sisandbro-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/supernerd-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/swimmerf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/swimmerm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/tamer-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/teamrocketgruntf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/teamrocketgruntm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/tuberf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/twins-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/youngcouple-gen3.png (100%) rename src/canonical/trainers/{ => gen3/firered-leafgreen}/youngster-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/acetrainer-gen3jp.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/acetrainer-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/acetrainerf-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/archie-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/aromalady-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/battlegirl-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/beauty-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/birch-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/birdkeeper-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/blackbelt-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/brawly-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/brendan-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/bugcatcher-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/bugmaniac-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/camper-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/collector-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/courtney-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/dragontamer-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/drake-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/expert-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/expertf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/fisherman-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/flannery-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/gentleman-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/glacia-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/guitarist-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/hexmaniac-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/hexmaniac-gen3jp.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/hiker-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/interviewers-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/kindler-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/lady-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/lass-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/matt-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/maxie-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/may-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/ninjaboy-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/norman-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/oldcouple-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/parasollady-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/phoebe-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/picnicker-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokefan-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokefanf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokemaniac-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokemonbreeder-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokemonbreederf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokemonranger-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/pokemonrangerf-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/psychic-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/psychicf-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/psychicfjp-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/richboy-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/roxanne-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/ruinmaniac-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/sailor-gen3jp.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/sailor-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/schoolkid-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/schoolkidf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/shelly-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/sidney-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/sisandbro-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/srandjr-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/steven-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/swimmerf-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/swimmerm-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/tabitha-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/tateandliza-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/teamaquabeta-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/teamaquagruntf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/teamaquagruntm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/teammagmagruntf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/teammagmagruntm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/triathletebikerf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/triathletebikerm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/triathleterunnerf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/triathleterunnerm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/triathleteswimmerf-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/triathleteswimmerm-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/tuber-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/tuberf-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/twins-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/wallace-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/wally-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/wattson-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/winona-gen3.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/youngcouple-gen3rs.png (100%) rename src/canonical/trainers/{ => gen3/ruby-sapphire}/youngster-gen3rs.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/aaron.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/acetrainer-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/acetrainerf-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/acetrainersnow.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/acetrainersnowf.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/aromalady.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/artist-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/barry.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/battlegirl-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/beauty-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/bellepa.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/bertha.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/birdkeeper-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/blackbelt-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/buck.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/bugcatcher.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/byron.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cameraman.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/camper.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/candice.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cheryl.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/clown.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/collector.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cowgirl.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/crasherwake.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cyclist-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cyclistf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cynthia-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/cyrus.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/dawn.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/doubleteam.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/dragontamer.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/fantina.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/fisherman-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/flint.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/galacticgrunt.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/galacticgruntf.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/gambler.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/gardenia.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/gentleman-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/guitarist-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/hiker-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/idol.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/interviewers.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/jogger.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/jupiter.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/lady-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/lass-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/lucas.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/lucian.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/madame-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/madame-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/marley.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/mars.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/maylene.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/mira.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/ninjaboy.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/palmer.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/parasollady-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/picnicker.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokefan-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokefanf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokekid.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokemonbreeder-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokemonbreederf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokemonranger-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/pokemonrangerf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/policeman-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/psychic-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/psychicf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/rancher.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/reporter.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/richboy-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/riley.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/roark.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/roughneck-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/ruinmaniac.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/sailor.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/saturn.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/schoolkid-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/schoolkidf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/scientist-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/sisandbro.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/skier.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/skierf-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/swimmer-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/swimmerf-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/tuber.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/tuberf.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/twins-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/veteran-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/volkner.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/waiter-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/waiter-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/waitress-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/worker-gen4.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/youngcouple-gen4dp.png (100%) rename src/canonical/trainers/{ => gen4/diamond-pearl}/youngster-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/acetrainer-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/acetrainercouple.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/acetrainerf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/archer.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/ariana.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/beauty.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/biker-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/birdkeeper.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/blackbelt-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/blaine.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/blue.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/boarder.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/brock.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/bruno.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/bugsy.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/burglar.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/chuck.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/clair.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/erika.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/ethan.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/eusine.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/falkner.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/firebreather.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/gentleman-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/giovanni.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/janine.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/jasmine.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/juggler.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/karen.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/kimonogirl.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/koga.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/lance.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/lass-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/li.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/ltsurge.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/lyra.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/medium.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/misty.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/morty.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/petrel.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/pokemaniac.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/proton.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/pryce.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/red.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/rocketgrunt.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/rocketgruntf.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/sabrina.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/sage.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/schoolkid-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/scientist-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/silver.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/skierf.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/supernerd.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/swimmer-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/swimmerf-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/teacher.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/twins-gen4.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/whitney.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/will.png (100%) rename src/canonical/trainers/{ => gen4/heartgold-soulsilver}/youngcouple.png (100%) rename src/canonical/trainers/{ => gen4/platinum}/argenta.png (100%) rename src/canonical/trainers/{ => gen4/platinum}/dahlia.png (100%) rename src/canonical/trainers/{ => gen4/platinum}/darach.png (100%) rename src/canonical/trainers/{ => gen4/platinum}/dawn-gen4pt.png (100%) rename src/canonical/trainers/{ => gen4/platinum}/lucas-gen4pt.png (100%) rename src/canonical/trainers/{ => gen4/platinum}/thorton.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/acetrainer.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/acetrainerf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/alder.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/artist.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/backers.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/backersf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/backpacker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/backpackerf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/baker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/battlegirl.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/bianca.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/biker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/blackbelt.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/brycen.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/burgh.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/caitlin.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/cheren.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/chili.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/cilan.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/clay.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/clerk-boss.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/clerk.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/clerkf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/cress.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/cyclist.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/cyclistf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/cynthia.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/dancer.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/depotagent.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/doctor.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/drayden.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/elesa.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/emmet.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/fisherman.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/gentleman.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/ghetsis-gen5bw.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/grimsley.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/harlequin.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hiker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hilbert-dueldisk.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hilbert.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hilda-dueldisk.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hilda.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hooligans.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/hoopster.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/infielder.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/ingo.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/iris.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/janitor.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/lady.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/lass.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/lenora.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/linebacker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/madame.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/maid.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/marshal.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/musician.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/n.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/nurse.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/nurseryaide.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/parasollady.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pilot.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/plasmagrunt-gen5bw.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/plasmagruntf-gen5bw.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pokefan.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pokefanf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pokemonbreeder.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pokemonbreederf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pokemonranger.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/pokemonrangerf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/policeman.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/preschooler.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/preschoolerf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/psychic.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/psychicf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/richboy.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/roughneck.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/schoolkid.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/schoolkidf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/scientist.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/scientistf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/shauntal.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/skyla.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/smasher.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/striker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/swimmer.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/swimmerf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/twins.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/veteran.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/veteranf.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/waiter.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/waitress.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/worker.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/workerice.png (100%) rename src/canonical/trainers/{ => gen5/black-white}/youngster.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/beauty-gen5bw2.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/bellelba.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/benga.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/bianca-pwt.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/brawly.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/brycenman.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/cheren-gen5bw2.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/colress.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/elesa-gen5bw2.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/flannery.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/ghetsis.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/guitarist.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/hugh.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/iris-gen5bw2.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/juan.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/liza.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/marlon.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/nate-dueldisk.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/nate.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/norman.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/plasmagrunt.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/plasmagruntf.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/rood.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/rosa-dueldisk.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/rosa.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/roxanne.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/roxie.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/shadowtriad.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/steven.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/tate.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/wallace.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/wattson.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/winona.png (100%) rename src/canonical/trainers/{ => gen5/black2-white2}/zinzolin.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen5/black-white}/juniper.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen5/black-white}/youngn.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/brawly-gen6.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/shelly.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/sidney.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/wallace-gen6.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/wally.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/winona-gen6.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/omegaruby-alphasapphire}/zinnia.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/az.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/bryony.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/clemont.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/drasna.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/evelyn.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/furisodegirl-black.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/furisodegirl-pink.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/korrina.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/malva.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/nita.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/olympia.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/ramos.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/siebold.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/tierno.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/valerie.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/viola.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/wikstrom.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/wulfric.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen6/x-y}/xerosic.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/acerola.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/aetheremployee.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/aetheremployeef.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/aetherfoundation.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/aetherfoundationf.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/anabel.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/beauty-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/blue-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/burnet.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/colress-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/dexio.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/elio.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/faba.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/gladion-stance.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/gladion.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/grimsley-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/guzma.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/hala.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/hapu.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/hau-stance.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/hau.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/hiker-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/ilima.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/kahili.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/kiawe.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/kukui-stand.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/kukui.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/lana.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/lass-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/lillie-z.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/lillie.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/lusamine-nihilego.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/lusamine.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/mallow.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/mina.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/molayne.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/nanu.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/officeworker.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/olivia.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/plumeria.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/pokemonbreeder-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/pokemonbreederf-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/preschoolers.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/red-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/risingstar.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/risingstarf.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/ryuki.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/samsonoak.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/selene.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/sightseer.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/sina.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/sophocles.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/teacher-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/theroyal.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/wicke.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/youngathlete.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/youngathletef.png (100%) rename src/{canonical/trainers => noncanonical/trainers/gen7/sun-moon}/youngster-gen7.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-alola.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-capbackward.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-hoenn.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-johto.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-kalos.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-sinnoh.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash-unova.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/ash.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/teamrocket.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/unknown.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/unknownf.png (100%) rename src/{canonical/trainers => noncanonical/trainers/misc}/yellow.png (100%) diff --git a/src/canonical/trainers/acetrainer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/acetrainer-gen1rb.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/acetrainer-gen1rb.png diff --git a/src/canonical/trainers/acetrainerf-gen1rb.png b/src/canonical/trainers/gen1/red-blue/acetrainerf-gen1rb.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/acetrainerf-gen1rb.png diff --git a/src/canonical/trainers/agatha-gen1rb.png b/src/canonical/trainers/gen1/red-blue/agatha-gen1rb.png similarity index 100% rename from src/canonical/trainers/agatha-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/agatha-gen1rb.png diff --git a/src/canonical/trainers/beauty-gen1rb.png b/src/canonical/trainers/gen1/red-blue/beauty-gen1rb.png similarity index 100% rename from src/canonical/trainers/beauty-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/beauty-gen1rb.png diff --git a/src/canonical/trainers/biker-gen1rb.png b/src/canonical/trainers/gen1/red-blue/biker-gen1rb.png similarity index 100% rename from src/canonical/trainers/biker-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/biker-gen1rb.png diff --git a/src/canonical/trainers/birdkeeper-gen1rb.png b/src/canonical/trainers/gen1/red-blue/birdkeeper-gen1rb.png similarity index 100% rename from src/canonical/trainers/birdkeeper-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/birdkeeper-gen1rb.png diff --git a/src/canonical/trainers/blackbelt-gen1rb.png b/src/canonical/trainers/gen1/red-blue/blackbelt-gen1rb.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/blackbelt-gen1rb.png diff --git a/src/canonical/trainers/blaine-gen1rb.png b/src/canonical/trainers/gen1/red-blue/blaine-gen1rb.png similarity index 100% rename from src/canonical/trainers/blaine-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/blaine-gen1rb.png diff --git a/src/canonical/trainers/blue-gen1rb.png b/src/canonical/trainers/gen1/red-blue/blue-gen1rb.png similarity index 100% rename from src/canonical/trainers/blue-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/blue-gen1rb.png diff --git a/src/canonical/trainers/blue-gen1rbchampion.png b/src/canonical/trainers/gen1/red-blue/blue-gen1rbchampion.png similarity index 100% rename from src/canonical/trainers/blue-gen1rbchampion.png rename to src/canonical/trainers/gen1/red-blue/blue-gen1rbchampion.png diff --git a/src/canonical/trainers/blue-gen1rbtwo.png b/src/canonical/trainers/gen1/red-blue/blue-gen1rbtwo.png similarity index 100% rename from src/canonical/trainers/blue-gen1rbtwo.png rename to src/canonical/trainers/gen1/red-blue/blue-gen1rbtwo.png diff --git a/src/canonical/trainers/brock-gen1rb.png b/src/canonical/trainers/gen1/red-blue/brock-gen1rb.png similarity index 100% rename from src/canonical/trainers/brock-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/brock-gen1rb.png diff --git a/src/canonical/trainers/bruno-gen1rb.png b/src/canonical/trainers/gen1/red-blue/bruno-gen1rb.png similarity index 100% rename from src/canonical/trainers/bruno-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/bruno-gen1rb.png diff --git a/src/canonical/trainers/bugcatcher-gen1rb.png b/src/canonical/trainers/gen1/red-blue/bugcatcher-gen1rb.png similarity index 100% rename from src/canonical/trainers/bugcatcher-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/bugcatcher-gen1rb.png diff --git a/src/canonical/trainers/burglar-gen1rb.png b/src/canonical/trainers/gen1/red-blue/burglar-gen1rb.png similarity index 100% rename from src/canonical/trainers/burglar-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/burglar-gen1rb.png diff --git a/src/canonical/trainers/channeler-gen1rb.png b/src/canonical/trainers/gen1/red-blue/channeler-gen1rb.png similarity index 100% rename from src/canonical/trainers/channeler-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/channeler-gen1rb.png diff --git a/src/canonical/trainers/cueball-gen1rb.png b/src/canonical/trainers/gen1/red-blue/cueball-gen1rb.png similarity index 100% rename from src/canonical/trainers/cueball-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/cueball-gen1rb.png diff --git a/src/canonical/trainers/engineer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/engineer-gen1rb.png similarity index 100% rename from src/canonical/trainers/engineer-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/engineer-gen1rb.png diff --git a/src/canonical/trainers/erika-gen1rb.png b/src/canonical/trainers/gen1/red-blue/erika-gen1rb.png similarity index 100% rename from src/canonical/trainers/erika-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/erika-gen1rb.png diff --git a/src/canonical/trainers/fisherman-gen1rb.png b/src/canonical/trainers/gen1/red-blue/fisherman-gen1rb.png similarity index 100% rename from src/canonical/trainers/fisherman-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/fisherman-gen1rb.png diff --git a/src/canonical/trainers/gambler-gen1rb.png b/src/canonical/trainers/gen1/red-blue/gambler-gen1rb.png similarity index 100% rename from src/canonical/trainers/gambler-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/gambler-gen1rb.png diff --git a/src/canonical/trainers/gentleman-gen1rb.png b/src/canonical/trainers/gen1/red-blue/gentleman-gen1rb.png similarity index 100% rename from src/canonical/trainers/gentleman-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/gentleman-gen1rb.png diff --git a/src/canonical/trainers/giovanni-gen1rb.png b/src/canonical/trainers/gen1/red-blue/giovanni-gen1rb.png similarity index 100% rename from src/canonical/trainers/giovanni-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/giovanni-gen1rb.png diff --git a/src/canonical/trainers/hiker-gen1rb.png b/src/canonical/trainers/gen1/red-blue/hiker-gen1rb.png similarity index 100% rename from src/canonical/trainers/hiker-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/hiker-gen1rb.png diff --git a/src/canonical/trainers/jrtrainer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/jrtrainer-gen1rb.png similarity index 100% rename from src/canonical/trainers/jrtrainer-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/jrtrainer-gen1rb.png diff --git a/src/canonical/trainers/jrtrainerf-gen1rb.png b/src/canonical/trainers/gen1/red-blue/jrtrainerf-gen1rb.png similarity index 100% rename from src/canonical/trainers/jrtrainerf-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/jrtrainerf-gen1rb.png diff --git a/src/canonical/trainers/juggler-gen1rb.png b/src/canonical/trainers/gen1/red-blue/juggler-gen1rb.png similarity index 100% rename from src/canonical/trainers/juggler-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/juggler-gen1rb.png diff --git a/src/canonical/trainers/koga-gen1rb.png b/src/canonical/trainers/gen1/red-blue/koga-gen1rb.png similarity index 100% rename from src/canonical/trainers/koga-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/koga-gen1rb.png diff --git a/src/canonical/trainers/lance-gen1rb.png b/src/canonical/trainers/gen1/red-blue/lance-gen1rb.png similarity index 100% rename from src/canonical/trainers/lance-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/lance-gen1rb.png diff --git a/src/canonical/trainers/lass-gen1rb.png b/src/canonical/trainers/gen1/red-blue/lass-gen1rb.png similarity index 100% rename from src/canonical/trainers/lass-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/lass-gen1rb.png diff --git a/src/canonical/trainers/lorelei-gen1rb.png b/src/canonical/trainers/gen1/red-blue/lorelei-gen1rb.png similarity index 100% rename from src/canonical/trainers/lorelei-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/lorelei-gen1rb.png diff --git a/src/canonical/trainers/ltsurge-gen1rb.png b/src/canonical/trainers/gen1/red-blue/ltsurge-gen1rb.png similarity index 100% rename from src/canonical/trainers/ltsurge-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/ltsurge-gen1rb.png diff --git a/src/canonical/trainers/misty-gen1rb.png b/src/canonical/trainers/gen1/red-blue/misty-gen1rb.png similarity index 100% rename from src/canonical/trainers/misty-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/misty-gen1rb.png diff --git a/src/canonical/trainers/oak-gen1rb.png b/src/canonical/trainers/gen1/red-blue/oak-gen1rb.png similarity index 100% rename from src/canonical/trainers/oak-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/oak-gen1rb.png diff --git a/src/canonical/trainers/pokemaniac-gen1rb.png b/src/canonical/trainers/gen1/red-blue/pokemaniac-gen1rb.png similarity index 100% rename from src/canonical/trainers/pokemaniac-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/pokemaniac-gen1rb.png diff --git a/src/canonical/trainers/psychic-gen1rb.png b/src/canonical/trainers/gen1/red-blue/psychic-gen1rb.png similarity index 100% rename from src/canonical/trainers/psychic-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/psychic-gen1rb.png diff --git a/src/canonical/trainers/red-gen1main.png b/src/canonical/trainers/gen1/red-blue/red-gen1main.png similarity index 100% rename from src/canonical/trainers/red-gen1main.png rename to src/canonical/trainers/gen1/red-blue/red-gen1main.png diff --git a/src/canonical/trainers/red-gen1rb.png b/src/canonical/trainers/gen1/red-blue/red-gen1rb.png similarity index 100% rename from src/canonical/trainers/red-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/red-gen1rb.png diff --git a/src/canonical/trainers/red-gen1title.png b/src/canonical/trainers/gen1/red-blue/red-gen1title.png similarity index 100% rename from src/canonical/trainers/red-gen1title.png rename to src/canonical/trainers/gen1/red-blue/red-gen1title.png diff --git a/src/canonical/trainers/rocker-gen1rb.png b/src/canonical/trainers/gen1/red-blue/rocker-gen1rb.png similarity index 100% rename from src/canonical/trainers/rocker-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/rocker-gen1rb.png diff --git a/src/canonical/trainers/rocket-gen1rb.png b/src/canonical/trainers/gen1/red-blue/rocket-gen1rb.png similarity index 100% rename from src/canonical/trainers/rocket-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/rocket-gen1rb.png diff --git a/src/canonical/trainers/sabrina-gen1rb.png b/src/canonical/trainers/gen1/red-blue/sabrina-gen1rb.png similarity index 100% rename from src/canonical/trainers/sabrina-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/sabrina-gen1rb.png diff --git a/src/canonical/trainers/sailor-gen1rb.png b/src/canonical/trainers/gen1/red-blue/sailor-gen1rb.png similarity index 100% rename from src/canonical/trainers/sailor-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/sailor-gen1rb.png diff --git a/src/canonical/trainers/scientist-gen1rb.png b/src/canonical/trainers/gen1/red-blue/scientist-gen1rb.png similarity index 100% rename from src/canonical/trainers/scientist-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/scientist-gen1rb.png diff --git a/src/canonical/trainers/supernerd-gen1rb.png b/src/canonical/trainers/gen1/red-blue/supernerd-gen1rb.png similarity index 100% rename from src/canonical/trainers/supernerd-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/supernerd-gen1rb.png diff --git a/src/canonical/trainers/swimmer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/swimmer-gen1rb.png similarity index 100% rename from src/canonical/trainers/swimmer-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/swimmer-gen1rb.png diff --git a/src/canonical/trainers/tamer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/tamer-gen1rb.png similarity index 100% rename from src/canonical/trainers/tamer-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/tamer-gen1rb.png diff --git a/src/canonical/trainers/youngster-gen1rb.png b/src/canonical/trainers/gen1/red-blue/youngster-gen1rb.png similarity index 100% rename from src/canonical/trainers/youngster-gen1rb.png rename to src/canonical/trainers/gen1/red-blue/youngster-gen1rb.png diff --git a/src/canonical/trainers/acetrainer-gen1.png b/src/canonical/trainers/gen1/yellow/acetrainer-gen1.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen1.png rename to src/canonical/trainers/gen1/yellow/acetrainer-gen1.png diff --git a/src/canonical/trainers/acetrainerf-gen1.png b/src/canonical/trainers/gen1/yellow/acetrainerf-gen1.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen1.png rename to src/canonical/trainers/gen1/yellow/acetrainerf-gen1.png diff --git a/src/canonical/trainers/agatha-gen1.png b/src/canonical/trainers/gen1/yellow/agatha-gen1.png similarity index 100% rename from src/canonical/trainers/agatha-gen1.png rename to src/canonical/trainers/gen1/yellow/agatha-gen1.png diff --git a/src/canonical/trainers/beauty-gen1.png b/src/canonical/trainers/gen1/yellow/beauty-gen1.png similarity index 100% rename from src/canonical/trainers/beauty-gen1.png rename to src/canonical/trainers/gen1/yellow/beauty-gen1.png diff --git a/src/canonical/trainers/biker-gen1.png b/src/canonical/trainers/gen1/yellow/biker-gen1.png similarity index 100% rename from src/canonical/trainers/biker-gen1.png rename to src/canonical/trainers/gen1/yellow/biker-gen1.png diff --git a/src/canonical/trainers/birdkeeper-gen1.png b/src/canonical/trainers/gen1/yellow/birdkeeper-gen1.png similarity index 100% rename from src/canonical/trainers/birdkeeper-gen1.png rename to src/canonical/trainers/gen1/yellow/birdkeeper-gen1.png diff --git a/src/canonical/trainers/blackbelt-gen1.png b/src/canonical/trainers/gen1/yellow/blackbelt-gen1.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen1.png rename to src/canonical/trainers/gen1/yellow/blackbelt-gen1.png diff --git a/src/canonical/trainers/blaine-gen1.png b/src/canonical/trainers/gen1/yellow/blaine-gen1.png similarity index 100% rename from src/canonical/trainers/blaine-gen1.png rename to src/canonical/trainers/gen1/yellow/blaine-gen1.png diff --git a/src/canonical/trainers/blue-gen1.png b/src/canonical/trainers/gen1/yellow/blue-gen1.png similarity index 100% rename from src/canonical/trainers/blue-gen1.png rename to src/canonical/trainers/gen1/yellow/blue-gen1.png diff --git a/src/canonical/trainers/blue-gen1champion.png b/src/canonical/trainers/gen1/yellow/blue-gen1champion.png similarity index 100% rename from src/canonical/trainers/blue-gen1champion.png rename to src/canonical/trainers/gen1/yellow/blue-gen1champion.png diff --git a/src/canonical/trainers/blue-gen1two.png b/src/canonical/trainers/gen1/yellow/blue-gen1two.png similarity index 100% rename from src/canonical/trainers/blue-gen1two.png rename to src/canonical/trainers/gen1/yellow/blue-gen1two.png diff --git a/src/canonical/trainers/brock-gen1.png b/src/canonical/trainers/gen1/yellow/brock-gen1.png similarity index 100% rename from src/canonical/trainers/brock-gen1.png rename to src/canonical/trainers/gen1/yellow/brock-gen1.png diff --git a/src/canonical/trainers/bruno-gen1.png b/src/canonical/trainers/gen1/yellow/bruno-gen1.png similarity index 100% rename from src/canonical/trainers/bruno-gen1.png rename to src/canonical/trainers/gen1/yellow/bruno-gen1.png diff --git a/src/canonical/trainers/bugcatcher-gen1.png b/src/canonical/trainers/gen1/yellow/bugcatcher-gen1.png similarity index 100% rename from src/canonical/trainers/bugcatcher-gen1.png rename to src/canonical/trainers/gen1/yellow/bugcatcher-gen1.png diff --git a/src/canonical/trainers/burglar-gen1.png b/src/canonical/trainers/gen1/yellow/burglar-gen1.png similarity index 100% rename from src/canonical/trainers/burglar-gen1.png rename to src/canonical/trainers/gen1/yellow/burglar-gen1.png diff --git a/src/canonical/trainers/channeler-gen1.png b/src/canonical/trainers/gen1/yellow/channeler-gen1.png similarity index 100% rename from src/canonical/trainers/channeler-gen1.png rename to src/canonical/trainers/gen1/yellow/channeler-gen1.png diff --git a/src/canonical/trainers/cueball-gen1.png b/src/canonical/trainers/gen1/yellow/cueball-gen1.png similarity index 100% rename from src/canonical/trainers/cueball-gen1.png rename to src/canonical/trainers/gen1/yellow/cueball-gen1.png diff --git a/src/canonical/trainers/engineer-gen1.png b/src/canonical/trainers/gen1/yellow/engineer-gen1.png similarity index 100% rename from src/canonical/trainers/engineer-gen1.png rename to src/canonical/trainers/gen1/yellow/engineer-gen1.png diff --git a/src/canonical/trainers/erika-gen1.png b/src/canonical/trainers/gen1/yellow/erika-gen1.png similarity index 100% rename from src/canonical/trainers/erika-gen1.png rename to src/canonical/trainers/gen1/yellow/erika-gen1.png diff --git a/src/canonical/trainers/fisherman-gen1.png b/src/canonical/trainers/gen1/yellow/fisherman-gen1.png similarity index 100% rename from src/canonical/trainers/fisherman-gen1.png rename to src/canonical/trainers/gen1/yellow/fisherman-gen1.png diff --git a/src/canonical/trainers/gambler-gen1.png b/src/canonical/trainers/gen1/yellow/gambler-gen1.png similarity index 100% rename from src/canonical/trainers/gambler-gen1.png rename to src/canonical/trainers/gen1/yellow/gambler-gen1.png diff --git a/src/canonical/trainers/gentleman-gen1.png b/src/canonical/trainers/gen1/yellow/gentleman-gen1.png similarity index 100% rename from src/canonical/trainers/gentleman-gen1.png rename to src/canonical/trainers/gen1/yellow/gentleman-gen1.png diff --git a/src/canonical/trainers/giovanni-gen1.png b/src/canonical/trainers/gen1/yellow/giovanni-gen1.png similarity index 100% rename from src/canonical/trainers/giovanni-gen1.png rename to src/canonical/trainers/gen1/yellow/giovanni-gen1.png diff --git a/src/canonical/trainers/hiker-gen1.png b/src/canonical/trainers/gen1/yellow/hiker-gen1.png similarity index 100% rename from src/canonical/trainers/hiker-gen1.png rename to src/canonical/trainers/gen1/yellow/hiker-gen1.png diff --git a/src/canonical/trainers/jessiejames-gen1.png b/src/canonical/trainers/gen1/yellow/jessiejames-gen1.png similarity index 100% rename from src/canonical/trainers/jessiejames-gen1.png rename to src/canonical/trainers/gen1/yellow/jessiejames-gen1.png diff --git a/src/canonical/trainers/jrtrainer-gen1.png b/src/canonical/trainers/gen1/yellow/jrtrainer-gen1.png similarity index 100% rename from src/canonical/trainers/jrtrainer-gen1.png rename to src/canonical/trainers/gen1/yellow/jrtrainer-gen1.png diff --git a/src/canonical/trainers/jrtrainerf-gen1.png b/src/canonical/trainers/gen1/yellow/jrtrainerf-gen1.png similarity index 100% rename from src/canonical/trainers/jrtrainerf-gen1.png rename to src/canonical/trainers/gen1/yellow/jrtrainerf-gen1.png diff --git a/src/canonical/trainers/juggler-gen1.png b/src/canonical/trainers/gen1/yellow/juggler-gen1.png similarity index 100% rename from src/canonical/trainers/juggler-gen1.png rename to src/canonical/trainers/gen1/yellow/juggler-gen1.png diff --git a/src/canonical/trainers/koga-gen1.png b/src/canonical/trainers/gen1/yellow/koga-gen1.png similarity index 100% rename from src/canonical/trainers/koga-gen1.png rename to src/canonical/trainers/gen1/yellow/koga-gen1.png diff --git a/src/canonical/trainers/lance-gen1.png b/src/canonical/trainers/gen1/yellow/lance-gen1.png similarity index 100% rename from src/canonical/trainers/lance-gen1.png rename to src/canonical/trainers/gen1/yellow/lance-gen1.png diff --git a/src/canonical/trainers/lass-gen1.png b/src/canonical/trainers/gen1/yellow/lass-gen1.png similarity index 100% rename from src/canonical/trainers/lass-gen1.png rename to src/canonical/trainers/gen1/yellow/lass-gen1.png diff --git a/src/canonical/trainers/lorelei-gen1.png b/src/canonical/trainers/gen1/yellow/lorelei-gen1.png similarity index 100% rename from src/canonical/trainers/lorelei-gen1.png rename to src/canonical/trainers/gen1/yellow/lorelei-gen1.png diff --git a/src/canonical/trainers/ltsurge-gen1.png b/src/canonical/trainers/gen1/yellow/ltsurge-gen1.png similarity index 100% rename from src/canonical/trainers/ltsurge-gen1.png rename to src/canonical/trainers/gen1/yellow/ltsurge-gen1.png diff --git a/src/canonical/trainers/misty-gen1.png b/src/canonical/trainers/gen1/yellow/misty-gen1.png similarity index 100% rename from src/canonical/trainers/misty-gen1.png rename to src/canonical/trainers/gen1/yellow/misty-gen1.png diff --git a/src/canonical/trainers/oak-gen1.png b/src/canonical/trainers/gen1/yellow/oak-gen1.png similarity index 100% rename from src/canonical/trainers/oak-gen1.png rename to src/canonical/trainers/gen1/yellow/oak-gen1.png diff --git a/src/canonical/trainers/pokemaniac-gen1.png b/src/canonical/trainers/gen1/yellow/pokemaniac-gen1.png similarity index 100% rename from src/canonical/trainers/pokemaniac-gen1.png rename to src/canonical/trainers/gen1/yellow/pokemaniac-gen1.png diff --git a/src/canonical/trainers/psychic-gen1.png b/src/canonical/trainers/gen1/yellow/psychic-gen1.png similarity index 100% rename from src/canonical/trainers/psychic-gen1.png rename to src/canonical/trainers/gen1/yellow/psychic-gen1.png diff --git a/src/canonical/trainers/red-gen1.png b/src/canonical/trainers/gen1/yellow/red-gen1.png similarity index 100% rename from src/canonical/trainers/red-gen1.png rename to src/canonical/trainers/gen1/yellow/red-gen1.png diff --git a/src/canonical/trainers/rocker-gen1.png b/src/canonical/trainers/gen1/yellow/rocker-gen1.png similarity index 100% rename from src/canonical/trainers/rocker-gen1.png rename to src/canonical/trainers/gen1/yellow/rocker-gen1.png diff --git a/src/canonical/trainers/rocket-gen1.png b/src/canonical/trainers/gen1/yellow/rocket-gen1.png similarity index 100% rename from src/canonical/trainers/rocket-gen1.png rename to src/canonical/trainers/gen1/yellow/rocket-gen1.png diff --git a/src/canonical/trainers/sabrina-gen1.png b/src/canonical/trainers/gen1/yellow/sabrina-gen1.png similarity index 100% rename from src/canonical/trainers/sabrina-gen1.png rename to src/canonical/trainers/gen1/yellow/sabrina-gen1.png diff --git a/src/canonical/trainers/sailor-gen1.png b/src/canonical/trainers/gen1/yellow/sailor-gen1.png similarity index 100% rename from src/canonical/trainers/sailor-gen1.png rename to src/canonical/trainers/gen1/yellow/sailor-gen1.png diff --git a/src/canonical/trainers/scientist-gen1.png b/src/canonical/trainers/gen1/yellow/scientist-gen1.png similarity index 100% rename from src/canonical/trainers/scientist-gen1.png rename to src/canonical/trainers/gen1/yellow/scientist-gen1.png diff --git a/src/canonical/trainers/supernerd-gen1.png b/src/canonical/trainers/gen1/yellow/supernerd-gen1.png similarity index 100% rename from src/canonical/trainers/supernerd-gen1.png rename to src/canonical/trainers/gen1/yellow/supernerd-gen1.png diff --git a/src/canonical/trainers/swimmer-gen1.png b/src/canonical/trainers/gen1/yellow/swimmer-gen1.png similarity index 100% rename from src/canonical/trainers/swimmer-gen1.png rename to src/canonical/trainers/gen1/yellow/swimmer-gen1.png diff --git a/src/canonical/trainers/tamer-gen1.png b/src/canonical/trainers/gen1/yellow/tamer-gen1.png similarity index 100% rename from src/canonical/trainers/tamer-gen1.png rename to src/canonical/trainers/gen1/yellow/tamer-gen1.png diff --git a/src/canonical/trainers/youngster-gen1.png b/src/canonical/trainers/gen1/yellow/youngster-gen1.png similarity index 100% rename from src/canonical/trainers/youngster-gen1.png rename to src/canonical/trainers/gen1/yellow/youngster-gen1.png diff --git a/src/canonical/trainers/ethan-gen2.png b/src/canonical/trainers/gen2/crystal/ethan-gen2.png similarity index 100% rename from src/canonical/trainers/ethan-gen2.png rename to src/canonical/trainers/gen2/crystal/ethan-gen2.png diff --git a/src/canonical/trainers/ethan-gen2c.png b/src/canonical/trainers/gen2/crystal/ethan-gen2c.png similarity index 100% rename from src/canonical/trainers/ethan-gen2c.png rename to src/canonical/trainers/gen2/crystal/ethan-gen2c.png diff --git a/src/canonical/trainers/eusine-gen2.png b/src/canonical/trainers/gen2/crystal/eusine-gen2.png similarity index 100% rename from src/canonical/trainers/eusine-gen2.png rename to src/canonical/trainers/gen2/crystal/eusine-gen2.png diff --git a/src/canonical/trainers/kris-gen2.png b/src/canonical/trainers/gen2/crystal/kris-gen2.png similarity index 100% rename from src/canonical/trainers/kris-gen2.png rename to src/canonical/trainers/gen2/crystal/kris-gen2.png diff --git a/src/canonical/trainers/acetrainer-gen2.png b/src/canonical/trainers/gen2/gold-silver/acetrainer-gen2.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen2.png rename to src/canonical/trainers/gen2/gold-silver/acetrainer-gen2.png diff --git a/src/canonical/trainers/acetrainerf-gen2.png b/src/canonical/trainers/gen2/gold-silver/acetrainerf-gen2.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen2.png rename to src/canonical/trainers/gen2/gold-silver/acetrainerf-gen2.png diff --git a/src/canonical/trainers/beauty-gen2.png b/src/canonical/trainers/gen2/gold-silver/beauty-gen2.png similarity index 100% rename from src/canonical/trainers/beauty-gen2.png rename to src/canonical/trainers/gen2/gold-silver/beauty-gen2.png diff --git a/src/canonical/trainers/beauty-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/beauty-gen2jp.png similarity index 100% rename from src/canonical/trainers/beauty-gen2jp.png rename to src/canonical/trainers/gen2/gold-silver/beauty-gen2jp.png diff --git a/src/canonical/trainers/biker-gen2.png b/src/canonical/trainers/gen2/gold-silver/biker-gen2.png similarity index 100% rename from src/canonical/trainers/biker-gen2.png rename to src/canonical/trainers/gen2/gold-silver/biker-gen2.png diff --git a/src/canonical/trainers/birdkeeper-gen2.png b/src/canonical/trainers/gen2/gold-silver/birdkeeper-gen2.png similarity index 100% rename from src/canonical/trainers/birdkeeper-gen2.png rename to src/canonical/trainers/gen2/gold-silver/birdkeeper-gen2.png diff --git a/src/canonical/trainers/blackbelt-gen2.png b/src/canonical/trainers/gen2/gold-silver/blackbelt-gen2.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen2.png rename to src/canonical/trainers/gen2/gold-silver/blackbelt-gen2.png diff --git a/src/canonical/trainers/blaine-gen2.png b/src/canonical/trainers/gen2/gold-silver/blaine-gen2.png similarity index 100% rename from src/canonical/trainers/blaine-gen2.png rename to src/canonical/trainers/gen2/gold-silver/blaine-gen2.png diff --git a/src/canonical/trainers/blue-gen2.png b/src/canonical/trainers/gen2/gold-silver/blue-gen2.png similarity index 100% rename from src/canonical/trainers/blue-gen2.png rename to src/canonical/trainers/gen2/gold-silver/blue-gen2.png diff --git a/src/canonical/trainers/boarder-gen2.png b/src/canonical/trainers/gen2/gold-silver/boarder-gen2.png similarity index 100% rename from src/canonical/trainers/boarder-gen2.png rename to src/canonical/trainers/gen2/gold-silver/boarder-gen2.png diff --git a/src/canonical/trainers/brock-gen2.png b/src/canonical/trainers/gen2/gold-silver/brock-gen2.png similarity index 100% rename from src/canonical/trainers/brock-gen2.png rename to src/canonical/trainers/gen2/gold-silver/brock-gen2.png diff --git a/src/canonical/trainers/bruno-gen2.png b/src/canonical/trainers/gen2/gold-silver/bruno-gen2.png similarity index 100% rename from src/canonical/trainers/bruno-gen2.png rename to src/canonical/trainers/gen2/gold-silver/bruno-gen2.png diff --git a/src/canonical/trainers/bugcatcher-gen2.png b/src/canonical/trainers/gen2/gold-silver/bugcatcher-gen2.png similarity index 100% rename from src/canonical/trainers/bugcatcher-gen2.png rename to src/canonical/trainers/gen2/gold-silver/bugcatcher-gen2.png diff --git a/src/canonical/trainers/bugsy-gen2.png b/src/canonical/trainers/gen2/gold-silver/bugsy-gen2.png similarity index 100% rename from src/canonical/trainers/bugsy-gen2.png rename to src/canonical/trainers/gen2/gold-silver/bugsy-gen2.png diff --git a/src/canonical/trainers/burglar-gen2.png b/src/canonical/trainers/gen2/gold-silver/burglar-gen2.png similarity index 100% rename from src/canonical/trainers/burglar-gen2.png rename to src/canonical/trainers/gen2/gold-silver/burglar-gen2.png diff --git a/src/canonical/trainers/camper-gen2.png b/src/canonical/trainers/gen2/gold-silver/camper-gen2.png similarity index 100% rename from src/canonical/trainers/camper-gen2.png rename to src/canonical/trainers/gen2/gold-silver/camper-gen2.png diff --git a/src/canonical/trainers/chuck-gen2.png b/src/canonical/trainers/gen2/gold-silver/chuck-gen2.png similarity index 100% rename from src/canonical/trainers/chuck-gen2.png rename to src/canonical/trainers/gen2/gold-silver/chuck-gen2.png diff --git a/src/canonical/trainers/clair-gen2.png b/src/canonical/trainers/gen2/gold-silver/clair-gen2.png similarity index 100% rename from src/canonical/trainers/clair-gen2.png rename to src/canonical/trainers/gen2/gold-silver/clair-gen2.png diff --git a/src/canonical/trainers/erika-gen2.png b/src/canonical/trainers/gen2/gold-silver/erika-gen2.png similarity index 100% rename from src/canonical/trainers/erika-gen2.png rename to src/canonical/trainers/gen2/gold-silver/erika-gen2.png diff --git a/src/canonical/trainers/falkner-gen2.png b/src/canonical/trainers/gen2/gold-silver/falkner-gen2.png similarity index 100% rename from src/canonical/trainers/falkner-gen2.png rename to src/canonical/trainers/gen2/gold-silver/falkner-gen2.png diff --git a/src/canonical/trainers/firebreather-gen2.png b/src/canonical/trainers/gen2/gold-silver/firebreather-gen2.png similarity index 100% rename from src/canonical/trainers/firebreather-gen2.png rename to src/canonical/trainers/gen2/gold-silver/firebreather-gen2.png diff --git a/src/canonical/trainers/fisherman-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/fisherman-gen2jp.png similarity index 100% rename from src/canonical/trainers/fisherman-gen2jp.png rename to src/canonical/trainers/gen2/gold-silver/fisherman-gen2jp.png diff --git a/src/canonical/trainers/gentleman-gen2.png b/src/canonical/trainers/gen2/gold-silver/gentleman-gen2.png similarity index 100% rename from src/canonical/trainers/gentleman-gen2.png rename to src/canonical/trainers/gen2/gold-silver/gentleman-gen2.png diff --git a/src/canonical/trainers/hiker-gen2.png b/src/canonical/trainers/gen2/gold-silver/hiker-gen2.png similarity index 100% rename from src/canonical/trainers/hiker-gen2.png rename to src/canonical/trainers/gen2/gold-silver/hiker-gen2.png diff --git a/src/canonical/trainers/janine-gen2.png b/src/canonical/trainers/gen2/gold-silver/janine-gen2.png similarity index 100% rename from src/canonical/trainers/janine-gen2.png rename to src/canonical/trainers/gen2/gold-silver/janine-gen2.png diff --git a/src/canonical/trainers/jasmine-gen2.png b/src/canonical/trainers/gen2/gold-silver/jasmine-gen2.png similarity index 100% rename from src/canonical/trainers/jasmine-gen2.png rename to src/canonical/trainers/gen2/gold-silver/jasmine-gen2.png diff --git a/src/canonical/trainers/juggler-gen2.png b/src/canonical/trainers/gen2/gold-silver/juggler-gen2.png similarity index 100% rename from src/canonical/trainers/juggler-gen2.png rename to src/canonical/trainers/gen2/gold-silver/juggler-gen2.png diff --git a/src/canonical/trainers/karen-gen2.png b/src/canonical/trainers/gen2/gold-silver/karen-gen2.png similarity index 100% rename from src/canonical/trainers/karen-gen2.png rename to src/canonical/trainers/gen2/gold-silver/karen-gen2.png diff --git a/src/canonical/trainers/kimonogirl-gen2.png b/src/canonical/trainers/gen2/gold-silver/kimonogirl-gen2.png similarity index 100% rename from src/canonical/trainers/kimonogirl-gen2.png rename to src/canonical/trainers/gen2/gold-silver/kimonogirl-gen2.png diff --git a/src/canonical/trainers/koga-gen2.png b/src/canonical/trainers/gen2/gold-silver/koga-gen2.png similarity index 100% rename from src/canonical/trainers/koga-gen2.png rename to src/canonical/trainers/gen2/gold-silver/koga-gen2.png diff --git a/src/canonical/trainers/lance-gen2.png b/src/canonical/trainers/gen2/gold-silver/lance-gen2.png similarity index 100% rename from src/canonical/trainers/lance-gen2.png rename to src/canonical/trainers/gen2/gold-silver/lance-gen2.png diff --git a/src/canonical/trainers/lass-gen2.png b/src/canonical/trainers/gen2/gold-silver/lass-gen2.png similarity index 100% rename from src/canonical/trainers/lass-gen2.png rename to src/canonical/trainers/gen2/gold-silver/lass-gen2.png diff --git a/src/canonical/trainers/ltsurge-gen2.png b/src/canonical/trainers/gen2/gold-silver/ltsurge-gen2.png similarity index 100% rename from src/canonical/trainers/ltsurge-gen2.png rename to src/canonical/trainers/gen2/gold-silver/ltsurge-gen2.png diff --git a/src/canonical/trainers/medium-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/medium-gen2jp.png similarity index 100% rename from src/canonical/trainers/medium-gen2jp.png rename to src/canonical/trainers/gen2/gold-silver/medium-gen2jp.png diff --git a/src/canonical/trainers/misty-gen2.png b/src/canonical/trainers/gen2/gold-silver/misty-gen2.png similarity index 100% rename from src/canonical/trainers/misty-gen2.png rename to src/canonical/trainers/gen2/gold-silver/misty-gen2.png diff --git a/src/canonical/trainers/morty-gen2.png b/src/canonical/trainers/gen2/gold-silver/morty-gen2.png similarity index 100% rename from src/canonical/trainers/morty-gen2.png rename to src/canonical/trainers/gen2/gold-silver/morty-gen2.png diff --git a/src/canonical/trainers/oak-gen2.png b/src/canonical/trainers/gen2/gold-silver/oak-gen2.png similarity index 100% rename from src/canonical/trainers/oak-gen2.png rename to src/canonical/trainers/gen2/gold-silver/oak-gen2.png diff --git a/src/canonical/trainers/officer-gen2.png b/src/canonical/trainers/gen2/gold-silver/officer-gen2.png similarity index 100% rename from src/canonical/trainers/officer-gen2.png rename to src/canonical/trainers/gen2/gold-silver/officer-gen2.png diff --git a/src/canonical/trainers/picnicker-gen2.png b/src/canonical/trainers/gen2/gold-silver/picnicker-gen2.png similarity index 100% rename from src/canonical/trainers/picnicker-gen2.png rename to src/canonical/trainers/gen2/gold-silver/picnicker-gen2.png diff --git a/src/canonical/trainers/pokefan-gen2.png b/src/canonical/trainers/gen2/gold-silver/pokefan-gen2.png similarity index 100% rename from src/canonical/trainers/pokefan-gen2.png rename to src/canonical/trainers/gen2/gold-silver/pokefan-gen2.png diff --git a/src/canonical/trainers/pokefanf-gen2.png b/src/canonical/trainers/gen2/gold-silver/pokefanf-gen2.png similarity index 100% rename from src/canonical/trainers/pokefanf-gen2.png rename to src/canonical/trainers/gen2/gold-silver/pokefanf-gen2.png diff --git a/src/canonical/trainers/pryce-gen2.png b/src/canonical/trainers/gen2/gold-silver/pryce-gen2.png similarity index 100% rename from src/canonical/trainers/pryce-gen2.png rename to src/canonical/trainers/gen2/gold-silver/pryce-gen2.png diff --git a/src/canonical/trainers/psychic-gen2.png b/src/canonical/trainers/gen2/gold-silver/psychic-gen2.png similarity index 100% rename from src/canonical/trainers/psychic-gen2.png rename to src/canonical/trainers/gen2/gold-silver/psychic-gen2.png diff --git a/src/canonical/trainers/red-gen2.png b/src/canonical/trainers/gen2/gold-silver/red-gen2.png similarity index 100% rename from src/canonical/trainers/red-gen2.png rename to src/canonical/trainers/gen2/gold-silver/red-gen2.png diff --git a/src/canonical/trainers/rocketexecutive-gen2.png b/src/canonical/trainers/gen2/gold-silver/rocketexecutive-gen2.png similarity index 100% rename from src/canonical/trainers/rocketexecutive-gen2.png rename to src/canonical/trainers/gen2/gold-silver/rocketexecutive-gen2.png diff --git a/src/canonical/trainers/rocketexecutivef-gen2.png b/src/canonical/trainers/gen2/gold-silver/rocketexecutivef-gen2.png similarity index 100% rename from src/canonical/trainers/rocketexecutivef-gen2.png rename to src/canonical/trainers/gen2/gold-silver/rocketexecutivef-gen2.png diff --git a/src/canonical/trainers/rocketgrunt-gen2.png b/src/canonical/trainers/gen2/gold-silver/rocketgrunt-gen2.png similarity index 100% rename from src/canonical/trainers/rocketgrunt-gen2.png rename to src/canonical/trainers/gen2/gold-silver/rocketgrunt-gen2.png diff --git a/src/canonical/trainers/rocketgruntf-gen2.png b/src/canonical/trainers/gen2/gold-silver/rocketgruntf-gen2.png similarity index 100% rename from src/canonical/trainers/rocketgruntf-gen2.png rename to src/canonical/trainers/gen2/gold-silver/rocketgruntf-gen2.png diff --git a/src/canonical/trainers/sabrina-gen2.png b/src/canonical/trainers/gen2/gold-silver/sabrina-gen2.png similarity index 100% rename from src/canonical/trainers/sabrina-gen2.png rename to src/canonical/trainers/gen2/gold-silver/sabrina-gen2.png diff --git a/src/canonical/trainers/sage-gen2.png b/src/canonical/trainers/gen2/gold-silver/sage-gen2.png similarity index 100% rename from src/canonical/trainers/sage-gen2.png rename to src/canonical/trainers/gen2/gold-silver/sage-gen2.png diff --git a/src/canonical/trainers/sage-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/sage-gen2jp.png similarity index 100% rename from src/canonical/trainers/sage-gen2jp.png rename to src/canonical/trainers/gen2/gold-silver/sage-gen2jp.png diff --git a/src/canonical/trainers/sailor-gen2.png b/src/canonical/trainers/gen2/gold-silver/sailor-gen2.png similarity index 100% rename from src/canonical/trainers/sailor-gen2.png rename to src/canonical/trainers/gen2/gold-silver/sailor-gen2.png diff --git a/src/canonical/trainers/schoolboy-gen2.png b/src/canonical/trainers/gen2/gold-silver/schoolboy-gen2.png similarity index 100% rename from src/canonical/trainers/schoolboy-gen2.png rename to src/canonical/trainers/gen2/gold-silver/schoolboy-gen2.png diff --git a/src/canonical/trainers/scientist-gen2.png b/src/canonical/trainers/gen2/gold-silver/scientist-gen2.png similarity index 100% rename from src/canonical/trainers/scientist-gen2.png rename to src/canonical/trainers/gen2/gold-silver/scientist-gen2.png diff --git a/src/canonical/trainers/silver-gen2.png b/src/canonical/trainers/gen2/gold-silver/silver-gen2.png similarity index 100% rename from src/canonical/trainers/silver-gen2.png rename to src/canonical/trainers/gen2/gold-silver/silver-gen2.png diff --git a/src/canonical/trainers/silver-gen2kanto.png b/src/canonical/trainers/gen2/gold-silver/silver-gen2kanto.png similarity index 100% rename from src/canonical/trainers/silver-gen2kanto.png rename to src/canonical/trainers/gen2/gold-silver/silver-gen2kanto.png diff --git a/src/canonical/trainers/skier-gen2.png b/src/canonical/trainers/gen2/gold-silver/skier-gen2.png similarity index 100% rename from src/canonical/trainers/skier-gen2.png rename to src/canonical/trainers/gen2/gold-silver/skier-gen2.png diff --git a/src/canonical/trainers/supernerd-gen2.png b/src/canonical/trainers/gen2/gold-silver/supernerd-gen2.png similarity index 100% rename from src/canonical/trainers/supernerd-gen2.png rename to src/canonical/trainers/gen2/gold-silver/supernerd-gen2.png diff --git a/src/canonical/trainers/swimmerf-gen2.png b/src/canonical/trainers/gen2/gold-silver/swimmerf-gen2.png similarity index 100% rename from src/canonical/trainers/swimmerf-gen2.png rename to src/canonical/trainers/gen2/gold-silver/swimmerf-gen2.png diff --git a/src/canonical/trainers/swimmerfjp-gen2.png b/src/canonical/trainers/gen2/gold-silver/swimmerfjp-gen2.png similarity index 100% rename from src/canonical/trainers/swimmerfjp-gen2.png rename to src/canonical/trainers/gen2/gold-silver/swimmerfjp-gen2.png diff --git a/src/canonical/trainers/swimmerm-gen2.png b/src/canonical/trainers/gen2/gold-silver/swimmerm-gen2.png similarity index 100% rename from src/canonical/trainers/swimmerm-gen2.png rename to src/canonical/trainers/gen2/gold-silver/swimmerm-gen2.png diff --git a/src/canonical/trainers/teacher-gen2.png b/src/canonical/trainers/gen2/gold-silver/teacher-gen2.png similarity index 100% rename from src/canonical/trainers/teacher-gen2.png rename to src/canonical/trainers/gen2/gold-silver/teacher-gen2.png diff --git a/src/canonical/trainers/twins-gen2.png b/src/canonical/trainers/gen2/gold-silver/twins-gen2.png similarity index 100% rename from src/canonical/trainers/twins-gen2.png rename to src/canonical/trainers/gen2/gold-silver/twins-gen2.png diff --git a/src/canonical/trainers/whitney-gen2.png b/src/canonical/trainers/gen2/gold-silver/whitney-gen2.png similarity index 100% rename from src/canonical/trainers/whitney-gen2.png rename to src/canonical/trainers/gen2/gold-silver/whitney-gen2.png diff --git a/src/canonical/trainers/will-gen2.png b/src/canonical/trainers/gen2/gold-silver/will-gen2.png similarity index 100% rename from src/canonical/trainers/will-gen2.png rename to src/canonical/trainers/gen2/gold-silver/will-gen2.png diff --git a/src/canonical/trainers/youngster-gen2.png b/src/canonical/trainers/gen2/gold-silver/youngster-gen2.png similarity index 100% rename from src/canonical/trainers/youngster-gen2.png rename to src/canonical/trainers/gen2/gold-silver/youngster-gen2.png diff --git a/src/canonical/trainers/anabel-gen3.png b/src/canonical/trainers/gen3/emerald/anabel-gen3.png similarity index 100% rename from src/canonical/trainers/anabel-gen3.png rename to src/canonical/trainers/gen3/emerald/anabel-gen3.png diff --git a/src/canonical/trainers/brandon-gen3.png b/src/canonical/trainers/gen3/emerald/brandon-gen3.png similarity index 100% rename from src/canonical/trainers/brandon-gen3.png rename to src/canonical/trainers/gen3/emerald/brandon-gen3.png diff --git a/src/canonical/trainers/brendan-gen3.png b/src/canonical/trainers/gen3/emerald/brendan-gen3.png similarity index 100% rename from src/canonical/trainers/brendan-gen3.png rename to src/canonical/trainers/gen3/emerald/brendan-gen3.png diff --git a/src/canonical/trainers/greta-gen3.png b/src/canonical/trainers/gen3/emerald/greta-gen3.png similarity index 100% rename from src/canonical/trainers/greta-gen3.png rename to src/canonical/trainers/gen3/emerald/greta-gen3.png diff --git a/src/canonical/trainers/juan-gen3.png b/src/canonical/trainers/gen3/emerald/juan-gen3.png similarity index 100% rename from src/canonical/trainers/juan-gen3.png rename to src/canonical/trainers/gen3/emerald/juan-gen3.png diff --git a/src/canonical/trainers/lucy-gen3.png b/src/canonical/trainers/gen3/emerald/lucy-gen3.png similarity index 100% rename from src/canonical/trainers/lucy-gen3.png rename to src/canonical/trainers/gen3/emerald/lucy-gen3.png diff --git a/src/canonical/trainers/may-gen3.png b/src/canonical/trainers/gen3/emerald/may-gen3.png similarity index 100% rename from src/canonical/trainers/may-gen3.png rename to src/canonical/trainers/gen3/emerald/may-gen3.png diff --git a/src/canonical/trainers/noland-gen3.png b/src/canonical/trainers/gen3/emerald/noland-gen3.png similarity index 100% rename from src/canonical/trainers/noland-gen3.png rename to src/canonical/trainers/gen3/emerald/noland-gen3.png diff --git a/src/canonical/trainers/spenser-gen3.png b/src/canonical/trainers/gen3/emerald/spenser-gen3.png similarity index 100% rename from src/canonical/trainers/spenser-gen3.png rename to src/canonical/trainers/gen3/emerald/spenser-gen3.png diff --git a/src/canonical/trainers/tucker-gen3.png b/src/canonical/trainers/gen3/emerald/tucker-gen3.png similarity index 100% rename from src/canonical/trainers/tucker-gen3.png rename to src/canonical/trainers/gen3/emerald/tucker-gen3.png diff --git a/src/canonical/trainers/wallace-gen3.png b/src/canonical/trainers/gen3/emerald/wallace-gen3.png similarity index 100% rename from src/canonical/trainers/wallace-gen3.png rename to src/canonical/trainers/gen3/emerald/wallace-gen3.png diff --git a/src/canonical/trainers/acetrainer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/acetrainer-gen3.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/acetrainer-gen3.png diff --git a/src/canonical/trainers/acetrainercouple-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/acetrainercouple-gen3.png similarity index 100% rename from src/canonical/trainers/acetrainercouple-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/acetrainercouple-gen3.png diff --git a/src/canonical/trainers/acetrainerf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/acetrainerf-gen3.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/acetrainerf-gen3.png diff --git a/src/canonical/trainers/agatha-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/agatha-gen3.png similarity index 100% rename from src/canonical/trainers/agatha-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/agatha-gen3.png diff --git a/src/canonical/trainers/aromalady-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/aromalady-gen3.png similarity index 100% rename from src/canonical/trainers/aromalady-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/aromalady-gen3.png diff --git a/src/canonical/trainers/beauty-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/beauty-gen3.png similarity index 100% rename from src/canonical/trainers/beauty-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/beauty-gen3.png diff --git a/src/canonical/trainers/biker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/biker-gen3.png similarity index 100% rename from src/canonical/trainers/biker-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/biker-gen3.png diff --git a/src/canonical/trainers/bill-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/bill-gen3.png similarity index 100% rename from src/canonical/trainers/bill-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/bill-gen3.png diff --git a/src/canonical/trainers/birdkeeper-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/birdkeeper-gen3.png similarity index 100% rename from src/canonical/trainers/birdkeeper-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/birdkeeper-gen3.png diff --git a/src/canonical/trainers/blackbelt-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/blackbelt-gen3.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/blackbelt-gen3.png diff --git a/src/canonical/trainers/blaine-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/blaine-gen3.png similarity index 100% rename from src/canonical/trainers/blaine-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/blaine-gen3.png diff --git a/src/canonical/trainers/blue-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/blue-gen3.png similarity index 100% rename from src/canonical/trainers/blue-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/blue-gen3.png diff --git a/src/canonical/trainers/blue-gen3champion.png b/src/canonical/trainers/gen3/firered-leafgreen/blue-gen3champion.png similarity index 100% rename from src/canonical/trainers/blue-gen3champion.png rename to src/canonical/trainers/gen3/firered-leafgreen/blue-gen3champion.png diff --git a/src/canonical/trainers/blue-gen3two.png b/src/canonical/trainers/gen3/firered-leafgreen/blue-gen3two.png similarity index 100% rename from src/canonical/trainers/blue-gen3two.png rename to src/canonical/trainers/gen3/firered-leafgreen/blue-gen3two.png diff --git a/src/canonical/trainers/brock-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/brock-gen3.png similarity index 100% rename from src/canonical/trainers/brock-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/brock-gen3.png diff --git a/src/canonical/trainers/bruno-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/bruno-gen3.png similarity index 100% rename from src/canonical/trainers/bruno-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/bruno-gen3.png diff --git a/src/canonical/trainers/bugcatcher-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/bugcatcher-gen3.png similarity index 100% rename from src/canonical/trainers/bugcatcher-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/bugcatcher-gen3.png diff --git a/src/canonical/trainers/burglar-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/burglar-gen3.png similarity index 100% rename from src/canonical/trainers/burglar-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/burglar-gen3.png diff --git a/src/canonical/trainers/camper-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/camper-gen3.png similarity index 100% rename from src/canonical/trainers/camper-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/camper-gen3.png diff --git a/src/canonical/trainers/channeler-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/channeler-gen3.png similarity index 100% rename from src/canonical/trainers/channeler-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/channeler-gen3.png diff --git a/src/canonical/trainers/crushgirl-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/crushgirl-gen3.png similarity index 100% rename from src/canonical/trainers/crushgirl-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/crushgirl-gen3.png diff --git a/src/canonical/trainers/crushkin-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/crushkin-gen3.png similarity index 100% rename from src/canonical/trainers/crushkin-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/crushkin-gen3.png diff --git a/src/canonical/trainers/cueball-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/cueball-gen3.png similarity index 100% rename from src/canonical/trainers/cueball-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/cueball-gen3.png diff --git a/src/canonical/trainers/engineer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/engineer-gen3.png similarity index 100% rename from src/canonical/trainers/engineer-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/engineer-gen3.png diff --git a/src/canonical/trainers/erika-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/erika-gen3.png similarity index 100% rename from src/canonical/trainers/erika-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/erika-gen3.png diff --git a/src/canonical/trainers/fisherman-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/fisherman-gen3.png similarity index 100% rename from src/canonical/trainers/fisherman-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/fisherman-gen3.png diff --git a/src/canonical/trainers/gamer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/gamer-gen3.png similarity index 100% rename from src/canonical/trainers/gamer-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/gamer-gen3.png diff --git a/src/canonical/trainers/gentleman-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/gentleman-gen3.png similarity index 100% rename from src/canonical/trainers/gentleman-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/gentleman-gen3.png diff --git a/src/canonical/trainers/giovanni-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/giovanni-gen3.png similarity index 100% rename from src/canonical/trainers/giovanni-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/giovanni-gen3.png diff --git a/src/canonical/trainers/hiker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/hiker-gen3.png similarity index 100% rename from src/canonical/trainers/hiker-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/hiker-gen3.png diff --git a/src/canonical/trainers/juggler-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/juggler-gen3.png similarity index 100% rename from src/canonical/trainers/juggler-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/juggler-gen3.png diff --git a/src/canonical/trainers/koga-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/koga-gen3.png similarity index 100% rename from src/canonical/trainers/koga-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/koga-gen3.png diff --git a/src/canonical/trainers/lady-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/lady-gen3.png similarity index 100% rename from src/canonical/trainers/lady-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/lady-gen3.png diff --git a/src/canonical/trainers/lance-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/lance-gen3.png similarity index 100% rename from src/canonical/trainers/lance-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/lance-gen3.png diff --git a/src/canonical/trainers/lass-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/lass-gen3.png similarity index 100% rename from src/canonical/trainers/lass-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/lass-gen3.png diff --git a/src/canonical/trainers/leaf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/leaf-gen3.png similarity index 100% rename from src/canonical/trainers/leaf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/leaf-gen3.png diff --git a/src/canonical/trainers/lorelei-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/lorelei-gen3.png similarity index 100% rename from src/canonical/trainers/lorelei-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/lorelei-gen3.png diff --git a/src/canonical/trainers/ltsurge-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/ltsurge-gen3.png similarity index 100% rename from src/canonical/trainers/ltsurge-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/ltsurge-gen3.png diff --git a/src/canonical/trainers/misty-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/misty-gen3.png similarity index 100% rename from src/canonical/trainers/misty-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/misty-gen3.png diff --git a/src/canonical/trainers/mrfuji-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/mrfuji-gen3.png similarity index 100% rename from src/canonical/trainers/mrfuji-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/mrfuji-gen3.png diff --git a/src/canonical/trainers/oak-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/oak-gen3.png similarity index 100% rename from src/canonical/trainers/oak-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/oak-gen3.png diff --git a/src/canonical/trainers/painter-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/painter-gen3.png similarity index 100% rename from src/canonical/trainers/painter-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/painter-gen3.png diff --git a/src/canonical/trainers/picnicker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/picnicker-gen3.png similarity index 100% rename from src/canonical/trainers/picnicker-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/picnicker-gen3.png diff --git a/src/canonical/trainers/pokemaniac-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/pokemaniac-gen3.png similarity index 100% rename from src/canonical/trainers/pokemaniac-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/pokemaniac-gen3.png diff --git a/src/canonical/trainers/pokemonbreederf-gen3frlg.png b/src/canonical/trainers/gen3/firered-leafgreen/pokemonbreederf-gen3frlg.png similarity index 100% rename from src/canonical/trainers/pokemonbreederf-gen3frlg.png rename to src/canonical/trainers/gen3/firered-leafgreen/pokemonbreederf-gen3frlg.png diff --git a/src/canonical/trainers/pokemonranger-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/pokemonranger-gen3.png similarity index 100% rename from src/canonical/trainers/pokemonranger-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/pokemonranger-gen3.png diff --git a/src/canonical/trainers/pokemonrangerf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/pokemonrangerf-gen3.png similarity index 100% rename from src/canonical/trainers/pokemonrangerf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/pokemonrangerf-gen3.png diff --git a/src/canonical/trainers/psychic-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/psychic-gen3.png similarity index 100% rename from src/canonical/trainers/psychic-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/psychic-gen3.png diff --git a/src/canonical/trainers/psychicf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/psychicf-gen3.png similarity index 100% rename from src/canonical/trainers/psychicf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/psychicf-gen3.png diff --git a/src/canonical/trainers/red-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/red-gen3.png similarity index 100% rename from src/canonical/trainers/red-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/red-gen3.png diff --git a/src/canonical/trainers/rocker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/rocker-gen3.png similarity index 100% rename from src/canonical/trainers/rocker-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/rocker-gen3.png diff --git a/src/canonical/trainers/ruinmaniac-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/ruinmaniac-gen3.png similarity index 100% rename from src/canonical/trainers/ruinmaniac-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/ruinmaniac-gen3.png diff --git a/src/canonical/trainers/sabrina-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/sabrina-gen3.png similarity index 100% rename from src/canonical/trainers/sabrina-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/sabrina-gen3.png diff --git a/src/canonical/trainers/sailor-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/sailor-gen3.png similarity index 100% rename from src/canonical/trainers/sailor-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/sailor-gen3.png diff --git a/src/canonical/trainers/scientist-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/scientist-gen3.png similarity index 100% rename from src/canonical/trainers/scientist-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/scientist-gen3.png diff --git a/src/canonical/trainers/sisandbro-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/sisandbro-gen3.png similarity index 100% rename from src/canonical/trainers/sisandbro-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/sisandbro-gen3.png diff --git a/src/canonical/trainers/supernerd-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/supernerd-gen3.png similarity index 100% rename from src/canonical/trainers/supernerd-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/supernerd-gen3.png diff --git a/src/canonical/trainers/swimmerf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/swimmerf-gen3.png similarity index 100% rename from src/canonical/trainers/swimmerf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/swimmerf-gen3.png diff --git a/src/canonical/trainers/swimmerm-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/swimmerm-gen3.png similarity index 100% rename from src/canonical/trainers/swimmerm-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/swimmerm-gen3.png diff --git a/src/canonical/trainers/tamer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/tamer-gen3.png similarity index 100% rename from src/canonical/trainers/tamer-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/tamer-gen3.png diff --git a/src/canonical/trainers/teamrocketgruntf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntf-gen3.png similarity index 100% rename from src/canonical/trainers/teamrocketgruntf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntf-gen3.png diff --git a/src/canonical/trainers/teamrocketgruntm-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntm-gen3.png similarity index 100% rename from src/canonical/trainers/teamrocketgruntm-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntm-gen3.png diff --git a/src/canonical/trainers/tuberf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/tuberf-gen3.png similarity index 100% rename from src/canonical/trainers/tuberf-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/tuberf-gen3.png diff --git a/src/canonical/trainers/twins-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/twins-gen3.png similarity index 100% rename from src/canonical/trainers/twins-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/twins-gen3.png diff --git a/src/canonical/trainers/youngcouple-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/youngcouple-gen3.png similarity index 100% rename from src/canonical/trainers/youngcouple-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/youngcouple-gen3.png diff --git a/src/canonical/trainers/youngster-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/youngster-gen3.png similarity index 100% rename from src/canonical/trainers/youngster-gen3.png rename to src/canonical/trainers/gen3/firered-leafgreen/youngster-gen3.png diff --git a/src/canonical/trainers/acetrainer-gen3jp.png b/src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3jp.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen3jp.png rename to src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3jp.png diff --git a/src/canonical/trainers/acetrainer-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3rs.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3rs.png diff --git a/src/canonical/trainers/acetrainerf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/acetrainerf-gen3rs.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/acetrainerf-gen3rs.png diff --git a/src/canonical/trainers/archie-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/archie-gen3.png similarity index 100% rename from src/canonical/trainers/archie-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/archie-gen3.png diff --git a/src/canonical/trainers/aromalady-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/aromalady-gen3rs.png similarity index 100% rename from src/canonical/trainers/aromalady-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/aromalady-gen3rs.png diff --git a/src/canonical/trainers/battlegirl-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/battlegirl-gen3.png similarity index 100% rename from src/canonical/trainers/battlegirl-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/battlegirl-gen3.png diff --git a/src/canonical/trainers/beauty-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/beauty-gen3rs.png similarity index 100% rename from src/canonical/trainers/beauty-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/beauty-gen3rs.png diff --git a/src/canonical/trainers/birch-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/birch-gen3.png similarity index 100% rename from src/canonical/trainers/birch-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/birch-gen3.png diff --git a/src/canonical/trainers/birdkeeper-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/birdkeeper-gen3rs.png similarity index 100% rename from src/canonical/trainers/birdkeeper-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/birdkeeper-gen3rs.png diff --git a/src/canonical/trainers/blackbelt-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/blackbelt-gen3rs.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/blackbelt-gen3rs.png diff --git a/src/canonical/trainers/brawly-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/brawly-gen3.png similarity index 100% rename from src/canonical/trainers/brawly-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/brawly-gen3.png diff --git a/src/canonical/trainers/brendan-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/brendan-gen3rs.png similarity index 100% rename from src/canonical/trainers/brendan-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/brendan-gen3rs.png diff --git a/src/canonical/trainers/bugcatcher-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/bugcatcher-gen3rs.png similarity index 100% rename from src/canonical/trainers/bugcatcher-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/bugcatcher-gen3rs.png diff --git a/src/canonical/trainers/bugmaniac-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/bugmaniac-gen3.png similarity index 100% rename from src/canonical/trainers/bugmaniac-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/bugmaniac-gen3.png diff --git a/src/canonical/trainers/camper-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/camper-gen3rs.png similarity index 100% rename from src/canonical/trainers/camper-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/camper-gen3rs.png diff --git a/src/canonical/trainers/collector-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/collector-gen3.png similarity index 100% rename from src/canonical/trainers/collector-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/collector-gen3.png diff --git a/src/canonical/trainers/courtney-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/courtney-gen3.png similarity index 100% rename from src/canonical/trainers/courtney-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/courtney-gen3.png diff --git a/src/canonical/trainers/dragontamer-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/dragontamer-gen3.png similarity index 100% rename from src/canonical/trainers/dragontamer-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/dragontamer-gen3.png diff --git a/src/canonical/trainers/drake-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/drake-gen3.png similarity index 100% rename from src/canonical/trainers/drake-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/drake-gen3.png diff --git a/src/canonical/trainers/expert-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/expert-gen3.png similarity index 100% rename from src/canonical/trainers/expert-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/expert-gen3.png diff --git a/src/canonical/trainers/expertf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/expertf-gen3.png similarity index 100% rename from src/canonical/trainers/expertf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/expertf-gen3.png diff --git a/src/canonical/trainers/fisherman-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/fisherman-gen3rs.png similarity index 100% rename from src/canonical/trainers/fisherman-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/fisherman-gen3rs.png diff --git a/src/canonical/trainers/flannery-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/flannery-gen3.png similarity index 100% rename from src/canonical/trainers/flannery-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/flannery-gen3.png diff --git a/src/canonical/trainers/gentleman-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/gentleman-gen3rs.png similarity index 100% rename from src/canonical/trainers/gentleman-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/gentleman-gen3rs.png diff --git a/src/canonical/trainers/glacia-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/glacia-gen3.png similarity index 100% rename from src/canonical/trainers/glacia-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/glacia-gen3.png diff --git a/src/canonical/trainers/guitarist-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/guitarist-gen3.png similarity index 100% rename from src/canonical/trainers/guitarist-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/guitarist-gen3.png diff --git a/src/canonical/trainers/hexmaniac-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3.png similarity index 100% rename from src/canonical/trainers/hexmaniac-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3.png diff --git a/src/canonical/trainers/hexmaniac-gen3jp.png b/src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3jp.png similarity index 100% rename from src/canonical/trainers/hexmaniac-gen3jp.png rename to src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3jp.png diff --git a/src/canonical/trainers/hiker-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/hiker-gen3rs.png similarity index 100% rename from src/canonical/trainers/hiker-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/hiker-gen3rs.png diff --git a/src/canonical/trainers/interviewers-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/interviewers-gen3.png similarity index 100% rename from src/canonical/trainers/interviewers-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/interviewers-gen3.png diff --git a/src/canonical/trainers/kindler-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/kindler-gen3.png similarity index 100% rename from src/canonical/trainers/kindler-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/kindler-gen3.png diff --git a/src/canonical/trainers/lady-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/lady-gen3rs.png similarity index 100% rename from src/canonical/trainers/lady-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/lady-gen3rs.png diff --git a/src/canonical/trainers/lass-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/lass-gen3rs.png similarity index 100% rename from src/canonical/trainers/lass-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/lass-gen3rs.png diff --git a/src/canonical/trainers/matt-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/matt-gen3.png similarity index 100% rename from src/canonical/trainers/matt-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/matt-gen3.png diff --git a/src/canonical/trainers/maxie-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/maxie-gen3.png similarity index 100% rename from src/canonical/trainers/maxie-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/maxie-gen3.png diff --git a/src/canonical/trainers/may-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/may-gen3rs.png similarity index 100% rename from src/canonical/trainers/may-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/may-gen3rs.png diff --git a/src/canonical/trainers/ninjaboy-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/ninjaboy-gen3.png similarity index 100% rename from src/canonical/trainers/ninjaboy-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/ninjaboy-gen3.png diff --git a/src/canonical/trainers/norman-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/norman-gen3.png similarity index 100% rename from src/canonical/trainers/norman-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/norman-gen3.png diff --git a/src/canonical/trainers/oldcouple-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/oldcouple-gen3.png similarity index 100% rename from src/canonical/trainers/oldcouple-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/oldcouple-gen3.png diff --git a/src/canonical/trainers/parasollady-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/parasollady-gen3.png similarity index 100% rename from src/canonical/trainers/parasollady-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/parasollady-gen3.png diff --git a/src/canonical/trainers/phoebe-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/phoebe-gen3.png similarity index 100% rename from src/canonical/trainers/phoebe-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/phoebe-gen3.png diff --git a/src/canonical/trainers/picnicker-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/picnicker-gen3rs.png similarity index 100% rename from src/canonical/trainers/picnicker-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/picnicker-gen3rs.png diff --git a/src/canonical/trainers/pokefan-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/pokefan-gen3.png similarity index 100% rename from src/canonical/trainers/pokefan-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokefan-gen3.png diff --git a/src/canonical/trainers/pokefanf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/pokefanf-gen3.png similarity index 100% rename from src/canonical/trainers/pokefanf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokefanf-gen3.png diff --git a/src/canonical/trainers/pokemaniac-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/pokemaniac-gen3rs.png similarity index 100% rename from src/canonical/trainers/pokemaniac-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokemaniac-gen3rs.png diff --git a/src/canonical/trainers/pokemonbreeder-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/pokemonbreeder-gen3.png similarity index 100% rename from src/canonical/trainers/pokemonbreeder-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokemonbreeder-gen3.png diff --git a/src/canonical/trainers/pokemonbreederf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/pokemonbreederf-gen3.png similarity index 100% rename from src/canonical/trainers/pokemonbreederf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokemonbreederf-gen3.png diff --git a/src/canonical/trainers/pokemonranger-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/pokemonranger-gen3rs.png similarity index 100% rename from src/canonical/trainers/pokemonranger-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokemonranger-gen3rs.png diff --git a/src/canonical/trainers/pokemonrangerf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/pokemonrangerf-gen3rs.png similarity index 100% rename from src/canonical/trainers/pokemonrangerf-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/pokemonrangerf-gen3rs.png diff --git a/src/canonical/trainers/psychic-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/psychic-gen3rs.png similarity index 100% rename from src/canonical/trainers/psychic-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/psychic-gen3rs.png diff --git a/src/canonical/trainers/psychicf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/psychicf-gen3rs.png similarity index 100% rename from src/canonical/trainers/psychicf-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/psychicf-gen3rs.png diff --git a/src/canonical/trainers/psychicfjp-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/psychicfjp-gen3.png similarity index 100% rename from src/canonical/trainers/psychicfjp-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/psychicfjp-gen3.png diff --git a/src/canonical/trainers/richboy-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/richboy-gen3.png similarity index 100% rename from src/canonical/trainers/richboy-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/richboy-gen3.png diff --git a/src/canonical/trainers/roxanne-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/roxanne-gen3.png similarity index 100% rename from src/canonical/trainers/roxanne-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/roxanne-gen3.png diff --git a/src/canonical/trainers/ruinmaniac-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/ruinmaniac-gen3rs.png similarity index 100% rename from src/canonical/trainers/ruinmaniac-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/ruinmaniac-gen3rs.png diff --git a/src/canonical/trainers/sailor-gen3jp.png b/src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3jp.png similarity index 100% rename from src/canonical/trainers/sailor-gen3jp.png rename to src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3jp.png diff --git a/src/canonical/trainers/sailor-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3rs.png similarity index 100% rename from src/canonical/trainers/sailor-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3rs.png diff --git a/src/canonical/trainers/schoolkid-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/schoolkid-gen3.png similarity index 100% rename from src/canonical/trainers/schoolkid-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/schoolkid-gen3.png diff --git a/src/canonical/trainers/schoolkidf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/schoolkidf-gen3.png similarity index 100% rename from src/canonical/trainers/schoolkidf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/schoolkidf-gen3.png diff --git a/src/canonical/trainers/shelly-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/shelly-gen3.png similarity index 100% rename from src/canonical/trainers/shelly-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/shelly-gen3.png diff --git a/src/canonical/trainers/sidney-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/sidney-gen3.png similarity index 100% rename from src/canonical/trainers/sidney-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/sidney-gen3.png diff --git a/src/canonical/trainers/sisandbro-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/sisandbro-gen3rs.png similarity index 100% rename from src/canonical/trainers/sisandbro-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/sisandbro-gen3rs.png diff --git a/src/canonical/trainers/srandjr-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/srandjr-gen3.png similarity index 100% rename from src/canonical/trainers/srandjr-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/srandjr-gen3.png diff --git a/src/canonical/trainers/steven-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/steven-gen3.png similarity index 100% rename from src/canonical/trainers/steven-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/steven-gen3.png diff --git a/src/canonical/trainers/swimmerf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/swimmerf-gen3rs.png similarity index 100% rename from src/canonical/trainers/swimmerf-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/swimmerf-gen3rs.png diff --git a/src/canonical/trainers/swimmerm-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/swimmerm-gen3rs.png similarity index 100% rename from src/canonical/trainers/swimmerm-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/swimmerm-gen3rs.png diff --git a/src/canonical/trainers/tabitha-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/tabitha-gen3.png similarity index 100% rename from src/canonical/trainers/tabitha-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/tabitha-gen3.png diff --git a/src/canonical/trainers/tateandliza-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/tateandliza-gen3.png similarity index 100% rename from src/canonical/trainers/tateandliza-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/tateandliza-gen3.png diff --git a/src/canonical/trainers/teamaquabeta-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/teamaquabeta-gen3.png similarity index 100% rename from src/canonical/trainers/teamaquabeta-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/teamaquabeta-gen3.png diff --git a/src/canonical/trainers/teamaquagruntf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntf-gen3.png similarity index 100% rename from src/canonical/trainers/teamaquagruntf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntf-gen3.png diff --git a/src/canonical/trainers/teamaquagruntm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntm-gen3.png similarity index 100% rename from src/canonical/trainers/teamaquagruntm-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntm-gen3.png diff --git a/src/canonical/trainers/teammagmagruntf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntf-gen3.png similarity index 100% rename from src/canonical/trainers/teammagmagruntf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntf-gen3.png diff --git a/src/canonical/trainers/teammagmagruntm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntm-gen3.png similarity index 100% rename from src/canonical/trainers/teammagmagruntm-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntm-gen3.png diff --git a/src/canonical/trainers/triathletebikerf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/triathletebikerf-gen3.png similarity index 100% rename from src/canonical/trainers/triathletebikerf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/triathletebikerf-gen3.png diff --git a/src/canonical/trainers/triathletebikerm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/triathletebikerm-gen3.png similarity index 100% rename from src/canonical/trainers/triathletebikerm-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/triathletebikerm-gen3.png diff --git a/src/canonical/trainers/triathleterunnerf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerf-gen3.png similarity index 100% rename from src/canonical/trainers/triathleterunnerf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerf-gen3.png diff --git a/src/canonical/trainers/triathleterunnerm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerm-gen3.png similarity index 100% rename from src/canonical/trainers/triathleterunnerm-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerm-gen3.png diff --git a/src/canonical/trainers/triathleteswimmerf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerf-gen3.png similarity index 100% rename from src/canonical/trainers/triathleteswimmerf-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerf-gen3.png diff --git a/src/canonical/trainers/triathleteswimmerm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerm-gen3.png similarity index 100% rename from src/canonical/trainers/triathleteswimmerm-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerm-gen3.png diff --git a/src/canonical/trainers/tuber-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/tuber-gen3.png similarity index 100% rename from src/canonical/trainers/tuber-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/tuber-gen3.png diff --git a/src/canonical/trainers/tuberf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/tuberf-gen3rs.png similarity index 100% rename from src/canonical/trainers/tuberf-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/tuberf-gen3rs.png diff --git a/src/canonical/trainers/twins-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/twins-gen3rs.png similarity index 100% rename from src/canonical/trainers/twins-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/twins-gen3rs.png diff --git a/src/canonical/trainers/wallace-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/wallace-gen3rs.png similarity index 100% rename from src/canonical/trainers/wallace-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/wallace-gen3rs.png diff --git a/src/canonical/trainers/wally-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/wally-gen3.png similarity index 100% rename from src/canonical/trainers/wally-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/wally-gen3.png diff --git a/src/canonical/trainers/wattson-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/wattson-gen3.png similarity index 100% rename from src/canonical/trainers/wattson-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/wattson-gen3.png diff --git a/src/canonical/trainers/winona-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/winona-gen3.png similarity index 100% rename from src/canonical/trainers/winona-gen3.png rename to src/canonical/trainers/gen3/ruby-sapphire/winona-gen3.png diff --git a/src/canonical/trainers/youngcouple-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/youngcouple-gen3rs.png similarity index 100% rename from src/canonical/trainers/youngcouple-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/youngcouple-gen3rs.png diff --git a/src/canonical/trainers/youngster-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/youngster-gen3rs.png similarity index 100% rename from src/canonical/trainers/youngster-gen3rs.png rename to src/canonical/trainers/gen3/ruby-sapphire/youngster-gen3rs.png diff --git a/src/canonical/trainers/aaron.png b/src/canonical/trainers/gen4/diamond-pearl/aaron.png similarity index 100% rename from src/canonical/trainers/aaron.png rename to src/canonical/trainers/gen4/diamond-pearl/aaron.png diff --git a/src/canonical/trainers/acetrainer-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/acetrainer-gen4dp.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/acetrainer-gen4dp.png diff --git a/src/canonical/trainers/acetrainerf-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/acetrainerf-gen4dp.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/acetrainerf-gen4dp.png diff --git a/src/canonical/trainers/acetrainersnow.png b/src/canonical/trainers/gen4/diamond-pearl/acetrainersnow.png similarity index 100% rename from src/canonical/trainers/acetrainersnow.png rename to src/canonical/trainers/gen4/diamond-pearl/acetrainersnow.png diff --git a/src/canonical/trainers/acetrainersnowf.png b/src/canonical/trainers/gen4/diamond-pearl/acetrainersnowf.png similarity index 100% rename from src/canonical/trainers/acetrainersnowf.png rename to src/canonical/trainers/gen4/diamond-pearl/acetrainersnowf.png diff --git a/src/canonical/trainers/aromalady.png b/src/canonical/trainers/gen4/diamond-pearl/aromalady.png similarity index 100% rename from src/canonical/trainers/aromalady.png rename to src/canonical/trainers/gen4/diamond-pearl/aromalady.png diff --git a/src/canonical/trainers/artist-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/artist-gen4.png similarity index 100% rename from src/canonical/trainers/artist-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/artist-gen4.png diff --git a/src/canonical/trainers/barry.png b/src/canonical/trainers/gen4/diamond-pearl/barry.png similarity index 100% rename from src/canonical/trainers/barry.png rename to src/canonical/trainers/gen4/diamond-pearl/barry.png diff --git a/src/canonical/trainers/battlegirl-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/battlegirl-gen4.png similarity index 100% rename from src/canonical/trainers/battlegirl-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/battlegirl-gen4.png diff --git a/src/canonical/trainers/beauty-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/beauty-gen4dp.png similarity index 100% rename from src/canonical/trainers/beauty-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/beauty-gen4dp.png diff --git a/src/canonical/trainers/bellepa.png b/src/canonical/trainers/gen4/diamond-pearl/bellepa.png similarity index 100% rename from src/canonical/trainers/bellepa.png rename to src/canonical/trainers/gen4/diamond-pearl/bellepa.png diff --git a/src/canonical/trainers/bertha.png b/src/canonical/trainers/gen4/diamond-pearl/bertha.png similarity index 100% rename from src/canonical/trainers/bertha.png rename to src/canonical/trainers/gen4/diamond-pearl/bertha.png diff --git a/src/canonical/trainers/birdkeeper-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/birdkeeper-gen4dp.png similarity index 100% rename from src/canonical/trainers/birdkeeper-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/birdkeeper-gen4dp.png diff --git a/src/canonical/trainers/blackbelt-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/blackbelt-gen4dp.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/blackbelt-gen4dp.png diff --git a/src/canonical/trainers/buck.png b/src/canonical/trainers/gen4/diamond-pearl/buck.png similarity index 100% rename from src/canonical/trainers/buck.png rename to src/canonical/trainers/gen4/diamond-pearl/buck.png diff --git a/src/canonical/trainers/bugcatcher.png b/src/canonical/trainers/gen4/diamond-pearl/bugcatcher.png similarity index 100% rename from src/canonical/trainers/bugcatcher.png rename to src/canonical/trainers/gen4/diamond-pearl/bugcatcher.png diff --git a/src/canonical/trainers/byron.png b/src/canonical/trainers/gen4/diamond-pearl/byron.png similarity index 100% rename from src/canonical/trainers/byron.png rename to src/canonical/trainers/gen4/diamond-pearl/byron.png diff --git a/src/canonical/trainers/cameraman.png b/src/canonical/trainers/gen4/diamond-pearl/cameraman.png similarity index 100% rename from src/canonical/trainers/cameraman.png rename to src/canonical/trainers/gen4/diamond-pearl/cameraman.png diff --git a/src/canonical/trainers/camper.png b/src/canonical/trainers/gen4/diamond-pearl/camper.png similarity index 100% rename from src/canonical/trainers/camper.png rename to src/canonical/trainers/gen4/diamond-pearl/camper.png diff --git a/src/canonical/trainers/candice.png b/src/canonical/trainers/gen4/diamond-pearl/candice.png similarity index 100% rename from src/canonical/trainers/candice.png rename to src/canonical/trainers/gen4/diamond-pearl/candice.png diff --git a/src/canonical/trainers/cheryl.png b/src/canonical/trainers/gen4/diamond-pearl/cheryl.png similarity index 100% rename from src/canonical/trainers/cheryl.png rename to src/canonical/trainers/gen4/diamond-pearl/cheryl.png diff --git a/src/canonical/trainers/clown.png b/src/canonical/trainers/gen4/diamond-pearl/clown.png similarity index 100% rename from src/canonical/trainers/clown.png rename to src/canonical/trainers/gen4/diamond-pearl/clown.png diff --git a/src/canonical/trainers/collector.png b/src/canonical/trainers/gen4/diamond-pearl/collector.png similarity index 100% rename from src/canonical/trainers/collector.png rename to src/canonical/trainers/gen4/diamond-pearl/collector.png diff --git a/src/canonical/trainers/cowgirl.png b/src/canonical/trainers/gen4/diamond-pearl/cowgirl.png similarity index 100% rename from src/canonical/trainers/cowgirl.png rename to src/canonical/trainers/gen4/diamond-pearl/cowgirl.png diff --git a/src/canonical/trainers/crasherwake.png b/src/canonical/trainers/gen4/diamond-pearl/crasherwake.png similarity index 100% rename from src/canonical/trainers/crasherwake.png rename to src/canonical/trainers/gen4/diamond-pearl/crasherwake.png diff --git a/src/canonical/trainers/cyclist-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/cyclist-gen4.png similarity index 100% rename from src/canonical/trainers/cyclist-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/cyclist-gen4.png diff --git a/src/canonical/trainers/cyclistf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/cyclistf-gen4.png similarity index 100% rename from src/canonical/trainers/cyclistf-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/cyclistf-gen4.png diff --git a/src/canonical/trainers/cynthia-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/cynthia-gen4.png similarity index 100% rename from src/canonical/trainers/cynthia-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/cynthia-gen4.png diff --git a/src/canonical/trainers/cyrus.png b/src/canonical/trainers/gen4/diamond-pearl/cyrus.png similarity index 100% rename from src/canonical/trainers/cyrus.png rename to src/canonical/trainers/gen4/diamond-pearl/cyrus.png diff --git a/src/canonical/trainers/dawn.png b/src/canonical/trainers/gen4/diamond-pearl/dawn.png similarity index 100% rename from src/canonical/trainers/dawn.png rename to src/canonical/trainers/gen4/diamond-pearl/dawn.png diff --git a/src/canonical/trainers/doubleteam.png b/src/canonical/trainers/gen4/diamond-pearl/doubleteam.png similarity index 100% rename from src/canonical/trainers/doubleteam.png rename to src/canonical/trainers/gen4/diamond-pearl/doubleteam.png diff --git a/src/canonical/trainers/dragontamer.png b/src/canonical/trainers/gen4/diamond-pearl/dragontamer.png similarity index 100% rename from src/canonical/trainers/dragontamer.png rename to src/canonical/trainers/gen4/diamond-pearl/dragontamer.png diff --git a/src/canonical/trainers/fantina.png b/src/canonical/trainers/gen4/diamond-pearl/fantina.png similarity index 100% rename from src/canonical/trainers/fantina.png rename to src/canonical/trainers/gen4/diamond-pearl/fantina.png diff --git a/src/canonical/trainers/fisherman-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/fisherman-gen4.png similarity index 100% rename from src/canonical/trainers/fisherman-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/fisherman-gen4.png diff --git a/src/canonical/trainers/flint.png b/src/canonical/trainers/gen4/diamond-pearl/flint.png similarity index 100% rename from src/canonical/trainers/flint.png rename to src/canonical/trainers/gen4/diamond-pearl/flint.png diff --git a/src/canonical/trainers/galacticgrunt.png b/src/canonical/trainers/gen4/diamond-pearl/galacticgrunt.png similarity index 100% rename from src/canonical/trainers/galacticgrunt.png rename to src/canonical/trainers/gen4/diamond-pearl/galacticgrunt.png diff --git a/src/canonical/trainers/galacticgruntf.png b/src/canonical/trainers/gen4/diamond-pearl/galacticgruntf.png similarity index 100% rename from src/canonical/trainers/galacticgruntf.png rename to src/canonical/trainers/gen4/diamond-pearl/galacticgruntf.png diff --git a/src/canonical/trainers/gambler.png b/src/canonical/trainers/gen4/diamond-pearl/gambler.png similarity index 100% rename from src/canonical/trainers/gambler.png rename to src/canonical/trainers/gen4/diamond-pearl/gambler.png diff --git a/src/canonical/trainers/gardenia.png b/src/canonical/trainers/gen4/diamond-pearl/gardenia.png similarity index 100% rename from src/canonical/trainers/gardenia.png rename to src/canonical/trainers/gen4/diamond-pearl/gardenia.png diff --git a/src/canonical/trainers/gentleman-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/gentleman-gen4dp.png similarity index 100% rename from src/canonical/trainers/gentleman-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/gentleman-gen4dp.png diff --git a/src/canonical/trainers/guitarist-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/guitarist-gen4.png similarity index 100% rename from src/canonical/trainers/guitarist-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/guitarist-gen4.png diff --git a/src/canonical/trainers/hiker-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/hiker-gen4.png similarity index 100% rename from src/canonical/trainers/hiker-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/hiker-gen4.png diff --git a/src/canonical/trainers/idol.png b/src/canonical/trainers/gen4/diamond-pearl/idol.png similarity index 100% rename from src/canonical/trainers/idol.png rename to src/canonical/trainers/gen4/diamond-pearl/idol.png diff --git a/src/canonical/trainers/interviewers.png b/src/canonical/trainers/gen4/diamond-pearl/interviewers.png similarity index 100% rename from src/canonical/trainers/interviewers.png rename to src/canonical/trainers/gen4/diamond-pearl/interviewers.png diff --git a/src/canonical/trainers/jogger.png b/src/canonical/trainers/gen4/diamond-pearl/jogger.png similarity index 100% rename from src/canonical/trainers/jogger.png rename to src/canonical/trainers/gen4/diamond-pearl/jogger.png diff --git a/src/canonical/trainers/jupiter.png b/src/canonical/trainers/gen4/diamond-pearl/jupiter.png similarity index 100% rename from src/canonical/trainers/jupiter.png rename to src/canonical/trainers/gen4/diamond-pearl/jupiter.png diff --git a/src/canonical/trainers/lady-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/lady-gen4.png similarity index 100% rename from src/canonical/trainers/lady-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/lady-gen4.png diff --git a/src/canonical/trainers/lass-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/lass-gen4dp.png similarity index 100% rename from src/canonical/trainers/lass-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/lass-gen4dp.png diff --git a/src/canonical/trainers/lucas.png b/src/canonical/trainers/gen4/diamond-pearl/lucas.png similarity index 100% rename from src/canonical/trainers/lucas.png rename to src/canonical/trainers/gen4/diamond-pearl/lucas.png diff --git a/src/canonical/trainers/lucian.png b/src/canonical/trainers/gen4/diamond-pearl/lucian.png similarity index 100% rename from src/canonical/trainers/lucian.png rename to src/canonical/trainers/gen4/diamond-pearl/lucian.png diff --git a/src/canonical/trainers/madame-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/madame-gen4.png similarity index 100% rename from src/canonical/trainers/madame-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/madame-gen4.png diff --git a/src/canonical/trainers/madame-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/madame-gen4dp.png similarity index 100% rename from src/canonical/trainers/madame-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/madame-gen4dp.png diff --git a/src/canonical/trainers/marley.png b/src/canonical/trainers/gen4/diamond-pearl/marley.png similarity index 100% rename from src/canonical/trainers/marley.png rename to src/canonical/trainers/gen4/diamond-pearl/marley.png diff --git a/src/canonical/trainers/mars.png b/src/canonical/trainers/gen4/diamond-pearl/mars.png similarity index 100% rename from src/canonical/trainers/mars.png rename to src/canonical/trainers/gen4/diamond-pearl/mars.png diff --git a/src/canonical/trainers/maylene.png b/src/canonical/trainers/gen4/diamond-pearl/maylene.png similarity index 100% rename from src/canonical/trainers/maylene.png rename to src/canonical/trainers/gen4/diamond-pearl/maylene.png diff --git a/src/canonical/trainers/mira.png b/src/canonical/trainers/gen4/diamond-pearl/mira.png similarity index 100% rename from src/canonical/trainers/mira.png rename to src/canonical/trainers/gen4/diamond-pearl/mira.png diff --git a/src/canonical/trainers/ninjaboy.png b/src/canonical/trainers/gen4/diamond-pearl/ninjaboy.png similarity index 100% rename from src/canonical/trainers/ninjaboy.png rename to src/canonical/trainers/gen4/diamond-pearl/ninjaboy.png diff --git a/src/canonical/trainers/palmer.png b/src/canonical/trainers/gen4/diamond-pearl/palmer.png similarity index 100% rename from src/canonical/trainers/palmer.png rename to src/canonical/trainers/gen4/diamond-pearl/palmer.png diff --git a/src/canonical/trainers/parasollady-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/parasollady-gen4.png similarity index 100% rename from src/canonical/trainers/parasollady-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/parasollady-gen4.png diff --git a/src/canonical/trainers/picnicker.png b/src/canonical/trainers/gen4/diamond-pearl/picnicker.png similarity index 100% rename from src/canonical/trainers/picnicker.png rename to src/canonical/trainers/gen4/diamond-pearl/picnicker.png diff --git a/src/canonical/trainers/pokefan-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/pokefan-gen4.png similarity index 100% rename from src/canonical/trainers/pokefan-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/pokefan-gen4.png diff --git a/src/canonical/trainers/pokefanf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/pokefanf-gen4.png similarity index 100% rename from src/canonical/trainers/pokefanf-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/pokefanf-gen4.png diff --git a/src/canonical/trainers/pokekid.png b/src/canonical/trainers/gen4/diamond-pearl/pokekid.png similarity index 100% rename from src/canonical/trainers/pokekid.png rename to src/canonical/trainers/gen4/diamond-pearl/pokekid.png diff --git a/src/canonical/trainers/pokemonbreeder-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/pokemonbreeder-gen4.png similarity index 100% rename from src/canonical/trainers/pokemonbreeder-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/pokemonbreeder-gen4.png diff --git a/src/canonical/trainers/pokemonbreederf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/pokemonbreederf-gen4.png similarity index 100% rename from src/canonical/trainers/pokemonbreederf-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/pokemonbreederf-gen4.png diff --git a/src/canonical/trainers/pokemonranger-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/pokemonranger-gen4.png similarity index 100% rename from src/canonical/trainers/pokemonranger-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/pokemonranger-gen4.png diff --git a/src/canonical/trainers/pokemonrangerf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/pokemonrangerf-gen4.png similarity index 100% rename from src/canonical/trainers/pokemonrangerf-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/pokemonrangerf-gen4.png diff --git a/src/canonical/trainers/policeman-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/policeman-gen4.png similarity index 100% rename from src/canonical/trainers/policeman-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/policeman-gen4.png diff --git a/src/canonical/trainers/psychic-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/psychic-gen4.png similarity index 100% rename from src/canonical/trainers/psychic-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/psychic-gen4.png diff --git a/src/canonical/trainers/psychicf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/psychicf-gen4.png similarity index 100% rename from src/canonical/trainers/psychicf-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/psychicf-gen4.png diff --git a/src/canonical/trainers/rancher.png b/src/canonical/trainers/gen4/diamond-pearl/rancher.png similarity index 100% rename from src/canonical/trainers/rancher.png rename to src/canonical/trainers/gen4/diamond-pearl/rancher.png diff --git a/src/canonical/trainers/reporter.png b/src/canonical/trainers/gen4/diamond-pearl/reporter.png similarity index 100% rename from src/canonical/trainers/reporter.png rename to src/canonical/trainers/gen4/diamond-pearl/reporter.png diff --git a/src/canonical/trainers/richboy-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/richboy-gen4.png similarity index 100% rename from src/canonical/trainers/richboy-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/richboy-gen4.png diff --git a/src/canonical/trainers/riley.png b/src/canonical/trainers/gen4/diamond-pearl/riley.png similarity index 100% rename from src/canonical/trainers/riley.png rename to src/canonical/trainers/gen4/diamond-pearl/riley.png diff --git a/src/canonical/trainers/roark.png b/src/canonical/trainers/gen4/diamond-pearl/roark.png similarity index 100% rename from src/canonical/trainers/roark.png rename to src/canonical/trainers/gen4/diamond-pearl/roark.png diff --git a/src/canonical/trainers/roughneck-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/roughneck-gen4.png similarity index 100% rename from src/canonical/trainers/roughneck-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/roughneck-gen4.png diff --git a/src/canonical/trainers/ruinmaniac.png b/src/canonical/trainers/gen4/diamond-pearl/ruinmaniac.png similarity index 100% rename from src/canonical/trainers/ruinmaniac.png rename to src/canonical/trainers/gen4/diamond-pearl/ruinmaniac.png diff --git a/src/canonical/trainers/sailor.png b/src/canonical/trainers/gen4/diamond-pearl/sailor.png similarity index 100% rename from src/canonical/trainers/sailor.png rename to src/canonical/trainers/gen4/diamond-pearl/sailor.png diff --git a/src/canonical/trainers/saturn.png b/src/canonical/trainers/gen4/diamond-pearl/saturn.png similarity index 100% rename from src/canonical/trainers/saturn.png rename to src/canonical/trainers/gen4/diamond-pearl/saturn.png diff --git a/src/canonical/trainers/schoolkid-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/schoolkid-gen4dp.png similarity index 100% rename from src/canonical/trainers/schoolkid-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/schoolkid-gen4dp.png diff --git a/src/canonical/trainers/schoolkidf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/schoolkidf-gen4.png similarity index 100% rename from src/canonical/trainers/schoolkidf-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/schoolkidf-gen4.png diff --git a/src/canonical/trainers/scientist-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/scientist-gen4dp.png similarity index 100% rename from src/canonical/trainers/scientist-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/scientist-gen4dp.png diff --git a/src/canonical/trainers/sisandbro.png b/src/canonical/trainers/gen4/diamond-pearl/sisandbro.png similarity index 100% rename from src/canonical/trainers/sisandbro.png rename to src/canonical/trainers/gen4/diamond-pearl/sisandbro.png diff --git a/src/canonical/trainers/skier.png b/src/canonical/trainers/gen4/diamond-pearl/skier.png similarity index 100% rename from src/canonical/trainers/skier.png rename to src/canonical/trainers/gen4/diamond-pearl/skier.png diff --git a/src/canonical/trainers/skierf-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/skierf-gen4dp.png similarity index 100% rename from src/canonical/trainers/skierf-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/skierf-gen4dp.png diff --git a/src/canonical/trainers/swimmer-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/swimmer-gen4dp.png similarity index 100% rename from src/canonical/trainers/swimmer-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/swimmer-gen4dp.png diff --git a/src/canonical/trainers/swimmerf-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/swimmerf-gen4dp.png similarity index 100% rename from src/canonical/trainers/swimmerf-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/swimmerf-gen4dp.png diff --git a/src/canonical/trainers/tuber.png b/src/canonical/trainers/gen4/diamond-pearl/tuber.png similarity index 100% rename from src/canonical/trainers/tuber.png rename to src/canonical/trainers/gen4/diamond-pearl/tuber.png diff --git a/src/canonical/trainers/tuberf.png b/src/canonical/trainers/gen4/diamond-pearl/tuberf.png similarity index 100% rename from src/canonical/trainers/tuberf.png rename to src/canonical/trainers/gen4/diamond-pearl/tuberf.png diff --git a/src/canonical/trainers/twins-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/twins-gen4dp.png similarity index 100% rename from src/canonical/trainers/twins-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/twins-gen4dp.png diff --git a/src/canonical/trainers/veteran-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/veteran-gen4.png similarity index 100% rename from src/canonical/trainers/veteran-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/veteran-gen4.png diff --git a/src/canonical/trainers/volkner.png b/src/canonical/trainers/gen4/diamond-pearl/volkner.png similarity index 100% rename from src/canonical/trainers/volkner.png rename to src/canonical/trainers/gen4/diamond-pearl/volkner.png diff --git a/src/canonical/trainers/waiter-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/waiter-gen4.png similarity index 100% rename from src/canonical/trainers/waiter-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/waiter-gen4.png diff --git a/src/canonical/trainers/waiter-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/waiter-gen4dp.png similarity index 100% rename from src/canonical/trainers/waiter-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/waiter-gen4dp.png diff --git a/src/canonical/trainers/waitress-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/waitress-gen4.png similarity index 100% rename from src/canonical/trainers/waitress-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/waitress-gen4.png diff --git a/src/canonical/trainers/worker-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/worker-gen4.png similarity index 100% rename from src/canonical/trainers/worker-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/worker-gen4.png diff --git a/src/canonical/trainers/youngcouple-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/youngcouple-gen4dp.png similarity index 100% rename from src/canonical/trainers/youngcouple-gen4dp.png rename to src/canonical/trainers/gen4/diamond-pearl/youngcouple-gen4dp.png diff --git a/src/canonical/trainers/youngster-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/youngster-gen4.png similarity index 100% rename from src/canonical/trainers/youngster-gen4.png rename to src/canonical/trainers/gen4/diamond-pearl/youngster-gen4.png diff --git a/src/canonical/trainers/acetrainer-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/acetrainer-gen4.png similarity index 100% rename from src/canonical/trainers/acetrainer-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/acetrainer-gen4.png diff --git a/src/canonical/trainers/acetrainercouple.png b/src/canonical/trainers/gen4/heartgold-soulsilver/acetrainercouple.png similarity index 100% rename from src/canonical/trainers/acetrainercouple.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/acetrainercouple.png diff --git a/src/canonical/trainers/acetrainerf-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/acetrainerf-gen4.png similarity index 100% rename from src/canonical/trainers/acetrainerf-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/acetrainerf-gen4.png diff --git a/src/canonical/trainers/archer.png b/src/canonical/trainers/gen4/heartgold-soulsilver/archer.png similarity index 100% rename from src/canonical/trainers/archer.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/archer.png diff --git a/src/canonical/trainers/ariana.png b/src/canonical/trainers/gen4/heartgold-soulsilver/ariana.png similarity index 100% rename from src/canonical/trainers/ariana.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/ariana.png diff --git a/src/canonical/trainers/beauty.png b/src/canonical/trainers/gen4/heartgold-soulsilver/beauty.png similarity index 100% rename from src/canonical/trainers/beauty.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/beauty.png diff --git a/src/canonical/trainers/biker-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/biker-gen4.png similarity index 100% rename from src/canonical/trainers/biker-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/biker-gen4.png diff --git a/src/canonical/trainers/birdkeeper.png b/src/canonical/trainers/gen4/heartgold-soulsilver/birdkeeper.png similarity index 100% rename from src/canonical/trainers/birdkeeper.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/birdkeeper.png diff --git a/src/canonical/trainers/blackbelt-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/blackbelt-gen4.png similarity index 100% rename from src/canonical/trainers/blackbelt-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/blackbelt-gen4.png diff --git a/src/canonical/trainers/blaine.png b/src/canonical/trainers/gen4/heartgold-soulsilver/blaine.png similarity index 100% rename from src/canonical/trainers/blaine.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/blaine.png diff --git a/src/canonical/trainers/blue.png b/src/canonical/trainers/gen4/heartgold-soulsilver/blue.png similarity index 100% rename from src/canonical/trainers/blue.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/blue.png diff --git a/src/canonical/trainers/boarder.png b/src/canonical/trainers/gen4/heartgold-soulsilver/boarder.png similarity index 100% rename from src/canonical/trainers/boarder.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/boarder.png diff --git a/src/canonical/trainers/brock.png b/src/canonical/trainers/gen4/heartgold-soulsilver/brock.png similarity index 100% rename from src/canonical/trainers/brock.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/brock.png diff --git a/src/canonical/trainers/bruno.png b/src/canonical/trainers/gen4/heartgold-soulsilver/bruno.png similarity index 100% rename from src/canonical/trainers/bruno.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/bruno.png diff --git a/src/canonical/trainers/bugsy.png b/src/canonical/trainers/gen4/heartgold-soulsilver/bugsy.png similarity index 100% rename from src/canonical/trainers/bugsy.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/bugsy.png diff --git a/src/canonical/trainers/burglar.png b/src/canonical/trainers/gen4/heartgold-soulsilver/burglar.png similarity index 100% rename from src/canonical/trainers/burglar.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/burglar.png diff --git a/src/canonical/trainers/chuck.png b/src/canonical/trainers/gen4/heartgold-soulsilver/chuck.png similarity index 100% rename from src/canonical/trainers/chuck.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/chuck.png diff --git a/src/canonical/trainers/clair.png b/src/canonical/trainers/gen4/heartgold-soulsilver/clair.png similarity index 100% rename from src/canonical/trainers/clair.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/clair.png diff --git a/src/canonical/trainers/erika.png b/src/canonical/trainers/gen4/heartgold-soulsilver/erika.png similarity index 100% rename from src/canonical/trainers/erika.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/erika.png diff --git a/src/canonical/trainers/ethan.png b/src/canonical/trainers/gen4/heartgold-soulsilver/ethan.png similarity index 100% rename from src/canonical/trainers/ethan.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/ethan.png diff --git a/src/canonical/trainers/eusine.png b/src/canonical/trainers/gen4/heartgold-soulsilver/eusine.png similarity index 100% rename from src/canonical/trainers/eusine.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/eusine.png diff --git a/src/canonical/trainers/falkner.png b/src/canonical/trainers/gen4/heartgold-soulsilver/falkner.png similarity index 100% rename from src/canonical/trainers/falkner.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/falkner.png diff --git a/src/canonical/trainers/firebreather.png b/src/canonical/trainers/gen4/heartgold-soulsilver/firebreather.png similarity index 100% rename from src/canonical/trainers/firebreather.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/firebreather.png diff --git a/src/canonical/trainers/gentleman-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/gentleman-gen4.png similarity index 100% rename from src/canonical/trainers/gentleman-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/gentleman-gen4.png diff --git a/src/canonical/trainers/giovanni.png b/src/canonical/trainers/gen4/heartgold-soulsilver/giovanni.png similarity index 100% rename from src/canonical/trainers/giovanni.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/giovanni.png diff --git a/src/canonical/trainers/janine.png b/src/canonical/trainers/gen4/heartgold-soulsilver/janine.png similarity index 100% rename from src/canonical/trainers/janine.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/janine.png diff --git a/src/canonical/trainers/jasmine.png b/src/canonical/trainers/gen4/heartgold-soulsilver/jasmine.png similarity index 100% rename from src/canonical/trainers/jasmine.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/jasmine.png diff --git a/src/canonical/trainers/juggler.png b/src/canonical/trainers/gen4/heartgold-soulsilver/juggler.png similarity index 100% rename from src/canonical/trainers/juggler.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/juggler.png diff --git a/src/canonical/trainers/karen.png b/src/canonical/trainers/gen4/heartgold-soulsilver/karen.png similarity index 100% rename from src/canonical/trainers/karen.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/karen.png diff --git a/src/canonical/trainers/kimonogirl.png b/src/canonical/trainers/gen4/heartgold-soulsilver/kimonogirl.png similarity index 100% rename from src/canonical/trainers/kimonogirl.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/kimonogirl.png diff --git a/src/canonical/trainers/koga.png b/src/canonical/trainers/gen4/heartgold-soulsilver/koga.png similarity index 100% rename from src/canonical/trainers/koga.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/koga.png diff --git a/src/canonical/trainers/lance.png b/src/canonical/trainers/gen4/heartgold-soulsilver/lance.png similarity index 100% rename from src/canonical/trainers/lance.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/lance.png diff --git a/src/canonical/trainers/lass-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/lass-gen4.png similarity index 100% rename from src/canonical/trainers/lass-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/lass-gen4.png diff --git a/src/canonical/trainers/li.png b/src/canonical/trainers/gen4/heartgold-soulsilver/li.png similarity index 100% rename from src/canonical/trainers/li.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/li.png diff --git a/src/canonical/trainers/ltsurge.png b/src/canonical/trainers/gen4/heartgold-soulsilver/ltsurge.png similarity index 100% rename from src/canonical/trainers/ltsurge.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/ltsurge.png diff --git a/src/canonical/trainers/lyra.png b/src/canonical/trainers/gen4/heartgold-soulsilver/lyra.png similarity index 100% rename from src/canonical/trainers/lyra.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/lyra.png diff --git a/src/canonical/trainers/medium.png b/src/canonical/trainers/gen4/heartgold-soulsilver/medium.png similarity index 100% rename from src/canonical/trainers/medium.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/medium.png diff --git a/src/canonical/trainers/misty.png b/src/canonical/trainers/gen4/heartgold-soulsilver/misty.png similarity index 100% rename from src/canonical/trainers/misty.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/misty.png diff --git a/src/canonical/trainers/morty.png b/src/canonical/trainers/gen4/heartgold-soulsilver/morty.png similarity index 100% rename from src/canonical/trainers/morty.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/morty.png diff --git a/src/canonical/trainers/petrel.png b/src/canonical/trainers/gen4/heartgold-soulsilver/petrel.png similarity index 100% rename from src/canonical/trainers/petrel.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/petrel.png diff --git a/src/canonical/trainers/pokemaniac.png b/src/canonical/trainers/gen4/heartgold-soulsilver/pokemaniac.png similarity index 100% rename from src/canonical/trainers/pokemaniac.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/pokemaniac.png diff --git a/src/canonical/trainers/proton.png b/src/canonical/trainers/gen4/heartgold-soulsilver/proton.png similarity index 100% rename from src/canonical/trainers/proton.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/proton.png diff --git a/src/canonical/trainers/pryce.png b/src/canonical/trainers/gen4/heartgold-soulsilver/pryce.png similarity index 100% rename from src/canonical/trainers/pryce.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/pryce.png diff --git a/src/canonical/trainers/red.png b/src/canonical/trainers/gen4/heartgold-soulsilver/red.png similarity index 100% rename from src/canonical/trainers/red.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/red.png diff --git a/src/canonical/trainers/rocketgrunt.png b/src/canonical/trainers/gen4/heartgold-soulsilver/rocketgrunt.png similarity index 100% rename from src/canonical/trainers/rocketgrunt.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/rocketgrunt.png diff --git a/src/canonical/trainers/rocketgruntf.png b/src/canonical/trainers/gen4/heartgold-soulsilver/rocketgruntf.png similarity index 100% rename from src/canonical/trainers/rocketgruntf.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/rocketgruntf.png diff --git a/src/canonical/trainers/sabrina.png b/src/canonical/trainers/gen4/heartgold-soulsilver/sabrina.png similarity index 100% rename from src/canonical/trainers/sabrina.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/sabrina.png diff --git a/src/canonical/trainers/sage.png b/src/canonical/trainers/gen4/heartgold-soulsilver/sage.png similarity index 100% rename from src/canonical/trainers/sage.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/sage.png diff --git a/src/canonical/trainers/schoolkid-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/schoolkid-gen4.png similarity index 100% rename from src/canonical/trainers/schoolkid-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/schoolkid-gen4.png diff --git a/src/canonical/trainers/scientist-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/scientist-gen4.png similarity index 100% rename from src/canonical/trainers/scientist-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/scientist-gen4.png diff --git a/src/canonical/trainers/silver.png b/src/canonical/trainers/gen4/heartgold-soulsilver/silver.png similarity index 100% rename from src/canonical/trainers/silver.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/silver.png diff --git a/src/canonical/trainers/skierf.png b/src/canonical/trainers/gen4/heartgold-soulsilver/skierf.png similarity index 100% rename from src/canonical/trainers/skierf.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/skierf.png diff --git a/src/canonical/trainers/supernerd.png b/src/canonical/trainers/gen4/heartgold-soulsilver/supernerd.png similarity index 100% rename from src/canonical/trainers/supernerd.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/supernerd.png diff --git a/src/canonical/trainers/swimmer-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/swimmer-gen4.png similarity index 100% rename from src/canonical/trainers/swimmer-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/swimmer-gen4.png diff --git a/src/canonical/trainers/swimmerf-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/swimmerf-gen4.png similarity index 100% rename from src/canonical/trainers/swimmerf-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/swimmerf-gen4.png diff --git a/src/canonical/trainers/teacher.png b/src/canonical/trainers/gen4/heartgold-soulsilver/teacher.png similarity index 100% rename from src/canonical/trainers/teacher.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/teacher.png diff --git a/src/canonical/trainers/twins-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/twins-gen4.png similarity index 100% rename from src/canonical/trainers/twins-gen4.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/twins-gen4.png diff --git a/src/canonical/trainers/whitney.png b/src/canonical/trainers/gen4/heartgold-soulsilver/whitney.png similarity index 100% rename from src/canonical/trainers/whitney.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/whitney.png diff --git a/src/canonical/trainers/will.png b/src/canonical/trainers/gen4/heartgold-soulsilver/will.png similarity index 100% rename from src/canonical/trainers/will.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/will.png diff --git a/src/canonical/trainers/youngcouple.png b/src/canonical/trainers/gen4/heartgold-soulsilver/youngcouple.png similarity index 100% rename from src/canonical/trainers/youngcouple.png rename to src/canonical/trainers/gen4/heartgold-soulsilver/youngcouple.png diff --git a/src/canonical/trainers/argenta.png b/src/canonical/trainers/gen4/platinum/argenta.png similarity index 100% rename from src/canonical/trainers/argenta.png rename to src/canonical/trainers/gen4/platinum/argenta.png diff --git a/src/canonical/trainers/dahlia.png b/src/canonical/trainers/gen4/platinum/dahlia.png similarity index 100% rename from src/canonical/trainers/dahlia.png rename to src/canonical/trainers/gen4/platinum/dahlia.png diff --git a/src/canonical/trainers/darach.png b/src/canonical/trainers/gen4/platinum/darach.png similarity index 100% rename from src/canonical/trainers/darach.png rename to src/canonical/trainers/gen4/platinum/darach.png diff --git a/src/canonical/trainers/dawn-gen4pt.png b/src/canonical/trainers/gen4/platinum/dawn-gen4pt.png similarity index 100% rename from src/canonical/trainers/dawn-gen4pt.png rename to src/canonical/trainers/gen4/platinum/dawn-gen4pt.png diff --git a/src/canonical/trainers/lucas-gen4pt.png b/src/canonical/trainers/gen4/platinum/lucas-gen4pt.png similarity index 100% rename from src/canonical/trainers/lucas-gen4pt.png rename to src/canonical/trainers/gen4/platinum/lucas-gen4pt.png diff --git a/src/canonical/trainers/thorton.png b/src/canonical/trainers/gen4/platinum/thorton.png similarity index 100% rename from src/canonical/trainers/thorton.png rename to src/canonical/trainers/gen4/platinum/thorton.png diff --git a/src/canonical/trainers/acetrainer.png b/src/canonical/trainers/gen5/black-white/acetrainer.png similarity index 100% rename from src/canonical/trainers/acetrainer.png rename to src/canonical/trainers/gen5/black-white/acetrainer.png diff --git a/src/canonical/trainers/acetrainerf.png b/src/canonical/trainers/gen5/black-white/acetrainerf.png similarity index 100% rename from src/canonical/trainers/acetrainerf.png rename to src/canonical/trainers/gen5/black-white/acetrainerf.png diff --git a/src/canonical/trainers/alder.png b/src/canonical/trainers/gen5/black-white/alder.png similarity index 100% rename from src/canonical/trainers/alder.png rename to src/canonical/trainers/gen5/black-white/alder.png diff --git a/src/canonical/trainers/artist.png b/src/canonical/trainers/gen5/black-white/artist.png similarity index 100% rename from src/canonical/trainers/artist.png rename to src/canonical/trainers/gen5/black-white/artist.png diff --git a/src/canonical/trainers/backers.png b/src/canonical/trainers/gen5/black-white/backers.png similarity index 100% rename from src/canonical/trainers/backers.png rename to src/canonical/trainers/gen5/black-white/backers.png diff --git a/src/canonical/trainers/backersf.png b/src/canonical/trainers/gen5/black-white/backersf.png similarity index 100% rename from src/canonical/trainers/backersf.png rename to src/canonical/trainers/gen5/black-white/backersf.png diff --git a/src/canonical/trainers/backpacker.png b/src/canonical/trainers/gen5/black-white/backpacker.png similarity index 100% rename from src/canonical/trainers/backpacker.png rename to src/canonical/trainers/gen5/black-white/backpacker.png diff --git a/src/canonical/trainers/backpackerf.png b/src/canonical/trainers/gen5/black-white/backpackerf.png similarity index 100% rename from src/canonical/trainers/backpackerf.png rename to src/canonical/trainers/gen5/black-white/backpackerf.png diff --git a/src/canonical/trainers/baker.png b/src/canonical/trainers/gen5/black-white/baker.png similarity index 100% rename from src/canonical/trainers/baker.png rename to src/canonical/trainers/gen5/black-white/baker.png diff --git a/src/canonical/trainers/battlegirl.png b/src/canonical/trainers/gen5/black-white/battlegirl.png similarity index 100% rename from src/canonical/trainers/battlegirl.png rename to src/canonical/trainers/gen5/black-white/battlegirl.png diff --git a/src/canonical/trainers/bianca.png b/src/canonical/trainers/gen5/black-white/bianca.png similarity index 100% rename from src/canonical/trainers/bianca.png rename to src/canonical/trainers/gen5/black-white/bianca.png diff --git a/src/canonical/trainers/biker.png b/src/canonical/trainers/gen5/black-white/biker.png similarity index 100% rename from src/canonical/trainers/biker.png rename to src/canonical/trainers/gen5/black-white/biker.png diff --git a/src/canonical/trainers/blackbelt.png b/src/canonical/trainers/gen5/black-white/blackbelt.png similarity index 100% rename from src/canonical/trainers/blackbelt.png rename to src/canonical/trainers/gen5/black-white/blackbelt.png diff --git a/src/canonical/trainers/brycen.png b/src/canonical/trainers/gen5/black-white/brycen.png similarity index 100% rename from src/canonical/trainers/brycen.png rename to src/canonical/trainers/gen5/black-white/brycen.png diff --git a/src/canonical/trainers/burgh.png b/src/canonical/trainers/gen5/black-white/burgh.png similarity index 100% rename from src/canonical/trainers/burgh.png rename to src/canonical/trainers/gen5/black-white/burgh.png diff --git a/src/canonical/trainers/caitlin.png b/src/canonical/trainers/gen5/black-white/caitlin.png similarity index 100% rename from src/canonical/trainers/caitlin.png rename to src/canonical/trainers/gen5/black-white/caitlin.png diff --git a/src/canonical/trainers/cheren.png b/src/canonical/trainers/gen5/black-white/cheren.png similarity index 100% rename from src/canonical/trainers/cheren.png rename to src/canonical/trainers/gen5/black-white/cheren.png diff --git a/src/canonical/trainers/chili.png b/src/canonical/trainers/gen5/black-white/chili.png similarity index 100% rename from src/canonical/trainers/chili.png rename to src/canonical/trainers/gen5/black-white/chili.png diff --git a/src/canonical/trainers/cilan.png b/src/canonical/trainers/gen5/black-white/cilan.png similarity index 100% rename from src/canonical/trainers/cilan.png rename to src/canonical/trainers/gen5/black-white/cilan.png diff --git a/src/canonical/trainers/clay.png b/src/canonical/trainers/gen5/black-white/clay.png similarity index 100% rename from src/canonical/trainers/clay.png rename to src/canonical/trainers/gen5/black-white/clay.png diff --git a/src/canonical/trainers/clerk-boss.png b/src/canonical/trainers/gen5/black-white/clerk-boss.png similarity index 100% rename from src/canonical/trainers/clerk-boss.png rename to src/canonical/trainers/gen5/black-white/clerk-boss.png diff --git a/src/canonical/trainers/clerk.png b/src/canonical/trainers/gen5/black-white/clerk.png similarity index 100% rename from src/canonical/trainers/clerk.png rename to src/canonical/trainers/gen5/black-white/clerk.png diff --git a/src/canonical/trainers/clerkf.png b/src/canonical/trainers/gen5/black-white/clerkf.png similarity index 100% rename from src/canonical/trainers/clerkf.png rename to src/canonical/trainers/gen5/black-white/clerkf.png diff --git a/src/canonical/trainers/cress.png b/src/canonical/trainers/gen5/black-white/cress.png similarity index 100% rename from src/canonical/trainers/cress.png rename to src/canonical/trainers/gen5/black-white/cress.png diff --git a/src/canonical/trainers/cyclist.png b/src/canonical/trainers/gen5/black-white/cyclist.png similarity index 100% rename from src/canonical/trainers/cyclist.png rename to src/canonical/trainers/gen5/black-white/cyclist.png diff --git a/src/canonical/trainers/cyclistf.png b/src/canonical/trainers/gen5/black-white/cyclistf.png similarity index 100% rename from src/canonical/trainers/cyclistf.png rename to src/canonical/trainers/gen5/black-white/cyclistf.png diff --git a/src/canonical/trainers/cynthia.png b/src/canonical/trainers/gen5/black-white/cynthia.png similarity index 100% rename from src/canonical/trainers/cynthia.png rename to src/canonical/trainers/gen5/black-white/cynthia.png diff --git a/src/canonical/trainers/dancer.png b/src/canonical/trainers/gen5/black-white/dancer.png similarity index 100% rename from src/canonical/trainers/dancer.png rename to src/canonical/trainers/gen5/black-white/dancer.png diff --git a/src/canonical/trainers/depotagent.png b/src/canonical/trainers/gen5/black-white/depotagent.png similarity index 100% rename from src/canonical/trainers/depotagent.png rename to src/canonical/trainers/gen5/black-white/depotagent.png diff --git a/src/canonical/trainers/doctor.png b/src/canonical/trainers/gen5/black-white/doctor.png similarity index 100% rename from src/canonical/trainers/doctor.png rename to src/canonical/trainers/gen5/black-white/doctor.png diff --git a/src/canonical/trainers/drayden.png b/src/canonical/trainers/gen5/black-white/drayden.png similarity index 100% rename from src/canonical/trainers/drayden.png rename to src/canonical/trainers/gen5/black-white/drayden.png diff --git a/src/canonical/trainers/elesa.png b/src/canonical/trainers/gen5/black-white/elesa.png similarity index 100% rename from src/canonical/trainers/elesa.png rename to src/canonical/trainers/gen5/black-white/elesa.png diff --git a/src/canonical/trainers/emmet.png b/src/canonical/trainers/gen5/black-white/emmet.png similarity index 100% rename from src/canonical/trainers/emmet.png rename to src/canonical/trainers/gen5/black-white/emmet.png diff --git a/src/canonical/trainers/fisherman.png b/src/canonical/trainers/gen5/black-white/fisherman.png similarity index 100% rename from src/canonical/trainers/fisherman.png rename to src/canonical/trainers/gen5/black-white/fisherman.png diff --git a/src/canonical/trainers/gentleman.png b/src/canonical/trainers/gen5/black-white/gentleman.png similarity index 100% rename from src/canonical/trainers/gentleman.png rename to src/canonical/trainers/gen5/black-white/gentleman.png diff --git a/src/canonical/trainers/ghetsis-gen5bw.png b/src/canonical/trainers/gen5/black-white/ghetsis-gen5bw.png similarity index 100% rename from src/canonical/trainers/ghetsis-gen5bw.png rename to src/canonical/trainers/gen5/black-white/ghetsis-gen5bw.png diff --git a/src/canonical/trainers/grimsley.png b/src/canonical/trainers/gen5/black-white/grimsley.png similarity index 100% rename from src/canonical/trainers/grimsley.png rename to src/canonical/trainers/gen5/black-white/grimsley.png diff --git a/src/canonical/trainers/harlequin.png b/src/canonical/trainers/gen5/black-white/harlequin.png similarity index 100% rename from src/canonical/trainers/harlequin.png rename to src/canonical/trainers/gen5/black-white/harlequin.png diff --git a/src/canonical/trainers/hiker.png b/src/canonical/trainers/gen5/black-white/hiker.png similarity index 100% rename from src/canonical/trainers/hiker.png rename to src/canonical/trainers/gen5/black-white/hiker.png diff --git a/src/canonical/trainers/hilbert-dueldisk.png b/src/canonical/trainers/gen5/black-white/hilbert-dueldisk.png similarity index 100% rename from src/canonical/trainers/hilbert-dueldisk.png rename to src/canonical/trainers/gen5/black-white/hilbert-dueldisk.png diff --git a/src/canonical/trainers/hilbert.png b/src/canonical/trainers/gen5/black-white/hilbert.png similarity index 100% rename from src/canonical/trainers/hilbert.png rename to src/canonical/trainers/gen5/black-white/hilbert.png diff --git a/src/canonical/trainers/hilda-dueldisk.png b/src/canonical/trainers/gen5/black-white/hilda-dueldisk.png similarity index 100% rename from src/canonical/trainers/hilda-dueldisk.png rename to src/canonical/trainers/gen5/black-white/hilda-dueldisk.png diff --git a/src/canonical/trainers/hilda.png b/src/canonical/trainers/gen5/black-white/hilda.png similarity index 100% rename from src/canonical/trainers/hilda.png rename to src/canonical/trainers/gen5/black-white/hilda.png diff --git a/src/canonical/trainers/hooligans.png b/src/canonical/trainers/gen5/black-white/hooligans.png similarity index 100% rename from src/canonical/trainers/hooligans.png rename to src/canonical/trainers/gen5/black-white/hooligans.png diff --git a/src/canonical/trainers/hoopster.png b/src/canonical/trainers/gen5/black-white/hoopster.png similarity index 100% rename from src/canonical/trainers/hoopster.png rename to src/canonical/trainers/gen5/black-white/hoopster.png diff --git a/src/canonical/trainers/infielder.png b/src/canonical/trainers/gen5/black-white/infielder.png similarity index 100% rename from src/canonical/trainers/infielder.png rename to src/canonical/trainers/gen5/black-white/infielder.png diff --git a/src/canonical/trainers/ingo.png b/src/canonical/trainers/gen5/black-white/ingo.png similarity index 100% rename from src/canonical/trainers/ingo.png rename to src/canonical/trainers/gen5/black-white/ingo.png diff --git a/src/canonical/trainers/iris.png b/src/canonical/trainers/gen5/black-white/iris.png similarity index 100% rename from src/canonical/trainers/iris.png rename to src/canonical/trainers/gen5/black-white/iris.png diff --git a/src/canonical/trainers/janitor.png b/src/canonical/trainers/gen5/black-white/janitor.png similarity index 100% rename from src/canonical/trainers/janitor.png rename to src/canonical/trainers/gen5/black-white/janitor.png diff --git a/src/canonical/trainers/lady.png b/src/canonical/trainers/gen5/black-white/lady.png similarity index 100% rename from src/canonical/trainers/lady.png rename to src/canonical/trainers/gen5/black-white/lady.png diff --git a/src/canonical/trainers/lass.png b/src/canonical/trainers/gen5/black-white/lass.png similarity index 100% rename from src/canonical/trainers/lass.png rename to src/canonical/trainers/gen5/black-white/lass.png diff --git a/src/canonical/trainers/lenora.png b/src/canonical/trainers/gen5/black-white/lenora.png similarity index 100% rename from src/canonical/trainers/lenora.png rename to src/canonical/trainers/gen5/black-white/lenora.png diff --git a/src/canonical/trainers/linebacker.png b/src/canonical/trainers/gen5/black-white/linebacker.png similarity index 100% rename from src/canonical/trainers/linebacker.png rename to src/canonical/trainers/gen5/black-white/linebacker.png diff --git a/src/canonical/trainers/madame.png b/src/canonical/trainers/gen5/black-white/madame.png similarity index 100% rename from src/canonical/trainers/madame.png rename to src/canonical/trainers/gen5/black-white/madame.png diff --git a/src/canonical/trainers/maid.png b/src/canonical/trainers/gen5/black-white/maid.png similarity index 100% rename from src/canonical/trainers/maid.png rename to src/canonical/trainers/gen5/black-white/maid.png diff --git a/src/canonical/trainers/marshal.png b/src/canonical/trainers/gen5/black-white/marshal.png similarity index 100% rename from src/canonical/trainers/marshal.png rename to src/canonical/trainers/gen5/black-white/marshal.png diff --git a/src/canonical/trainers/musician.png b/src/canonical/trainers/gen5/black-white/musician.png similarity index 100% rename from src/canonical/trainers/musician.png rename to src/canonical/trainers/gen5/black-white/musician.png diff --git a/src/canonical/trainers/n.png b/src/canonical/trainers/gen5/black-white/n.png similarity index 100% rename from src/canonical/trainers/n.png rename to src/canonical/trainers/gen5/black-white/n.png diff --git a/src/canonical/trainers/nurse.png b/src/canonical/trainers/gen5/black-white/nurse.png similarity index 100% rename from src/canonical/trainers/nurse.png rename to src/canonical/trainers/gen5/black-white/nurse.png diff --git a/src/canonical/trainers/nurseryaide.png b/src/canonical/trainers/gen5/black-white/nurseryaide.png similarity index 100% rename from src/canonical/trainers/nurseryaide.png rename to src/canonical/trainers/gen5/black-white/nurseryaide.png diff --git a/src/canonical/trainers/parasollady.png b/src/canonical/trainers/gen5/black-white/parasollady.png similarity index 100% rename from src/canonical/trainers/parasollady.png rename to src/canonical/trainers/gen5/black-white/parasollady.png diff --git a/src/canonical/trainers/pilot.png b/src/canonical/trainers/gen5/black-white/pilot.png similarity index 100% rename from src/canonical/trainers/pilot.png rename to src/canonical/trainers/gen5/black-white/pilot.png diff --git a/src/canonical/trainers/plasmagrunt-gen5bw.png b/src/canonical/trainers/gen5/black-white/plasmagrunt-gen5bw.png similarity index 100% rename from src/canonical/trainers/plasmagrunt-gen5bw.png rename to src/canonical/trainers/gen5/black-white/plasmagrunt-gen5bw.png diff --git a/src/canonical/trainers/plasmagruntf-gen5bw.png b/src/canonical/trainers/gen5/black-white/plasmagruntf-gen5bw.png similarity index 100% rename from src/canonical/trainers/plasmagruntf-gen5bw.png rename to src/canonical/trainers/gen5/black-white/plasmagruntf-gen5bw.png diff --git a/src/canonical/trainers/pokefan.png b/src/canonical/trainers/gen5/black-white/pokefan.png similarity index 100% rename from src/canonical/trainers/pokefan.png rename to src/canonical/trainers/gen5/black-white/pokefan.png diff --git a/src/canonical/trainers/pokefanf.png b/src/canonical/trainers/gen5/black-white/pokefanf.png similarity index 100% rename from src/canonical/trainers/pokefanf.png rename to src/canonical/trainers/gen5/black-white/pokefanf.png diff --git a/src/canonical/trainers/pokemonbreeder.png b/src/canonical/trainers/gen5/black-white/pokemonbreeder.png similarity index 100% rename from src/canonical/trainers/pokemonbreeder.png rename to src/canonical/trainers/gen5/black-white/pokemonbreeder.png diff --git a/src/canonical/trainers/pokemonbreederf.png b/src/canonical/trainers/gen5/black-white/pokemonbreederf.png similarity index 100% rename from src/canonical/trainers/pokemonbreederf.png rename to src/canonical/trainers/gen5/black-white/pokemonbreederf.png diff --git a/src/canonical/trainers/pokemonranger.png b/src/canonical/trainers/gen5/black-white/pokemonranger.png similarity index 100% rename from src/canonical/trainers/pokemonranger.png rename to src/canonical/trainers/gen5/black-white/pokemonranger.png diff --git a/src/canonical/trainers/pokemonrangerf.png b/src/canonical/trainers/gen5/black-white/pokemonrangerf.png similarity index 100% rename from src/canonical/trainers/pokemonrangerf.png rename to src/canonical/trainers/gen5/black-white/pokemonrangerf.png diff --git a/src/canonical/trainers/policeman.png b/src/canonical/trainers/gen5/black-white/policeman.png similarity index 100% rename from src/canonical/trainers/policeman.png rename to src/canonical/trainers/gen5/black-white/policeman.png diff --git a/src/canonical/trainers/preschooler.png b/src/canonical/trainers/gen5/black-white/preschooler.png similarity index 100% rename from src/canonical/trainers/preschooler.png rename to src/canonical/trainers/gen5/black-white/preschooler.png diff --git a/src/canonical/trainers/preschoolerf.png b/src/canonical/trainers/gen5/black-white/preschoolerf.png similarity index 100% rename from src/canonical/trainers/preschoolerf.png rename to src/canonical/trainers/gen5/black-white/preschoolerf.png diff --git a/src/canonical/trainers/psychic.png b/src/canonical/trainers/gen5/black-white/psychic.png similarity index 100% rename from src/canonical/trainers/psychic.png rename to src/canonical/trainers/gen5/black-white/psychic.png diff --git a/src/canonical/trainers/psychicf.png b/src/canonical/trainers/gen5/black-white/psychicf.png similarity index 100% rename from src/canonical/trainers/psychicf.png rename to src/canonical/trainers/gen5/black-white/psychicf.png diff --git a/src/canonical/trainers/richboy.png b/src/canonical/trainers/gen5/black-white/richboy.png similarity index 100% rename from src/canonical/trainers/richboy.png rename to src/canonical/trainers/gen5/black-white/richboy.png diff --git a/src/canonical/trainers/roughneck.png b/src/canonical/trainers/gen5/black-white/roughneck.png similarity index 100% rename from src/canonical/trainers/roughneck.png rename to src/canonical/trainers/gen5/black-white/roughneck.png diff --git a/src/canonical/trainers/schoolkid.png b/src/canonical/trainers/gen5/black-white/schoolkid.png similarity index 100% rename from src/canonical/trainers/schoolkid.png rename to src/canonical/trainers/gen5/black-white/schoolkid.png diff --git a/src/canonical/trainers/schoolkidf.png b/src/canonical/trainers/gen5/black-white/schoolkidf.png similarity index 100% rename from src/canonical/trainers/schoolkidf.png rename to src/canonical/trainers/gen5/black-white/schoolkidf.png diff --git a/src/canonical/trainers/scientist.png b/src/canonical/trainers/gen5/black-white/scientist.png similarity index 100% rename from src/canonical/trainers/scientist.png rename to src/canonical/trainers/gen5/black-white/scientist.png diff --git a/src/canonical/trainers/scientistf.png b/src/canonical/trainers/gen5/black-white/scientistf.png similarity index 100% rename from src/canonical/trainers/scientistf.png rename to src/canonical/trainers/gen5/black-white/scientistf.png diff --git a/src/canonical/trainers/shauntal.png b/src/canonical/trainers/gen5/black-white/shauntal.png similarity index 100% rename from src/canonical/trainers/shauntal.png rename to src/canonical/trainers/gen5/black-white/shauntal.png diff --git a/src/canonical/trainers/skyla.png b/src/canonical/trainers/gen5/black-white/skyla.png similarity index 100% rename from src/canonical/trainers/skyla.png rename to src/canonical/trainers/gen5/black-white/skyla.png diff --git a/src/canonical/trainers/smasher.png b/src/canonical/trainers/gen5/black-white/smasher.png similarity index 100% rename from src/canonical/trainers/smasher.png rename to src/canonical/trainers/gen5/black-white/smasher.png diff --git a/src/canonical/trainers/striker.png b/src/canonical/trainers/gen5/black-white/striker.png similarity index 100% rename from src/canonical/trainers/striker.png rename to src/canonical/trainers/gen5/black-white/striker.png diff --git a/src/canonical/trainers/swimmer.png b/src/canonical/trainers/gen5/black-white/swimmer.png similarity index 100% rename from src/canonical/trainers/swimmer.png rename to src/canonical/trainers/gen5/black-white/swimmer.png diff --git a/src/canonical/trainers/swimmerf.png b/src/canonical/trainers/gen5/black-white/swimmerf.png similarity index 100% rename from src/canonical/trainers/swimmerf.png rename to src/canonical/trainers/gen5/black-white/swimmerf.png diff --git a/src/canonical/trainers/twins.png b/src/canonical/trainers/gen5/black-white/twins.png similarity index 100% rename from src/canonical/trainers/twins.png rename to src/canonical/trainers/gen5/black-white/twins.png diff --git a/src/canonical/trainers/veteran.png b/src/canonical/trainers/gen5/black-white/veteran.png similarity index 100% rename from src/canonical/trainers/veteran.png rename to src/canonical/trainers/gen5/black-white/veteran.png diff --git a/src/canonical/trainers/veteranf.png b/src/canonical/trainers/gen5/black-white/veteranf.png similarity index 100% rename from src/canonical/trainers/veteranf.png rename to src/canonical/trainers/gen5/black-white/veteranf.png diff --git a/src/canonical/trainers/waiter.png b/src/canonical/trainers/gen5/black-white/waiter.png similarity index 100% rename from src/canonical/trainers/waiter.png rename to src/canonical/trainers/gen5/black-white/waiter.png diff --git a/src/canonical/trainers/waitress.png b/src/canonical/trainers/gen5/black-white/waitress.png similarity index 100% rename from src/canonical/trainers/waitress.png rename to src/canonical/trainers/gen5/black-white/waitress.png diff --git a/src/canonical/trainers/worker.png b/src/canonical/trainers/gen5/black-white/worker.png similarity index 100% rename from src/canonical/trainers/worker.png rename to src/canonical/trainers/gen5/black-white/worker.png diff --git a/src/canonical/trainers/workerice.png b/src/canonical/trainers/gen5/black-white/workerice.png similarity index 100% rename from src/canonical/trainers/workerice.png rename to src/canonical/trainers/gen5/black-white/workerice.png diff --git a/src/canonical/trainers/youngster.png b/src/canonical/trainers/gen5/black-white/youngster.png similarity index 100% rename from src/canonical/trainers/youngster.png rename to src/canonical/trainers/gen5/black-white/youngster.png diff --git a/src/canonical/trainers/beauty-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/beauty-gen5bw2.png similarity index 100% rename from src/canonical/trainers/beauty-gen5bw2.png rename to src/canonical/trainers/gen5/black2-white2/beauty-gen5bw2.png diff --git a/src/canonical/trainers/bellelba.png b/src/canonical/trainers/gen5/black2-white2/bellelba.png similarity index 100% rename from src/canonical/trainers/bellelba.png rename to src/canonical/trainers/gen5/black2-white2/bellelba.png diff --git a/src/canonical/trainers/benga.png b/src/canonical/trainers/gen5/black2-white2/benga.png similarity index 100% rename from src/canonical/trainers/benga.png rename to src/canonical/trainers/gen5/black2-white2/benga.png diff --git a/src/canonical/trainers/bianca-pwt.png b/src/canonical/trainers/gen5/black2-white2/bianca-pwt.png similarity index 100% rename from src/canonical/trainers/bianca-pwt.png rename to src/canonical/trainers/gen5/black2-white2/bianca-pwt.png diff --git a/src/canonical/trainers/brawly.png b/src/canonical/trainers/gen5/black2-white2/brawly.png similarity index 100% rename from src/canonical/trainers/brawly.png rename to src/canonical/trainers/gen5/black2-white2/brawly.png diff --git a/src/canonical/trainers/brycenman.png b/src/canonical/trainers/gen5/black2-white2/brycenman.png similarity index 100% rename from src/canonical/trainers/brycenman.png rename to src/canonical/trainers/gen5/black2-white2/brycenman.png diff --git a/src/canonical/trainers/cheren-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/cheren-gen5bw2.png similarity index 100% rename from src/canonical/trainers/cheren-gen5bw2.png rename to src/canonical/trainers/gen5/black2-white2/cheren-gen5bw2.png diff --git a/src/canonical/trainers/colress.png b/src/canonical/trainers/gen5/black2-white2/colress.png similarity index 100% rename from src/canonical/trainers/colress.png rename to src/canonical/trainers/gen5/black2-white2/colress.png diff --git a/src/canonical/trainers/elesa-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/elesa-gen5bw2.png similarity index 100% rename from src/canonical/trainers/elesa-gen5bw2.png rename to src/canonical/trainers/gen5/black2-white2/elesa-gen5bw2.png diff --git a/src/canonical/trainers/flannery.png b/src/canonical/trainers/gen5/black2-white2/flannery.png similarity index 100% rename from src/canonical/trainers/flannery.png rename to src/canonical/trainers/gen5/black2-white2/flannery.png diff --git a/src/canonical/trainers/ghetsis.png b/src/canonical/trainers/gen5/black2-white2/ghetsis.png similarity index 100% rename from src/canonical/trainers/ghetsis.png rename to src/canonical/trainers/gen5/black2-white2/ghetsis.png diff --git a/src/canonical/trainers/guitarist.png b/src/canonical/trainers/gen5/black2-white2/guitarist.png similarity index 100% rename from src/canonical/trainers/guitarist.png rename to src/canonical/trainers/gen5/black2-white2/guitarist.png diff --git a/src/canonical/trainers/hugh.png b/src/canonical/trainers/gen5/black2-white2/hugh.png similarity index 100% rename from src/canonical/trainers/hugh.png rename to src/canonical/trainers/gen5/black2-white2/hugh.png diff --git a/src/canonical/trainers/iris-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/iris-gen5bw2.png similarity index 100% rename from src/canonical/trainers/iris-gen5bw2.png rename to src/canonical/trainers/gen5/black2-white2/iris-gen5bw2.png diff --git a/src/canonical/trainers/juan.png b/src/canonical/trainers/gen5/black2-white2/juan.png similarity index 100% rename from src/canonical/trainers/juan.png rename to src/canonical/trainers/gen5/black2-white2/juan.png diff --git a/src/canonical/trainers/liza.png b/src/canonical/trainers/gen5/black2-white2/liza.png similarity index 100% rename from src/canonical/trainers/liza.png rename to src/canonical/trainers/gen5/black2-white2/liza.png diff --git a/src/canonical/trainers/marlon.png b/src/canonical/trainers/gen5/black2-white2/marlon.png similarity index 100% rename from src/canonical/trainers/marlon.png rename to src/canonical/trainers/gen5/black2-white2/marlon.png diff --git a/src/canonical/trainers/nate-dueldisk.png b/src/canonical/trainers/gen5/black2-white2/nate-dueldisk.png similarity index 100% rename from src/canonical/trainers/nate-dueldisk.png rename to src/canonical/trainers/gen5/black2-white2/nate-dueldisk.png diff --git a/src/canonical/trainers/nate.png b/src/canonical/trainers/gen5/black2-white2/nate.png similarity index 100% rename from src/canonical/trainers/nate.png rename to src/canonical/trainers/gen5/black2-white2/nate.png diff --git a/src/canonical/trainers/norman.png b/src/canonical/trainers/gen5/black2-white2/norman.png similarity index 100% rename from src/canonical/trainers/norman.png rename to src/canonical/trainers/gen5/black2-white2/norman.png diff --git a/src/canonical/trainers/plasmagrunt.png b/src/canonical/trainers/gen5/black2-white2/plasmagrunt.png similarity index 100% rename from src/canonical/trainers/plasmagrunt.png rename to src/canonical/trainers/gen5/black2-white2/plasmagrunt.png diff --git a/src/canonical/trainers/plasmagruntf.png b/src/canonical/trainers/gen5/black2-white2/plasmagruntf.png similarity index 100% rename from src/canonical/trainers/plasmagruntf.png rename to src/canonical/trainers/gen5/black2-white2/plasmagruntf.png diff --git a/src/canonical/trainers/rood.png b/src/canonical/trainers/gen5/black2-white2/rood.png similarity index 100% rename from src/canonical/trainers/rood.png rename to src/canonical/trainers/gen5/black2-white2/rood.png diff --git a/src/canonical/trainers/rosa-dueldisk.png b/src/canonical/trainers/gen5/black2-white2/rosa-dueldisk.png similarity index 100% rename from src/canonical/trainers/rosa-dueldisk.png rename to src/canonical/trainers/gen5/black2-white2/rosa-dueldisk.png diff --git a/src/canonical/trainers/rosa.png b/src/canonical/trainers/gen5/black2-white2/rosa.png similarity index 100% rename from src/canonical/trainers/rosa.png rename to src/canonical/trainers/gen5/black2-white2/rosa.png diff --git a/src/canonical/trainers/roxanne.png b/src/canonical/trainers/gen5/black2-white2/roxanne.png similarity index 100% rename from src/canonical/trainers/roxanne.png rename to src/canonical/trainers/gen5/black2-white2/roxanne.png diff --git a/src/canonical/trainers/roxie.png b/src/canonical/trainers/gen5/black2-white2/roxie.png similarity index 100% rename from src/canonical/trainers/roxie.png rename to src/canonical/trainers/gen5/black2-white2/roxie.png diff --git a/src/canonical/trainers/shadowtriad.png b/src/canonical/trainers/gen5/black2-white2/shadowtriad.png similarity index 100% rename from src/canonical/trainers/shadowtriad.png rename to src/canonical/trainers/gen5/black2-white2/shadowtriad.png diff --git a/src/canonical/trainers/steven.png b/src/canonical/trainers/gen5/black2-white2/steven.png similarity index 100% rename from src/canonical/trainers/steven.png rename to src/canonical/trainers/gen5/black2-white2/steven.png diff --git a/src/canonical/trainers/tate.png b/src/canonical/trainers/gen5/black2-white2/tate.png similarity index 100% rename from src/canonical/trainers/tate.png rename to src/canonical/trainers/gen5/black2-white2/tate.png diff --git a/src/canonical/trainers/wallace.png b/src/canonical/trainers/gen5/black2-white2/wallace.png similarity index 100% rename from src/canonical/trainers/wallace.png rename to src/canonical/trainers/gen5/black2-white2/wallace.png diff --git a/src/canonical/trainers/wattson.png b/src/canonical/trainers/gen5/black2-white2/wattson.png similarity index 100% rename from src/canonical/trainers/wattson.png rename to src/canonical/trainers/gen5/black2-white2/wattson.png diff --git a/src/canonical/trainers/winona.png b/src/canonical/trainers/gen5/black2-white2/winona.png similarity index 100% rename from src/canonical/trainers/winona.png rename to src/canonical/trainers/gen5/black2-white2/winona.png diff --git a/src/canonical/trainers/zinzolin.png b/src/canonical/trainers/gen5/black2-white2/zinzolin.png similarity index 100% rename from src/canonical/trainers/zinzolin.png rename to src/canonical/trainers/gen5/black2-white2/zinzolin.png diff --git a/src/canonical/trainers/juniper.png b/src/noncanonical/trainers/gen5/black-white/juniper.png similarity index 100% rename from src/canonical/trainers/juniper.png rename to src/noncanonical/trainers/gen5/black-white/juniper.png diff --git a/src/canonical/trainers/youngn.png b/src/noncanonical/trainers/gen5/black-white/youngn.png similarity index 100% rename from src/canonical/trainers/youngn.png rename to src/noncanonical/trainers/gen5/black-white/youngn.png diff --git a/src/canonical/trainers/brawly-gen6.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/brawly-gen6.png similarity index 100% rename from src/canonical/trainers/brawly-gen6.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/brawly-gen6.png diff --git a/src/canonical/trainers/shelly.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/shelly.png similarity index 100% rename from src/canonical/trainers/shelly.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/shelly.png diff --git a/src/canonical/trainers/sidney.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/sidney.png similarity index 100% rename from src/canonical/trainers/sidney.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/sidney.png diff --git a/src/canonical/trainers/wallace-gen6.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/wallace-gen6.png similarity index 100% rename from src/canonical/trainers/wallace-gen6.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/wallace-gen6.png diff --git a/src/canonical/trainers/wally.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/wally.png similarity index 100% rename from src/canonical/trainers/wally.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/wally.png diff --git a/src/canonical/trainers/winona-gen6.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/winona-gen6.png similarity index 100% rename from src/canonical/trainers/winona-gen6.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/winona-gen6.png diff --git a/src/canonical/trainers/zinnia.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/zinnia.png similarity index 100% rename from src/canonical/trainers/zinnia.png rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/zinnia.png diff --git a/src/canonical/trainers/az.png b/src/noncanonical/trainers/gen6/x-y/az.png similarity index 100% rename from src/canonical/trainers/az.png rename to src/noncanonical/trainers/gen6/x-y/az.png diff --git a/src/canonical/trainers/bryony.png b/src/noncanonical/trainers/gen6/x-y/bryony.png similarity index 100% rename from src/canonical/trainers/bryony.png rename to src/noncanonical/trainers/gen6/x-y/bryony.png diff --git a/src/canonical/trainers/clemont.png b/src/noncanonical/trainers/gen6/x-y/clemont.png similarity index 100% rename from src/canonical/trainers/clemont.png rename to src/noncanonical/trainers/gen6/x-y/clemont.png diff --git a/src/canonical/trainers/drasna.png b/src/noncanonical/trainers/gen6/x-y/drasna.png similarity index 100% rename from src/canonical/trainers/drasna.png rename to src/noncanonical/trainers/gen6/x-y/drasna.png diff --git a/src/canonical/trainers/evelyn.png b/src/noncanonical/trainers/gen6/x-y/evelyn.png similarity index 100% rename from src/canonical/trainers/evelyn.png rename to src/noncanonical/trainers/gen6/x-y/evelyn.png diff --git a/src/canonical/trainers/furisodegirl-black.png b/src/noncanonical/trainers/gen6/x-y/furisodegirl-black.png similarity index 100% rename from src/canonical/trainers/furisodegirl-black.png rename to src/noncanonical/trainers/gen6/x-y/furisodegirl-black.png diff --git a/src/canonical/trainers/furisodegirl-pink.png b/src/noncanonical/trainers/gen6/x-y/furisodegirl-pink.png similarity index 100% rename from src/canonical/trainers/furisodegirl-pink.png rename to src/noncanonical/trainers/gen6/x-y/furisodegirl-pink.png diff --git a/src/canonical/trainers/korrina.png b/src/noncanonical/trainers/gen6/x-y/korrina.png similarity index 100% rename from src/canonical/trainers/korrina.png rename to src/noncanonical/trainers/gen6/x-y/korrina.png diff --git a/src/canonical/trainers/malva.png b/src/noncanonical/trainers/gen6/x-y/malva.png similarity index 100% rename from src/canonical/trainers/malva.png rename to src/noncanonical/trainers/gen6/x-y/malva.png diff --git a/src/canonical/trainers/nita.png b/src/noncanonical/trainers/gen6/x-y/nita.png similarity index 100% rename from src/canonical/trainers/nita.png rename to src/noncanonical/trainers/gen6/x-y/nita.png diff --git a/src/canonical/trainers/olympia.png b/src/noncanonical/trainers/gen6/x-y/olympia.png similarity index 100% rename from src/canonical/trainers/olympia.png rename to src/noncanonical/trainers/gen6/x-y/olympia.png diff --git a/src/canonical/trainers/ramos.png b/src/noncanonical/trainers/gen6/x-y/ramos.png similarity index 100% rename from src/canonical/trainers/ramos.png rename to src/noncanonical/trainers/gen6/x-y/ramos.png diff --git a/src/canonical/trainers/siebold.png b/src/noncanonical/trainers/gen6/x-y/siebold.png similarity index 100% rename from src/canonical/trainers/siebold.png rename to src/noncanonical/trainers/gen6/x-y/siebold.png diff --git a/src/canonical/trainers/tierno.png b/src/noncanonical/trainers/gen6/x-y/tierno.png similarity index 100% rename from src/canonical/trainers/tierno.png rename to src/noncanonical/trainers/gen6/x-y/tierno.png diff --git a/src/canonical/trainers/valerie.png b/src/noncanonical/trainers/gen6/x-y/valerie.png similarity index 100% rename from src/canonical/trainers/valerie.png rename to src/noncanonical/trainers/gen6/x-y/valerie.png diff --git a/src/canonical/trainers/viola.png b/src/noncanonical/trainers/gen6/x-y/viola.png similarity index 100% rename from src/canonical/trainers/viola.png rename to src/noncanonical/trainers/gen6/x-y/viola.png diff --git a/src/canonical/trainers/wikstrom.png b/src/noncanonical/trainers/gen6/x-y/wikstrom.png similarity index 100% rename from src/canonical/trainers/wikstrom.png rename to src/noncanonical/trainers/gen6/x-y/wikstrom.png diff --git a/src/canonical/trainers/wulfric.png b/src/noncanonical/trainers/gen6/x-y/wulfric.png similarity index 100% rename from src/canonical/trainers/wulfric.png rename to src/noncanonical/trainers/gen6/x-y/wulfric.png diff --git a/src/canonical/trainers/xerosic.png b/src/noncanonical/trainers/gen6/x-y/xerosic.png similarity index 100% rename from src/canonical/trainers/xerosic.png rename to src/noncanonical/trainers/gen6/x-y/xerosic.png diff --git a/src/canonical/trainers/acerola.png b/src/noncanonical/trainers/gen7/sun-moon/acerola.png similarity index 100% rename from src/canonical/trainers/acerola.png rename to src/noncanonical/trainers/gen7/sun-moon/acerola.png diff --git a/src/canonical/trainers/aetheremployee.png b/src/noncanonical/trainers/gen7/sun-moon/aetheremployee.png similarity index 100% rename from src/canonical/trainers/aetheremployee.png rename to src/noncanonical/trainers/gen7/sun-moon/aetheremployee.png diff --git a/src/canonical/trainers/aetheremployeef.png b/src/noncanonical/trainers/gen7/sun-moon/aetheremployeef.png similarity index 100% rename from src/canonical/trainers/aetheremployeef.png rename to src/noncanonical/trainers/gen7/sun-moon/aetheremployeef.png diff --git a/src/canonical/trainers/aetherfoundation.png b/src/noncanonical/trainers/gen7/sun-moon/aetherfoundation.png similarity index 100% rename from src/canonical/trainers/aetherfoundation.png rename to src/noncanonical/trainers/gen7/sun-moon/aetherfoundation.png diff --git a/src/canonical/trainers/aetherfoundationf.png b/src/noncanonical/trainers/gen7/sun-moon/aetherfoundationf.png similarity index 100% rename from src/canonical/trainers/aetherfoundationf.png rename to src/noncanonical/trainers/gen7/sun-moon/aetherfoundationf.png diff --git a/src/canonical/trainers/anabel.png b/src/noncanonical/trainers/gen7/sun-moon/anabel.png similarity index 100% rename from src/canonical/trainers/anabel.png rename to src/noncanonical/trainers/gen7/sun-moon/anabel.png diff --git a/src/canonical/trainers/beauty-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/beauty-gen7.png similarity index 100% rename from src/canonical/trainers/beauty-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/beauty-gen7.png diff --git a/src/canonical/trainers/blue-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/blue-gen7.png similarity index 100% rename from src/canonical/trainers/blue-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/blue-gen7.png diff --git a/src/canonical/trainers/burnet.png b/src/noncanonical/trainers/gen7/sun-moon/burnet.png similarity index 100% rename from src/canonical/trainers/burnet.png rename to src/noncanonical/trainers/gen7/sun-moon/burnet.png diff --git a/src/canonical/trainers/colress-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/colress-gen7.png similarity index 100% rename from src/canonical/trainers/colress-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/colress-gen7.png diff --git a/src/canonical/trainers/dexio.png b/src/noncanonical/trainers/gen7/sun-moon/dexio.png similarity index 100% rename from src/canonical/trainers/dexio.png rename to src/noncanonical/trainers/gen7/sun-moon/dexio.png diff --git a/src/canonical/trainers/elio.png b/src/noncanonical/trainers/gen7/sun-moon/elio.png similarity index 100% rename from src/canonical/trainers/elio.png rename to src/noncanonical/trainers/gen7/sun-moon/elio.png diff --git a/src/canonical/trainers/faba.png b/src/noncanonical/trainers/gen7/sun-moon/faba.png similarity index 100% rename from src/canonical/trainers/faba.png rename to src/noncanonical/trainers/gen7/sun-moon/faba.png diff --git a/src/canonical/trainers/gladion-stance.png b/src/noncanonical/trainers/gen7/sun-moon/gladion-stance.png similarity index 100% rename from src/canonical/trainers/gladion-stance.png rename to src/noncanonical/trainers/gen7/sun-moon/gladion-stance.png diff --git a/src/canonical/trainers/gladion.png b/src/noncanonical/trainers/gen7/sun-moon/gladion.png similarity index 100% rename from src/canonical/trainers/gladion.png rename to src/noncanonical/trainers/gen7/sun-moon/gladion.png diff --git a/src/canonical/trainers/grimsley-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/grimsley-gen7.png similarity index 100% rename from src/canonical/trainers/grimsley-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/grimsley-gen7.png diff --git a/src/canonical/trainers/guzma.png b/src/noncanonical/trainers/gen7/sun-moon/guzma.png similarity index 100% rename from src/canonical/trainers/guzma.png rename to src/noncanonical/trainers/gen7/sun-moon/guzma.png diff --git a/src/canonical/trainers/hala.png b/src/noncanonical/trainers/gen7/sun-moon/hala.png similarity index 100% rename from src/canonical/trainers/hala.png rename to src/noncanonical/trainers/gen7/sun-moon/hala.png diff --git a/src/canonical/trainers/hapu.png b/src/noncanonical/trainers/gen7/sun-moon/hapu.png similarity index 100% rename from src/canonical/trainers/hapu.png rename to src/noncanonical/trainers/gen7/sun-moon/hapu.png diff --git a/src/canonical/trainers/hau-stance.png b/src/noncanonical/trainers/gen7/sun-moon/hau-stance.png similarity index 100% rename from src/canonical/trainers/hau-stance.png rename to src/noncanonical/trainers/gen7/sun-moon/hau-stance.png diff --git a/src/canonical/trainers/hau.png b/src/noncanonical/trainers/gen7/sun-moon/hau.png similarity index 100% rename from src/canonical/trainers/hau.png rename to src/noncanonical/trainers/gen7/sun-moon/hau.png diff --git a/src/canonical/trainers/hiker-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/hiker-gen7.png similarity index 100% rename from src/canonical/trainers/hiker-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/hiker-gen7.png diff --git a/src/canonical/trainers/ilima.png b/src/noncanonical/trainers/gen7/sun-moon/ilima.png similarity index 100% rename from src/canonical/trainers/ilima.png rename to src/noncanonical/trainers/gen7/sun-moon/ilima.png diff --git a/src/canonical/trainers/kahili.png b/src/noncanonical/trainers/gen7/sun-moon/kahili.png similarity index 100% rename from src/canonical/trainers/kahili.png rename to src/noncanonical/trainers/gen7/sun-moon/kahili.png diff --git a/src/canonical/trainers/kiawe.png b/src/noncanonical/trainers/gen7/sun-moon/kiawe.png similarity index 100% rename from src/canonical/trainers/kiawe.png rename to src/noncanonical/trainers/gen7/sun-moon/kiawe.png diff --git a/src/canonical/trainers/kukui-stand.png b/src/noncanonical/trainers/gen7/sun-moon/kukui-stand.png similarity index 100% rename from src/canonical/trainers/kukui-stand.png rename to src/noncanonical/trainers/gen7/sun-moon/kukui-stand.png diff --git a/src/canonical/trainers/kukui.png b/src/noncanonical/trainers/gen7/sun-moon/kukui.png similarity index 100% rename from src/canonical/trainers/kukui.png rename to src/noncanonical/trainers/gen7/sun-moon/kukui.png diff --git a/src/canonical/trainers/lana.png b/src/noncanonical/trainers/gen7/sun-moon/lana.png similarity index 100% rename from src/canonical/trainers/lana.png rename to src/noncanonical/trainers/gen7/sun-moon/lana.png diff --git a/src/canonical/trainers/lass-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/lass-gen7.png similarity index 100% rename from src/canonical/trainers/lass-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/lass-gen7.png diff --git a/src/canonical/trainers/lillie-z.png b/src/noncanonical/trainers/gen7/sun-moon/lillie-z.png similarity index 100% rename from src/canonical/trainers/lillie-z.png rename to src/noncanonical/trainers/gen7/sun-moon/lillie-z.png diff --git a/src/canonical/trainers/lillie.png b/src/noncanonical/trainers/gen7/sun-moon/lillie.png similarity index 100% rename from src/canonical/trainers/lillie.png rename to src/noncanonical/trainers/gen7/sun-moon/lillie.png diff --git a/src/canonical/trainers/lusamine-nihilego.png b/src/noncanonical/trainers/gen7/sun-moon/lusamine-nihilego.png similarity index 100% rename from src/canonical/trainers/lusamine-nihilego.png rename to src/noncanonical/trainers/gen7/sun-moon/lusamine-nihilego.png diff --git a/src/canonical/trainers/lusamine.png b/src/noncanonical/trainers/gen7/sun-moon/lusamine.png similarity index 100% rename from src/canonical/trainers/lusamine.png rename to src/noncanonical/trainers/gen7/sun-moon/lusamine.png diff --git a/src/canonical/trainers/mallow.png b/src/noncanonical/trainers/gen7/sun-moon/mallow.png similarity index 100% rename from src/canonical/trainers/mallow.png rename to src/noncanonical/trainers/gen7/sun-moon/mallow.png diff --git a/src/canonical/trainers/mina.png b/src/noncanonical/trainers/gen7/sun-moon/mina.png similarity index 100% rename from src/canonical/trainers/mina.png rename to src/noncanonical/trainers/gen7/sun-moon/mina.png diff --git a/src/canonical/trainers/molayne.png b/src/noncanonical/trainers/gen7/sun-moon/molayne.png similarity index 100% rename from src/canonical/trainers/molayne.png rename to src/noncanonical/trainers/gen7/sun-moon/molayne.png diff --git a/src/canonical/trainers/nanu.png b/src/noncanonical/trainers/gen7/sun-moon/nanu.png similarity index 100% rename from src/canonical/trainers/nanu.png rename to src/noncanonical/trainers/gen7/sun-moon/nanu.png diff --git a/src/canonical/trainers/officeworker.png b/src/noncanonical/trainers/gen7/sun-moon/officeworker.png similarity index 100% rename from src/canonical/trainers/officeworker.png rename to src/noncanonical/trainers/gen7/sun-moon/officeworker.png diff --git a/src/canonical/trainers/olivia.png b/src/noncanonical/trainers/gen7/sun-moon/olivia.png similarity index 100% rename from src/canonical/trainers/olivia.png rename to src/noncanonical/trainers/gen7/sun-moon/olivia.png diff --git a/src/canonical/trainers/plumeria.png b/src/noncanonical/trainers/gen7/sun-moon/plumeria.png similarity index 100% rename from src/canonical/trainers/plumeria.png rename to src/noncanonical/trainers/gen7/sun-moon/plumeria.png diff --git a/src/canonical/trainers/pokemonbreeder-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/pokemonbreeder-gen7.png similarity index 100% rename from src/canonical/trainers/pokemonbreeder-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/pokemonbreeder-gen7.png diff --git a/src/canonical/trainers/pokemonbreederf-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/pokemonbreederf-gen7.png similarity index 100% rename from src/canonical/trainers/pokemonbreederf-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/pokemonbreederf-gen7.png diff --git a/src/canonical/trainers/preschoolers.png b/src/noncanonical/trainers/gen7/sun-moon/preschoolers.png similarity index 100% rename from src/canonical/trainers/preschoolers.png rename to src/noncanonical/trainers/gen7/sun-moon/preschoolers.png diff --git a/src/canonical/trainers/red-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/red-gen7.png similarity index 100% rename from src/canonical/trainers/red-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/red-gen7.png diff --git a/src/canonical/trainers/risingstar.png b/src/noncanonical/trainers/gen7/sun-moon/risingstar.png similarity index 100% rename from src/canonical/trainers/risingstar.png rename to src/noncanonical/trainers/gen7/sun-moon/risingstar.png diff --git a/src/canonical/trainers/risingstarf.png b/src/noncanonical/trainers/gen7/sun-moon/risingstarf.png similarity index 100% rename from src/canonical/trainers/risingstarf.png rename to src/noncanonical/trainers/gen7/sun-moon/risingstarf.png diff --git a/src/canonical/trainers/ryuki.png b/src/noncanonical/trainers/gen7/sun-moon/ryuki.png similarity index 100% rename from src/canonical/trainers/ryuki.png rename to src/noncanonical/trainers/gen7/sun-moon/ryuki.png diff --git a/src/canonical/trainers/samsonoak.png b/src/noncanonical/trainers/gen7/sun-moon/samsonoak.png similarity index 100% rename from src/canonical/trainers/samsonoak.png rename to src/noncanonical/trainers/gen7/sun-moon/samsonoak.png diff --git a/src/canonical/trainers/selene.png b/src/noncanonical/trainers/gen7/sun-moon/selene.png similarity index 100% rename from src/canonical/trainers/selene.png rename to src/noncanonical/trainers/gen7/sun-moon/selene.png diff --git a/src/canonical/trainers/sightseer.png b/src/noncanonical/trainers/gen7/sun-moon/sightseer.png similarity index 100% rename from src/canonical/trainers/sightseer.png rename to src/noncanonical/trainers/gen7/sun-moon/sightseer.png diff --git a/src/canonical/trainers/sina.png b/src/noncanonical/trainers/gen7/sun-moon/sina.png similarity index 100% rename from src/canonical/trainers/sina.png rename to src/noncanonical/trainers/gen7/sun-moon/sina.png diff --git a/src/canonical/trainers/sophocles.png b/src/noncanonical/trainers/gen7/sun-moon/sophocles.png similarity index 100% rename from src/canonical/trainers/sophocles.png rename to src/noncanonical/trainers/gen7/sun-moon/sophocles.png diff --git a/src/canonical/trainers/teacher-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/teacher-gen7.png similarity index 100% rename from src/canonical/trainers/teacher-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/teacher-gen7.png diff --git a/src/canonical/trainers/theroyal.png b/src/noncanonical/trainers/gen7/sun-moon/theroyal.png similarity index 100% rename from src/canonical/trainers/theroyal.png rename to src/noncanonical/trainers/gen7/sun-moon/theroyal.png diff --git a/src/canonical/trainers/wicke.png b/src/noncanonical/trainers/gen7/sun-moon/wicke.png similarity index 100% rename from src/canonical/trainers/wicke.png rename to src/noncanonical/trainers/gen7/sun-moon/wicke.png diff --git a/src/canonical/trainers/youngathlete.png b/src/noncanonical/trainers/gen7/sun-moon/youngathlete.png similarity index 100% rename from src/canonical/trainers/youngathlete.png rename to src/noncanonical/trainers/gen7/sun-moon/youngathlete.png diff --git a/src/canonical/trainers/youngathletef.png b/src/noncanonical/trainers/gen7/sun-moon/youngathletef.png similarity index 100% rename from src/canonical/trainers/youngathletef.png rename to src/noncanonical/trainers/gen7/sun-moon/youngathletef.png diff --git a/src/canonical/trainers/youngster-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/youngster-gen7.png similarity index 100% rename from src/canonical/trainers/youngster-gen7.png rename to src/noncanonical/trainers/gen7/sun-moon/youngster-gen7.png diff --git a/src/canonical/trainers/ash-alola.png b/src/noncanonical/trainers/misc/ash-alola.png similarity index 100% rename from src/canonical/trainers/ash-alola.png rename to src/noncanonical/trainers/misc/ash-alola.png diff --git a/src/canonical/trainers/ash-capbackward.png b/src/noncanonical/trainers/misc/ash-capbackward.png similarity index 100% rename from src/canonical/trainers/ash-capbackward.png rename to src/noncanonical/trainers/misc/ash-capbackward.png diff --git a/src/canonical/trainers/ash-hoenn.png b/src/noncanonical/trainers/misc/ash-hoenn.png similarity index 100% rename from src/canonical/trainers/ash-hoenn.png rename to src/noncanonical/trainers/misc/ash-hoenn.png diff --git a/src/canonical/trainers/ash-johto.png b/src/noncanonical/trainers/misc/ash-johto.png similarity index 100% rename from src/canonical/trainers/ash-johto.png rename to src/noncanonical/trainers/misc/ash-johto.png diff --git a/src/canonical/trainers/ash-kalos.png b/src/noncanonical/trainers/misc/ash-kalos.png similarity index 100% rename from src/canonical/trainers/ash-kalos.png rename to src/noncanonical/trainers/misc/ash-kalos.png diff --git a/src/canonical/trainers/ash-sinnoh.png b/src/noncanonical/trainers/misc/ash-sinnoh.png similarity index 100% rename from src/canonical/trainers/ash-sinnoh.png rename to src/noncanonical/trainers/misc/ash-sinnoh.png diff --git a/src/canonical/trainers/ash-unova.png b/src/noncanonical/trainers/misc/ash-unova.png similarity index 100% rename from src/canonical/trainers/ash-unova.png rename to src/noncanonical/trainers/misc/ash-unova.png diff --git a/src/canonical/trainers/ash.png b/src/noncanonical/trainers/misc/ash.png similarity index 100% rename from src/canonical/trainers/ash.png rename to src/noncanonical/trainers/misc/ash.png diff --git a/src/canonical/trainers/teamrocket.png b/src/noncanonical/trainers/misc/teamrocket.png similarity index 100% rename from src/canonical/trainers/teamrocket.png rename to src/noncanonical/trainers/misc/teamrocket.png diff --git a/src/canonical/trainers/unknown.png b/src/noncanonical/trainers/misc/unknown.png similarity index 100% rename from src/canonical/trainers/unknown.png rename to src/noncanonical/trainers/misc/unknown.png diff --git a/src/canonical/trainers/unknownf.png b/src/noncanonical/trainers/misc/unknownf.png similarity index 100% rename from src/canonical/trainers/unknownf.png rename to src/noncanonical/trainers/misc/unknownf.png diff --git a/src/canonical/trainers/yellow.png b/src/noncanonical/trainers/misc/yellow.png similarity index 100% rename from src/canonical/trainers/yellow.png rename to src/noncanonical/trainers/misc/yellow.png