diff --git a/Gamedata/bundled/pet/LeetBB.nitro b/Gamedata/bundled/pets/LeetBB.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetBB.nitro
rename to Gamedata/bundled/pets/LeetBB.nitro
diff --git a/Gamedata/bundled/pet/LeetBH.nitro b/Gamedata/bundled/pets/LeetBH.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetBH.nitro
rename to Gamedata/bundled/pets/LeetBH.nitro
diff --git a/Gamedata/bundled/pet/LeetBa.nitro b/Gamedata/bundled/pets/LeetBa.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetBa.nitro
rename to Gamedata/bundled/pets/LeetBa.nitro
diff --git a/Gamedata/bundled/pet/LeetCaviaaa.nitro b/Gamedata/bundled/pets/LeetCaviaaa.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetCaviaaa.nitro
rename to Gamedata/bundled/pets/LeetCaviaaa.nitro
diff --git a/Gamedata/bundled/pet/LeetE.nitro b/Gamedata/bundled/pets/LeetE.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetE.nitro
rename to Gamedata/bundled/pets/LeetE.nitro
diff --git a/Gamedata/bundled/pet/LeetEendj16.nitro b/Gamedata/bundled/pets/LeetEendj16.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetEendj16.nitro
rename to Gamedata/bundled/pets/LeetEendj16.nitro
diff --git a/Gamedata/bundled/pet/LeetEendjes.nitro b/Gamedata/bundled/pets/LeetEendjes.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetEendjes.nitro
rename to Gamedata/bundled/pets/LeetEendjes.nitro
diff --git a/Gamedata/bundled/pet/LeetFantj.nitro b/Gamedata/bundled/pets/LeetFantj.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetFantj.nitro
rename to Gamedata/bundled/pets/LeetFantj.nitro
diff --git a/Gamedata/bundled/pet/LeetHotelMari1.nitro b/Gamedata/bundled/pets/LeetHotelMari1.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetHotelMari1.nitro
rename to Gamedata/bundled/pets/LeetHotelMari1.nitro
diff --git a/Gamedata/bundled/pet/LeetHotelMario.nitro b/Gamedata/bundled/pets/LeetHotelMario.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetHotelMario.nitro
rename to Gamedata/bundled/pets/LeetHotelMario.nitro
diff --git a/Gamedata/bundled/pet/LeetMewt1.nitro b/Gamedata/bundled/pets/LeetMewt1.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetMewt1.nitro
rename to Gamedata/bundled/pets/LeetMewt1.nitro
diff --git a/Gamedata/bundled/pet/LeetMewtw.nitro b/Gamedata/bundled/pets/LeetMewtw.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetMewtw.nitro
rename to Gamedata/bundled/pets/LeetMewtw.nitro
diff --git a/Gamedata/bundled/pet/LeetPen.nitro b/Gamedata/bundled/pets/LeetPen.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetPen.nitro
rename to Gamedata/bundled/pets/LeetPen.nitro
diff --git a/Gamedata/bundled/pet/LeetPikachu.nitro b/Gamedata/bundled/pets/LeetPikachu.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetPikachu.nitro
rename to Gamedata/bundled/pets/LeetPikachu.nitro
diff --git a/Gamedata/bundled/pet/LeetUi1.nitro b/Gamedata/bundled/pets/LeetUi1.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetUi1.nitro
rename to Gamedata/bundled/pets/LeetUi1.nitro
diff --git a/Gamedata/bundled/pet/LeetUil.nitro b/Gamedata/bundled/pets/LeetUil.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetUil.nitro
rename to Gamedata/bundled/pets/LeetUil.nitro
diff --git a/Gamedata/bundled/pet/LeetWolf.nitro b/Gamedata/bundled/pets/LeetWolf.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetWolf.nitro
rename to Gamedata/bundled/pets/LeetWolf.nitro
diff --git a/Gamedata/bundled/pet/LeetYos.nitro b/Gamedata/bundled/pets/LeetYos.nitro
similarity index 100%
rename from Gamedata/bundled/pet/LeetYos.nitro
rename to Gamedata/bundled/pets/LeetYos.nitro
diff --git a/Gamedata/bundled/pet/babyBH.nitro b/Gamedata/bundled/pets/babyBH.nitro
similarity index 100%
rename from Gamedata/bundled/pet/babyBH.nitro
rename to Gamedata/bundled/pets/babyBH.nitro
diff --git a/Gamedata/bundled/pet/babymeisje.nitro b/Gamedata/bundled/pets/babymeisje.nitro
similarity index 100%
rename from Gamedata/bundled/pet/babymeisje.nitro
rename to Gamedata/bundled/pets/babymeisje.nitro
diff --git a/Gamedata/bundled/pet/bb_hbx.nitro b/Gamedata/bundled/pets/bb_hbx.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bb_hbx.nitro
rename to Gamedata/bundled/pets/bb_hbx.nitro
diff --git a/Gamedata/bundled/pet/bbwibb.nitro b/Gamedata/bundled/pets/bbwibb.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bbwibb.nitro
rename to Gamedata/bundled/pets/bbwibb.nitro
diff --git a/Gamedata/bundled/pet/bear.nitro b/Gamedata/bundled/pets/bear.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bear.nitro
rename to Gamedata/bundled/pets/bear.nitro
diff --git a/Gamedata/bundled/pet/bearbaby.nitro b/Gamedata/bundled/pets/bearbaby.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bearbaby.nitro
rename to Gamedata/bundled/pets/bearbaby.nitro
diff --git a/Gamedata/bundled/pet/bunnydepressed.nitro b/Gamedata/bundled/pets/bunnydepressed.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bunnydepressed.nitro
rename to Gamedata/bundled/pets/bunnydepressed.nitro
diff --git a/Gamedata/bundled/pet/bunnyeaster.nitro b/Gamedata/bundled/pets/bunnyeaster.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bunnyeaster.nitro
rename to Gamedata/bundled/pets/bunnyeaster.nitro
diff --git a/Gamedata/bundled/pet/bunnyevil.nitro b/Gamedata/bundled/pets/bunnyevil.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bunnyevil.nitro
rename to Gamedata/bundled/pets/bunnyevil.nitro
diff --git a/Gamedata/bundled/pet/bunnylove.nitro b/Gamedata/bundled/pets/bunnylove.nitro
similarity index 100%
rename from Gamedata/bundled/pet/bunnylove.nitro
rename to Gamedata/bundled/pets/bunnylove.nitro
diff --git a/Gamedata/bundled/pet/cat.nitro b/Gamedata/bundled/pets/cat.nitro
similarity index 100%
rename from Gamedata/bundled/pet/cat.nitro
rename to Gamedata/bundled/pets/cat.nitro
diff --git a/Gamedata/bundled/pet/chicke2.nitro b/Gamedata/bundled/pets/chicke2.nitro
similarity index 100%
rename from Gamedata/bundled/pet/chicke2.nitro
rename to Gamedata/bundled/pets/chicke2.nitro
diff --git a/Gamedata/bundled/pet/chicken.nitro b/Gamedata/bundled/pets/chicken.nitro
similarity index 100%
rename from Gamedata/bundled/pet/chicken.nitro
rename to Gamedata/bundled/pets/chicken.nitro
diff --git a/Gamedata/bundled/pet/cow.nitro b/Gamedata/bundled/pets/cow.nitro
similarity index 100%
rename from Gamedata/bundled/pet/cow.nitro
rename to Gamedata/bundled/pets/cow.nitro
diff --git a/Gamedata/bundled/pet/croco.nitro b/Gamedata/bundled/pets/croco.nitro
similarity index 100%
rename from Gamedata/bundled/pet/croco.nitro
rename to Gamedata/bundled/pets/croco.nitro
diff --git a/Gamedata/bundled/pet/demonmonkey.nitro b/Gamedata/bundled/pets/demonmonkey.nitro
similarity index 100%
rename from Gamedata/bundled/pet/demonmonkey.nitro
rename to Gamedata/bundled/pets/demonmonkey.nitro
diff --git a/Gamedata/bundled/pet/dog.nitro b/Gamedata/bundled/pets/dog.nitro
similarity index 100%
rename from Gamedata/bundled/pet/dog.nitro
rename to Gamedata/bundled/pets/dog.nitro
diff --git a/Gamedata/bundled/pet/dragon.nitro b/Gamedata/bundled/pets/dragon.nitro
similarity index 100%
rename from Gamedata/bundled/pet/dragon.nitro
rename to Gamedata/bundled/pets/dragon.nitro
diff --git a/Gamedata/bundled/pet/dragondog.nitro b/Gamedata/bundled/pets/dragondog.nitro
similarity index 100%
rename from Gamedata/bundled/pet/dragondog.nitro
rename to Gamedata/bundled/pets/dragondog.nitro
diff --git a/Gamedata/bundled/pet/elephants.nitro b/Gamedata/bundled/pets/elephants.nitro
similarity index 100%
rename from Gamedata/bundled/pet/elephants.nitro
rename to Gamedata/bundled/pets/elephants.nitro
diff --git a/Gamedata/bundled/pet/fools.nitro b/Gamedata/bundled/pets/fools.nitro
similarity index 100%
rename from Gamedata/bundled/pet/fools.nitro
rename to Gamedata/bundled/pets/fools.nitro
diff --git a/Gamedata/bundled/pet/frog.nitro b/Gamedata/bundled/pets/frog.nitro
similarity index 100%
rename from Gamedata/bundled/pet/frog.nitro
rename to Gamedata/bundled/pets/frog.nitro
diff --git a/Gamedata/bundled/pet/gnome.nitro b/Gamedata/bundled/pets/gnome.nitro
similarity index 100%
rename from Gamedata/bundled/pet/gnome.nitro
rename to Gamedata/bundled/pets/gnome.nitro
diff --git a/Gamedata/bundled/pet/haloompa.nitro b/Gamedata/bundled/pets/haloompa.nitro
similarity index 100%
rename from Gamedata/bundled/pet/haloompa.nitro
rename to Gamedata/bundled/pets/haloompa.nitro
diff --git a/Gamedata/bundled/pet/horse.nitro b/Gamedata/bundled/pets/horse.nitro
similarity index 100%
rename from Gamedata/bundled/pet/horse.nitro
rename to Gamedata/bundled/pets/horse.nitro
diff --git a/Gamedata/bundled/pet/kittenbaby.nitro b/Gamedata/bundled/pets/kittenbaby.nitro
similarity index 100%
rename from Gamedata/bundled/pet/kittenbaby.nitro
rename to Gamedata/bundled/pets/kittenbaby.nitro
diff --git a/Gamedata/bundled/pet/lion.nitro b/Gamedata/bundled/pets/lion.nitro
similarity index 100%
rename from Gamedata/bundled/pet/lion.nitro
rename to Gamedata/bundled/pets/lion.nitro
diff --git a/Gamedata/bundled/pet/monkey.nitro b/Gamedata/bundled/pets/monkey.nitro
similarity index 100%
rename from Gamedata/bundled/pet/monkey.nitro
rename to Gamedata/bundled/pets/monkey.nitro
diff --git a/Gamedata/bundled/pet/monster.nitro b/Gamedata/bundled/pets/monster.nitro
similarity index 100%
rename from Gamedata/bundled/pet/monster.nitro
rename to Gamedata/bundled/pets/monster.nitro
diff --git a/Gamedata/bundled/pet/monsterplant.nitro b/Gamedata/bundled/pets/monsterplant.nitro
similarity index 100%
rename from Gamedata/bundled/pet/monsterplant.nitro
rename to Gamedata/bundled/pets/monsterplant.nitro
diff --git a/Gamedata/bundled/pet/penguin.nitro b/Gamedata/bundled/pets/penguin.nitro
similarity index 100%
rename from Gamedata/bundled/pet/penguin.nitro
rename to Gamedata/bundled/pets/penguin.nitro
diff --git a/Gamedata/bundled/pet/pig.nitro b/Gamedata/bundled/pets/pig.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pig.nitro
rename to Gamedata/bundled/pets/pig.nitro
diff --git a/Gamedata/bundled/pet/pigeonevil.nitro b/Gamedata/bundled/pets/pigeonevil.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pigeonevil.nitro
rename to Gamedata/bundled/pets/pigeonevil.nitro
diff --git a/Gamedata/bundled/pet/pigeongood.nitro b/Gamedata/bundled/pets/pigeongood.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pigeongood.nitro
rename to Gamedata/bundled/pets/pigeongood.nitro
diff --git a/Gamedata/bundled/pet/pigletbaby.nitro b/Gamedata/bundled/pets/pigletbaby.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pigletbaby.nitro
rename to Gamedata/bundled/pets/pigletbaby.nitro
diff --git a/Gamedata/bundled/pet/pkmashhhpet.nitro b/Gamedata/bundled/pets/pkmashhhpet.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmashhhpet.nitro
rename to Gamedata/bundled/pets/pkmashhhpet.nitro
diff --git a/Gamedata/bundled/pet/pkmbeautfly.nitro b/Gamedata/bundled/pets/pkmbeautfly.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmbeautfly.nitro
rename to Gamedata/bundled/pets/pkmbeautfly.nitro
diff --git a/Gamedata/bundled/pet/pkmcelebipe.nitro b/Gamedata/bundled/pets/pkmcelebipe.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmcelebipe.nitro
rename to Gamedata/bundled/pets/pkmcelebipe.nitro
diff --git a/Gamedata/bundled/pet/pkmdarkraip.nitro b/Gamedata/bundled/pets/pkmdarkraip.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmdarkraip.nitro
rename to Gamedata/bundled/pets/pkmdarkraip.nitro
diff --git a/Gamedata/bundled/pet/pkmeeveepet.nitro b/Gamedata/bundled/pets/pkmeeveepet.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmeeveepet.nitro
rename to Gamedata/bundled/pets/pkmeeveepet.nitro
diff --git a/Gamedata/bundled/pet/pkmjirachip.nitro b/Gamedata/bundled/pets/pkmjirachip.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmjirachip.nitro
rename to Gamedata/bundled/pets/pkmjirachip.nitro
diff --git a/Gamedata/bundled/pet/pkmnPAPI0.nitro b/Gamedata/bundled/pets/pkmnPAPI0.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnPAPI0.nitro
rename to Gamedata/bundled/pets/pkmnPAPI0.nitro
diff --git a/Gamedata/bundled/pet/pkmnPAPI1.nitro b/Gamedata/bundled/pets/pkmnPAPI1.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnPAPI1.nitro
rename to Gamedata/bundled/pets/pkmnPAPI1.nitro
diff --git a/Gamedata/bundled/pet/pkmnPAPI2.nitro b/Gamedata/bundled/pets/pkmnPAPI2.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnPAPI2.nitro
rename to Gamedata/bundled/pets/pkmnPAPI2.nitro
diff --git a/Gamedata/bundled/pet/pkmnPAPI3.nitro b/Gamedata/bundled/pets/pkmnPAPI3.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnPAPI3.nitro
rename to Gamedata/bundled/pets/pkmnPAPI3.nitro
diff --git a/Gamedata/bundled/pet/pkmnPAPI4.nitro b/Gamedata/bundled/pets/pkmnPAPI4.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnPAPI4.nitro
rename to Gamedata/bundled/pets/pkmnPAPI4.nitro
diff --git a/Gamedata/bundled/pet/pkmnente1.nitro b/Gamedata/bundled/pets/pkmnente1.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnente1.nitro
rename to Gamedata/bundled/pets/pkmnente1.nitro
diff --git a/Gamedata/bundled/pet/pkmnentei.nitro b/Gamedata/bundled/pets/pkmnentei.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmnentei.nitro
rename to Gamedata/bundled/pets/pkmnentei.nitro
diff --git a/Gamedata/bundled/pet/pkmpichupet.nitro b/Gamedata/bundled/pets/pkmpichupet.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmpichupet.nitro
rename to Gamedata/bundled/pets/pkmpichupet.nitro
diff --git a/Gamedata/bundled/pet/pkmriolupet.nitro b/Gamedata/bundled/pets/pkmriolupet.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmriolupet.nitro
rename to Gamedata/bundled/pets/pkmriolupet.nitro
diff --git a/Gamedata/bundled/pet/pkmshaymin2.nitro b/Gamedata/bundled/pets/pkmshaymin2.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmshaymin2.nitro
rename to Gamedata/bundled/pets/pkmshaymin2.nitro
diff --git a/Gamedata/bundled/pet/pkmshayminp.nitro b/Gamedata/bundled/pets/pkmshayminp.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmshayminp.nitro
rename to Gamedata/bundled/pets/pkmshayminp.nitro
diff --git a/Gamedata/bundled/pet/pkmtogepipe.nitro b/Gamedata/bundled/pets/pkmtogepipe.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmtogepipe.nitro
rename to Gamedata/bundled/pets/pkmtogepipe.nitro
diff --git a/Gamedata/bundled/pet/pkmvictinip.nitro b/Gamedata/bundled/pets/pkmvictinip.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pkmvictinip.nitro
rename to Gamedata/bundled/pets/pkmvictinip.nitro
diff --git a/Gamedata/bundled/pet/pokemon_mewblu.nitro b/Gamedata/bundled/pets/pokemon_mewblu.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pokemon_mewblu.nitro
rename to Gamedata/bundled/pets/pokemon_mewblu.nitro
diff --git a/Gamedata/bundled/pet/pokmn_mew.nitro b/Gamedata/bundled/pets/pokmn_mew.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pokmn_mew.nitro
rename to Gamedata/bundled/pets/pokmn_mew.nitro
diff --git a/Gamedata/bundled/pet/pterosaur.nitro b/Gamedata/bundled/pets/pterosaur.nitro
similarity index 100%
rename from Gamedata/bundled/pet/pterosaur.nitro
rename to Gamedata/bundled/pets/pterosaur.nitro
diff --git a/Gamedata/bundled/pet/puppybaby.nitro b/Gamedata/bundled/pets/puppybaby.nitro
similarity index 100%
rename from Gamedata/bundled/pet/puppybaby.nitro
rename to Gamedata/bundled/pets/puppybaby.nitro
diff --git a/Gamedata/bundled/pet/rhino.nitro b/Gamedata/bundled/pets/rhino.nitro
similarity index 100%
rename from Gamedata/bundled/pet/rhino.nitro
rename to Gamedata/bundled/pets/rhino.nitro
diff --git a/Gamedata/bundled/pet/simps_maggie.nitro b/Gamedata/bundled/pets/simps_maggie.nitro
similarity index 100%
rename from Gamedata/bundled/pet/simps_maggie.nitro
rename to Gamedata/bundled/pets/simps_maggie.nitro
diff --git a/Gamedata/bundled/pet/slenderm1.nitro b/Gamedata/bundled/pets/slenderm1.nitro
similarity index 100%
rename from Gamedata/bundled/pet/slenderm1.nitro
rename to Gamedata/bundled/pets/slenderm1.nitro
diff --git a/Gamedata/bundled/pet/slendermn.nitro b/Gamedata/bundled/pets/slendermn.nitro
similarity index 100%
rename from Gamedata/bundled/pet/slendermn.nitro
rename to Gamedata/bundled/pets/slendermn.nitro
diff --git a/Gamedata/bundled/pet/spider.nitro b/Gamedata/bundled/pets/spider.nitro
similarity index 100%
rename from Gamedata/bundled/pet/spider.nitro
rename to Gamedata/bundled/pets/spider.nitro
diff --git a/Gamedata/bundled/pet/squirtle.nitro b/Gamedata/bundled/pets/squirtle.nitro
similarity index 100%
rename from Gamedata/bundled/pet/squirtle.nitro
rename to Gamedata/bundled/pets/squirtle.nitro
diff --git a/Gamedata/bundled/pet/terrier.nitro b/Gamedata/bundled/pets/terrier.nitro
similarity index 100%
rename from Gamedata/bundled/pet/terrier.nitro
rename to Gamedata/bundled/pets/terrier.nitro
diff --git a/Gamedata/bundled/pet/terrierbaby.nitro b/Gamedata/bundled/pets/terrierbaby.nitro
similarity index 100%
rename from Gamedata/bundled/pet/terrierbaby.nitro
rename to Gamedata/bundled/pets/terrierbaby.nitro
diff --git a/Gamedata/bundled/pet/turtle.nitro b/Gamedata/bundled/pets/turtle.nitro
similarity index 100%
rename from Gamedata/bundled/pet/turtle.nitro
rename to Gamedata/bundled/pets/turtle.nitro
diff --git a/Gamedata/bundled/pet/velociraptor.nitro b/Gamedata/bundled/pets/velociraptor.nitro
similarity index 100%
rename from Gamedata/bundled/pet/velociraptor.nitro
rename to Gamedata/bundled/pets/velociraptor.nitro
diff --git a/Gamedata/bundled/pet/wolfbaby.nitro b/Gamedata/bundled/pets/wolfbaby.nitro
similarity index 100%
rename from Gamedata/bundled/pet/wolfbaby.nitro
rename to Gamedata/bundled/pets/wolfbaby.nitro