diff --git a/games/animal-crossing-new-leaf/boxart.png b/games/animal-crossing-new-leaf-update-ver-15/boxart.png
similarity index 100%
rename from games/animal-crossing-new-leaf/boxart.png
rename to games/animal-crossing-new-leaf-update-ver-15/boxart.png
diff --git a/games/animal-crossing-new-leaf/game.dat b/games/animal-crossing-new-leaf-update-ver-15/game.dat
similarity index 100%
rename from games/animal-crossing-new-leaf/game.dat
rename to games/animal-crossing-new-leaf-update-ver-15/game.dat
diff --git a/games/animal-crossing-new-leaf/icon.png b/games/animal-crossing-new-leaf-update-ver-15/icon.png
similarity index 100%
rename from games/animal-crossing-new-leaf/icon.png
rename to games/animal-crossing-new-leaf-update-ver-15/icon.png
diff --git a/games/animal-crossing-new-leaf/screenshots/continue-screen.png b/games/animal-crossing-new-leaf-update-ver-15/screenshots/continue-screen.png
similarity index 100%
rename from games/animal-crossing-new-leaf/screenshots/continue-screen.png
rename to games/animal-crossing-new-leaf-update-ver-15/screenshots/continue-screen.png
diff --git a/games/animal-crossing-new-leaf/screenshots/in-game.png b/games/animal-crossing-new-leaf-update-ver-15/screenshots/in-game.png
similarity index 100%
rename from games/animal-crossing-new-leaf/screenshots/in-game.png
rename to games/animal-crossing-new-leaf-update-ver-15/screenshots/in-game.png
diff --git a/games/animal-crossing-new-leaf/screenshots/welcome-amiibo-start-screen.png b/games/animal-crossing-new-leaf-update-ver-15/screenshots/welcome-amiibo-start-screen.png
similarity index 100%
rename from games/animal-crossing-new-leaf/screenshots/welcome-amiibo-start-screen.png
rename to games/animal-crossing-new-leaf-update-ver-15/screenshots/welcome-amiibo-start-screen.png
diff --git a/games/azure-striker-gunvolt-striker-pack/boxart.png b/games/azure-striker-gunvolt-striker-pack-update-ver-12/boxart.png
similarity index 100%
rename from games/azure-striker-gunvolt-striker-pack/boxart.png
rename to games/azure-striker-gunvolt-striker-pack-update-ver-12/boxart.png
diff --git a/games/azure-striker-gunvolt-striker-pack/game.dat b/games/azure-striker-gunvolt-striker-pack-update-ver-12/game.dat
similarity index 100%
rename from games/azure-striker-gunvolt-striker-pack/game.dat
rename to games/azure-striker-gunvolt-striker-pack-update-ver-12/game.dat
diff --git a/games/azure-striker-gunvolt-striker-pack/icon.png b/games/azure-striker-gunvolt-striker-pack-update-ver-12/icon.png
similarity index 100%
rename from games/azure-striker-gunvolt-striker-pack/icon.png
rename to games/azure-striker-gunvolt-striker-pack-update-ver-12/icon.png
diff --git a/games/cursed-castilla-ex/boxart.png b/games/cursed-castilla/boxart.png
similarity index 100%
rename from games/cursed-castilla-ex/boxart.png
rename to games/cursed-castilla/boxart.png
diff --git a/games/cursed-castilla-ex/game.dat b/games/cursed-castilla/game.dat
similarity index 100%
rename from games/cursed-castilla-ex/game.dat
rename to games/cursed-castilla/game.dat
diff --git a/games/cursed-castilla-ex/icon.png b/games/cursed-castilla/icon.png
similarity index 100%
rename from games/cursed-castilla-ex/icon.png
rename to games/cursed-castilla/icon.png
diff --git a/games/cursed-castilla-ex/screenshots/Intro-CompanyLogo.png b/games/cursed-castilla/screenshots/Intro-CompanyLogo.png
similarity index 100%
rename from games/cursed-castilla-ex/screenshots/Intro-CompanyLogo.png
rename to games/cursed-castilla/screenshots/Intro-CompanyLogo.png
diff --git a/games/dragon-ball-z-extreme-butoden/boxart.png b/games/dragon-ball-z-extreme-butoden-update/boxart.png
similarity index 100%
rename from games/dragon-ball-z-extreme-butoden/boxart.png
rename to games/dragon-ball-z-extreme-butoden-update/boxart.png
diff --git a/games/dragon-ball-z-extreme-butoden/game.dat b/games/dragon-ball-z-extreme-butoden-update/game.dat
similarity index 100%
rename from games/dragon-ball-z-extreme-butoden/game.dat
rename to games/dragon-ball-z-extreme-butoden-update/game.dat
diff --git a/games/dragon-ball-z-extreme-butoden/icon.png b/games/dragon-ball-z-extreme-butoden-update/icon.png
similarity index 100%
rename from games/dragon-ball-z-extreme-butoden/icon.png
rename to games/dragon-ball-z-extreme-butoden-update/icon.png
diff --git a/games/dragon-ball-z-extreme-butoden/screenshots/Menu.png b/games/dragon-ball-z-extreme-butoden-update/screenshots/Menu.png
similarity index 100%
rename from games/dragon-ball-z-extreme-butoden/screenshots/Menu.png
rename to games/dragon-ball-z-extreme-butoden-update/screenshots/Menu.png
diff --git a/games/dragon-ball-z-extreme-butoden/screenshots/gameplay1.png b/games/dragon-ball-z-extreme-butoden-update/screenshots/gameplay1.png
similarity index 100%
rename from games/dragon-ball-z-extreme-butoden/screenshots/gameplay1.png
rename to games/dragon-ball-z-extreme-butoden-update/screenshots/gameplay1.png
diff --git a/games/dragon-ball-z-extreme-butoden/screenshots/gameplay2.png b/games/dragon-ball-z-extreme-butoden-update/screenshots/gameplay2.png
similarity index 100%
rename from games/dragon-ball-z-extreme-butoden/screenshots/gameplay2.png
rename to games/dragon-ball-z-extreme-butoden-update/screenshots/gameplay2.png
diff --git a/games/fairune-2/boxart.png b/games/fairune2/boxart.png
similarity index 100%
rename from games/fairune-2/boxart.png
rename to games/fairune2/boxart.png
diff --git a/games/fairune-2/game.dat b/games/fairune2/game.dat
similarity index 100%
rename from games/fairune-2/game.dat
rename to games/fairune2/game.dat
diff --git a/games/fairune-2/icon.png b/games/fairune2/icon.png
similarity index 100%
rename from games/fairune-2/icon.png
rename to games/fairune2/icon.png
diff --git a/games/fairune-2/screenshots/ingame.png b/games/fairune2/screenshots/ingame.png
similarity index 100%
rename from games/fairune-2/screenshots/ingame.png
rename to games/fairune2/screenshots/ingame.png
diff --git a/games/langrisser-re-incarnation-tensei/boxart.png b/games/langrisser-reincarnation-tensei-/boxart.png
similarity index 100%
rename from games/langrisser-re-incarnation-tensei/boxart.png
rename to games/langrisser-reincarnation-tensei-/boxart.png
diff --git a/games/langrisser-re-incarnation-tensei/game.dat b/games/langrisser-reincarnation-tensei-/game.dat
similarity index 100%
rename from games/langrisser-re-incarnation-tensei/game.dat
rename to games/langrisser-reincarnation-tensei-/game.dat
diff --git a/games/langrisser-re-incarnation-tensei/icon.png b/games/langrisser-reincarnation-tensei-/icon.png
similarity index 100%
rename from games/langrisser-re-incarnation-tensei/icon.png
rename to games/langrisser-reincarnation-tensei-/icon.png
diff --git a/games/langrisser-re-incarnation-tensei/screenshots/create-character.png b/games/langrisser-reincarnation-tensei-/screenshots/create-character.png
similarity index 100%
rename from games/langrisser-re-incarnation-tensei/screenshots/create-character.png
rename to games/langrisser-reincarnation-tensei-/screenshots/create-character.png
diff --git a/games/langrisser-re-incarnation-tensei/screenshots/map.png b/games/langrisser-reincarnation-tensei-/screenshots/map.png
similarity index 100%
rename from games/langrisser-re-incarnation-tensei/screenshots/map.png
rename to games/langrisser-reincarnation-tensei-/screenshots/map.png
diff --git a/games/langrisser-re-incarnation-tensei/screenshots/menu.png b/games/langrisser-reincarnation-tensei-/screenshots/menu.png
similarity index 100%
rename from games/langrisser-re-incarnation-tensei/screenshots/menu.png
rename to games/langrisser-reincarnation-tensei-/screenshots/menu.png
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/boxart.png b/games/laytons-mystery-journey-update-ver-12/boxart.png
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/boxart.png
rename to games/laytons-mystery-journey-update-ver-12/boxart.png
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/game.dat b/games/laytons-mystery-journey-update-ver-12/game.dat
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/game.dat
rename to games/laytons-mystery-journey-update-ver-12/game.dat
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/icon.png b/games/laytons-mystery-journey-update-ver-12/icon.png
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/icon.png
rename to games/laytons-mystery-journey-update-ver-12/icon.png
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/first-conversation.png b/games/laytons-mystery-journey-update-ver-12/screenshots/first-conversation.png
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/first-conversation.png
rename to games/laytons-mystery-journey-update-ver-12/screenshots/first-conversation.png
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/first-puzzle-complete.png b/games/laytons-mystery-journey-update-ver-12/screenshots/first-puzzle-complete.png
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/first-puzzle-complete.png
rename to games/laytons-mystery-journey-update-ver-12/screenshots/first-puzzle-complete.png
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/first-puzzle.png b/games/laytons-mystery-journey-update-ver-12/screenshots/first-puzzle.png
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/first-puzzle.png
rename to games/laytons-mystery-journey-update-ver-12/screenshots/first-puzzle.png
diff --git a/games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/start-game.png b/games/laytons-mystery-journey-update-ver-12/screenshots/start-game.png
similarity index 100%
rename from games/laytons-mystery-journey-katrielle-and-the-millionaires-conspiracy/screenshots/start-game.png
rename to games/laytons-mystery-journey-update-ver-12/screenshots/start-game.png
diff --git a/games/luigi-mansion-dark-moon/boxart.png b/games/luigis-mansion-dark-moon/boxart.png
similarity index 100%
rename from games/luigi-mansion-dark-moon/boxart.png
rename to games/luigis-mansion-dark-moon/boxart.png
diff --git a/games/luigi-mansion-dark-moon/game.dat b/games/luigis-mansion-dark-moon/game.dat
similarity index 100%
rename from games/luigi-mansion-dark-moon/game.dat
rename to games/luigis-mansion-dark-moon/game.dat
diff --git a/games/luigi-mansion-dark-moon/icon.png b/games/luigis-mansion-dark-moon/icon.png
similarity index 100%
rename from games/luigi-mansion-dark-moon/icon.png
rename to games/luigis-mansion-dark-moon/icon.png
diff --git a/games/luigi-mansion-dark-moon/screenshots/Eggad-Laboratory.png b/games/luigis-mansion-dark-moon/screenshots/Eggad-Laboratory.png
similarity index 100%
rename from games/luigi-mansion-dark-moon/screenshots/Eggad-Laboratory.png
rename to games/luigis-mansion-dark-moon/screenshots/Eggad-Laboratory.png
diff --git a/games/luigi-mansion-dark-moon/screenshots/Manor-DS-Call.png b/games/luigis-mansion-dark-moon/screenshots/Manor-DS-Call.png
similarity index 100%
rename from games/luigi-mansion-dark-moon/screenshots/Manor-DS-Call.png
rename to games/luigis-mansion-dark-moon/screenshots/Manor-DS-Call.png
diff --git a/games/luigi-mansion-dark-moon/screenshots/Manor-Door.png b/games/luigis-mansion-dark-moon/screenshots/Manor-Door.png
similarity index 100%
rename from games/luigi-mansion-dark-moon/screenshots/Manor-Door.png
rename to games/luigis-mansion-dark-moon/screenshots/Manor-Door.png
diff --git a/games/luigi-mansion-dark-moon/screenshots/Title-Screen.png b/games/luigis-mansion-dark-moon/screenshots/Title-Screen.png
similarity index 100%
rename from games/luigi-mansion-dark-moon/screenshots/Title-Screen.png
rename to games/luigis-mansion-dark-moon/screenshots/Title-Screen.png
diff --git a/games/mario-luigi-dream-team/boxart.png b/games/mario-and-luigi-dream-team-update/boxart.png
similarity index 100%
rename from games/mario-luigi-dream-team/boxart.png
rename to games/mario-and-luigi-dream-team-update/boxart.png
diff --git a/games/mario-luigi-dream-team/game.dat b/games/mario-and-luigi-dream-team-update/game.dat
similarity index 100%
rename from games/mario-luigi-dream-team/game.dat
rename to games/mario-and-luigi-dream-team-update/game.dat
diff --git a/games/mario-luigi-dream-team/icon.png b/games/mario-and-luigi-dream-team-update/icon.png
similarity index 100%
rename from games/mario-luigi-dream-team/icon.png
rename to games/mario-and-luigi-dream-team-update/icon.png
diff --git a/games/mario-luigi-dream-team/screenshots/Beggining.png b/games/mario-and-luigi-dream-team-update/screenshots/Beggining.png
similarity index 100%
rename from games/mario-luigi-dream-team/screenshots/Beggining.png
rename to games/mario-and-luigi-dream-team-update/screenshots/Beggining.png
diff --git a/games/mario-luigi-dream-team/screenshots/File-Select.png b/games/mario-and-luigi-dream-team-update/screenshots/File-Select.png
similarity index 100%
rename from games/mario-luigi-dream-team/screenshots/File-Select.png
rename to games/mario-and-luigi-dream-team-update/screenshots/File-Select.png
diff --git a/games/mario-luigi-dream-team/screenshots/Gyro-Attack.png b/games/mario-and-luigi-dream-team-update/screenshots/Gyro-Attack.png
similarity index 100%
rename from games/mario-luigi-dream-team/screenshots/Gyro-Attack.png
rename to games/mario-and-luigi-dream-team-update/screenshots/Gyro-Attack.png
diff --git a/games/mario-luigi-dream-team/screenshots/Title-Screen.png b/games/mario-and-luigi-dream-team-update/screenshots/Title-Screen.png
similarity index 100%
rename from games/mario-luigi-dream-team/screenshots/Title-Screen.png
rename to games/mario-and-luigi-dream-team-update/screenshots/Title-Screen.png
diff --git a/games/mario-luigi-paper-jam/boxart.png b/games/mario-and-luigi-paper-jam/boxart.png
similarity index 100%
rename from games/mario-luigi-paper-jam/boxart.png
rename to games/mario-and-luigi-paper-jam/boxart.png
diff --git a/games/mario-luigi-paper-jam/game.dat b/games/mario-and-luigi-paper-jam/game.dat
similarity index 100%
rename from games/mario-luigi-paper-jam/game.dat
rename to games/mario-and-luigi-paper-jam/game.dat
diff --git a/games/mario-luigi-paper-jam/icon.png b/games/mario-and-luigi-paper-jam/icon.png
similarity index 100%
rename from games/mario-luigi-paper-jam/icon.png
rename to games/mario-and-luigi-paper-jam/icon.png
diff --git a/games/mario-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.dat b/games/mario-and-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.dat
similarity index 100%
rename from games/mario-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.dat
rename to games/mario-and-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.dat
diff --git a/games/mario-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.zip b/games/mario-and-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.zip
similarity index 100%
rename from games/mario-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.zip
rename to games/mario-and-luigi-paper-jam/savefiles/PaperJam-NearCrash-EUR.zip
diff --git a/games/mario-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-31-45.png b/games/mario-and-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-31-45.png
similarity index 100%
rename from games/mario-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-31-45.png
rename to games/mario-and-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-31-45.png
diff --git a/games/mario-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-14.png b/games/mario-and-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-14.png
similarity index 100%
rename from games/mario-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-14.png
rename to games/mario-and-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-14.png
diff --git a/games/mario-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-58.png b/games/mario-and-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-58.png
similarity index 100%
rename from games/mario-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-58.png
rename to games/mario-and-luigi-paper-jam/screenshots/citra-qt_2017-08-31_20-33-58.png
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/boxart.png b/games/mario-and-luigi-superstar-saga-bowsers-minions/boxart.png
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/boxart.png
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/boxart.png
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/game.dat b/games/mario-and-luigi-superstar-saga-bowsers-minions/game.dat
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/game.dat
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/game.dat
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/icon.png b/games/mario-and-luigi-superstar-saga-bowsers-minions/icon.png
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/icon.png
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/icon.png
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/screenshots/bowsers-minions.png b/games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/bowsers-minions.png
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/screenshots/bowsers-minions.png
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/bowsers-minions.png
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/screenshots/fighting.png b/games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/fighting.png
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/screenshots/fighting.png
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/fighting.png
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/screenshots/menu.png b/games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/menu.png
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/screenshots/menu.png
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/menu.png
diff --git a/games/mario-luigi-superstar-saga-bowsers-minions/screenshots/playing.png b/games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/playing.png
similarity index 100%
rename from games/mario-luigi-superstar-saga-bowsers-minions/screenshots/playing.png
rename to games/mario-and-luigi-superstar-saga-bowsers-minions/screenshots/playing.png
diff --git a/games/megaman-legacy-collection/boxart.png b/games/mega-man-legacy-collection/boxart.png
similarity index 100%
rename from games/megaman-legacy-collection/boxart.png
rename to games/mega-man-legacy-collection/boxart.png
diff --git a/games/megaman-legacy-collection/game.dat b/games/mega-man-legacy-collection/game.dat
similarity index 100%
rename from games/megaman-legacy-collection/game.dat
rename to games/mega-man-legacy-collection/game.dat
diff --git a/games/megaman-legacy-collection/icon.png b/games/mega-man-legacy-collection/icon.png
similarity index 100%
rename from games/megaman-legacy-collection/icon.png
rename to games/mega-man-legacy-collection/icon.png
diff --git a/games/megaman-legacy-collection/screenshots/LoadingScreen.png b/games/mega-man-legacy-collection/screenshots/LoadingScreen.png
similarity index 100%
rename from games/megaman-legacy-collection/screenshots/LoadingScreen.png
rename to games/mega-man-legacy-collection/screenshots/LoadingScreen.png
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/boxart.png b/games/mercenaries-saga-2/boxart.png
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/boxart.png
rename to games/mercenaries-saga-2/boxart.png
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/game.dat b/games/mercenaries-saga-2/game.dat
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/game.dat
rename to games/mercenaries-saga-2/game.dat
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/icon.png b/games/mercenaries-saga-2/icon.png
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/icon.png
rename to games/mercenaries-saga-2/icon.png
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Battle-Selection-Screen.png b/games/mercenaries-saga-2/screenshots/Battle-Selection-Screen.png
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Battle-Selection-Screen.png
rename to games/mercenaries-saga-2/screenshots/Battle-Selection-Screen.png
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Character-Class-Screen.png b/games/mercenaries-saga-2/screenshots/Character-Class-Screen.png
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Character-Class-Screen.png
rename to games/mercenaries-saga-2/screenshots/Character-Class-Screen.png
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Character-Screen.png b/games/mercenaries-saga-2/screenshots/Character-Screen.png
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Character-Screen.png
rename to games/mercenaries-saga-2/screenshots/Character-Screen.png
diff --git a/games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Title-Screen.png b/games/mercenaries-saga-2/screenshots/Title-Screen.png
similarity index 100%
rename from games/mercenaries-saga-2-order-of-the-silver-eagle/screenshots/Title-Screen.png
rename to games/mercenaries-saga-2/screenshots/Title-Screen.png
diff --git a/games/metroid-prime-blast-ball/boxart.png b/games/metroid-prime-federation-force-blast-ball-update/boxart.png
similarity index 100%
rename from games/metroid-prime-blast-ball/boxart.png
rename to games/metroid-prime-federation-force-blast-ball-update/boxart.png
diff --git a/games/metroid-prime-blast-ball/game.dat b/games/metroid-prime-federation-force-blast-ball-update/game.dat
similarity index 100%
rename from games/metroid-prime-blast-ball/game.dat
rename to games/metroid-prime-federation-force-blast-ball-update/game.dat
diff --git a/games/metroid-prime-blast-ball/icon.png b/games/metroid-prime-federation-force-blast-ball-update/icon.png
similarity index 100%
rename from games/metroid-prime-blast-ball/icon.png
rename to games/metroid-prime-federation-force-blast-ball-update/icon.png
diff --git a/games/metroid-prime-blast-ball/screenshots/Customization-Menu.png b/games/metroid-prime-federation-force-blast-ball-update/screenshots/Customization-Menu.png
similarity index 100%
rename from games/metroid-prime-blast-ball/screenshots/Customization-Menu.png
rename to games/metroid-prime-federation-force-blast-ball-update/screenshots/Customization-Menu.png
diff --git a/games/metroid-prime-blast-ball/screenshots/Main-Menu.png b/games/metroid-prime-federation-force-blast-ball-update/screenshots/Main-Menu.png
similarity index 100%
rename from games/metroid-prime-blast-ball/screenshots/Main-Menu.png
rename to games/metroid-prime-federation-force-blast-ball-update/screenshots/Main-Menu.png
diff --git a/games/metroid-prime-blast-ball/screenshots/charged-shot.png b/games/metroid-prime-federation-force-blast-ball-update/screenshots/charged-shot.png
similarity index 100%
rename from games/metroid-prime-blast-ball/screenshots/charged-shot.png
rename to games/metroid-prime-federation-force-blast-ball-update/screenshots/charged-shot.png
diff --git a/games/metroid-prime-blast-ball/screenshots/ready-set.png b/games/metroid-prime-federation-force-blast-ball-update/screenshots/ready-set.png
similarity index 100%
rename from games/metroid-prime-blast-ball/screenshots/ready-set.png
rename to games/metroid-prime-federation-force-blast-ball-update/screenshots/ready-set.png
diff --git a/games/mini-mario-friends-amiibo-challenge/boxart.png b/games/mini-mario-and-friends-amiibo-challenge/boxart.png
similarity index 100%
rename from games/mini-mario-friends-amiibo-challenge/boxart.png
rename to games/mini-mario-and-friends-amiibo-challenge/boxart.png
diff --git a/games/mini-mario-friends-amiibo-challenge/game.dat b/games/mini-mario-and-friends-amiibo-challenge/game.dat
similarity index 100%
rename from games/mini-mario-friends-amiibo-challenge/game.dat
rename to games/mini-mario-and-friends-amiibo-challenge/game.dat
diff --git a/games/mini-mario-friends-amiibo-challenge/icon.png b/games/mini-mario-and-friends-amiibo-challenge/icon.png
similarity index 100%
rename from games/mini-mario-friends-amiibo-challenge/icon.png
rename to games/mini-mario-and-friends-amiibo-challenge/icon.png
diff --git a/games/mini-mario-friends-amiibo-challenge/screenshots/Mini1.png b/games/mini-mario-and-friends-amiibo-challenge/screenshots/Mini1.png
similarity index 100%
rename from games/mini-mario-friends-amiibo-challenge/screenshots/Mini1.png
rename to games/mini-mario-and-friends-amiibo-challenge/screenshots/Mini1.png
diff --git a/games/mini-mario-friends-amiibo-challenge/screenshots/Mini2.png b/games/mini-mario-and-friends-amiibo-challenge/screenshots/Mini2.png
similarity index 100%
rename from games/mini-mario-friends-amiibo-challenge/screenshots/Mini2.png
rename to games/mini-mario-and-friends-amiibo-challenge/screenshots/Mini2.png
diff --git a/games/mini-mario-friends-amiibo-challenge/screenshots/Mini3.png b/games/mini-mario-and-friends-amiibo-challenge/screenshots/Mini3.png
similarity index 100%
rename from games/mini-mario-friends-amiibo-challenge/screenshots/Mini3.png
rename to games/mini-mario-and-friends-amiibo-challenge/screenshots/Mini3.png
diff --git a/games/pokemon-sun-and-moon-special-demo-version/boxart.png b/games/pokemon-sun-and-pokemon-moon-special-demo/boxart.png
similarity index 100%
rename from games/pokemon-sun-and-moon-special-demo-version/boxart.png
rename to games/pokemon-sun-and-pokemon-moon-special-demo/boxart.png
diff --git a/games/pokemon-sun-and-moon-special-demo-version/game.dat b/games/pokemon-sun-and-pokemon-moon-special-demo/game.dat
similarity index 100%
rename from games/pokemon-sun-and-moon-special-demo-version/game.dat
rename to games/pokemon-sun-and-pokemon-moon-special-demo/game.dat
diff --git a/games/pokemon-sun-and-moon-special-demo-version/icon.png b/games/pokemon-sun-and-pokemon-moon-special-demo/icon.png
similarity index 100%
rename from games/pokemon-sun-and-moon-special-demo-version/icon.png
rename to games/pokemon-sun-and-pokemon-moon-special-demo/icon.png
diff --git a/games/pokemon-sun-and-moon-special-demo-version/screenshots/Battle-Start.png b/games/pokemon-sun-and-pokemon-moon-special-demo/screenshots/Battle-Start.png
similarity index 100%
rename from games/pokemon-sun-and-moon-special-demo-version/screenshots/Battle-Start.png
rename to games/pokemon-sun-and-pokemon-moon-special-demo/screenshots/Battle-Start.png
diff --git a/games/pokemon-sun-and-moon-special-demo-version/screenshots/Game-Interface.png b/games/pokemon-sun-and-pokemon-moon-special-demo/screenshots/Game-Interface.png
similarity index 100%
rename from games/pokemon-sun-and-moon-special-demo-version/screenshots/Game-Interface.png
rename to games/pokemon-sun-and-pokemon-moon-special-demo/screenshots/Game-Interface.png
diff --git a/games/pokemon-sun-and-moon-special-demo-version/screenshots/Main-Menu.png b/games/pokemon-sun-and-pokemon-moon-special-demo/screenshots/Main-Menu.png
similarity index 100%
rename from games/pokemon-sun-and-moon-special-demo-version/screenshots/Main-Menu.png
rename to games/pokemon-sun-and-pokemon-moon-special-demo/screenshots/Main-Menu.png
diff --git a/games/pokemon-yellow/boxart.png b/games/pokemon-yellow-version-english-version/boxart.png
similarity index 100%
rename from games/pokemon-yellow/boxart.png
rename to games/pokemon-yellow-version-english-version/boxart.png
diff --git a/games/pokemon-yellow/game.dat b/games/pokemon-yellow-version-english-version/game.dat
similarity index 100%
rename from games/pokemon-yellow/game.dat
rename to games/pokemon-yellow-version-english-version/game.dat
diff --git a/games/pokemon-yellow/icon.png b/games/pokemon-yellow-version-english-version/icon.png
similarity index 100%
rename from games/pokemon-yellow/icon.png
rename to games/pokemon-yellow-version-english-version/icon.png
diff --git a/games/pokemon-yellow/screenshots/Battle.png b/games/pokemon-yellow-version-english-version/screenshots/Battle.png
similarity index 100%
rename from games/pokemon-yellow/screenshots/Battle.png
rename to games/pokemon-yellow-version-english-version/screenshots/Battle.png
diff --git a/games/pokemon-yellow/screenshots/BattleStart.png b/games/pokemon-yellow-version-english-version/screenshots/BattleStart.png
similarity index 100%
rename from games/pokemon-yellow/screenshots/BattleStart.png
rename to games/pokemon-yellow-version-english-version/screenshots/BattleStart.png
diff --git a/games/pokemon-yellow/screenshots/PikachuBattle.png b/games/pokemon-yellow-version-english-version/screenshots/PikachuBattle.png
similarity index 100%
rename from games/pokemon-yellow/screenshots/PikachuBattle.png
rename to games/pokemon-yellow-version-english-version/screenshots/PikachuBattle.png
diff --git a/games/pokemon-yellow/screenshots/PikachuTalk.png b/games/pokemon-yellow-version-english-version/screenshots/PikachuTalk.png
similarity index 100%
rename from games/pokemon-yellow/screenshots/PikachuTalk.png
rename to games/pokemon-yellow-version-english-version/screenshots/PikachuTalk.png
diff --git a/games/pokemon-yellow/screenshots/StartScreen.png b/games/pokemon-yellow-version-english-version/screenshots/StartScreen.png
similarity index 100%
rename from games/pokemon-yellow/screenshots/StartScreen.png
rename to games/pokemon-yellow-version-english-version/screenshots/StartScreen.png
diff --git a/games/poochy-yoshis-woolly-world/boxart.png b/games/poochy-and-yoshis-woolly-world/boxart.png
similarity index 100%
rename from games/poochy-yoshis-woolly-world/boxart.png
rename to games/poochy-and-yoshis-woolly-world/boxart.png
diff --git a/games/poochy-yoshis-woolly-world/game.dat b/games/poochy-and-yoshis-woolly-world/game.dat
similarity index 100%
rename from games/poochy-yoshis-woolly-world/game.dat
rename to games/poochy-and-yoshis-woolly-world/game.dat
diff --git a/games/poochy-yoshis-woolly-world/icon.png b/games/poochy-and-yoshis-woolly-world/icon.png
similarity index 100%
rename from games/poochy-yoshis-woolly-world/icon.png
rename to games/poochy-and-yoshis-woolly-world/icon.png
diff --git a/games/poochy-yoshis-woolly-world/screenshots/Gameplay.png b/games/poochy-and-yoshis-woolly-world/screenshots/Gameplay.png
similarity index 100%
rename from games/poochy-yoshis-woolly-world/screenshots/Gameplay.png
rename to games/poochy-and-yoshis-woolly-world/screenshots/Gameplay.png
diff --git a/games/poochy-yoshis-woolly-world/screenshots/Title.png b/games/poochy-and-yoshis-woolly-world/screenshots/Title.png
similarity index 100%
rename from games/poochy-yoshis-woolly-world/screenshots/Title.png
rename to games/poochy-and-yoshis-woolly-world/screenshots/Title.png
diff --git a/games/poochy-yoshis-woolly-world/screenshots/citra-qt_2017-12-22_17-00-45.png b/games/poochy-and-yoshis-woolly-world/screenshots/citra-qt_2017-12-22_17-00-45.png
similarity index 100%
rename from games/poochy-yoshis-woolly-world/screenshots/citra-qt_2017-12-22_17-00-45.png
rename to games/poochy-and-yoshis-woolly-world/screenshots/citra-qt_2017-12-22_17-00-45.png
diff --git a/games/project-x-zone-2/boxart.png b/games/project-x-zone-2-update-ver-12/boxart.png
similarity index 100%
rename from games/project-x-zone-2/boxart.png
rename to games/project-x-zone-2-update-ver-12/boxart.png
diff --git a/games/project-x-zone-2/game.dat b/games/project-x-zone-2-update-ver-12/game.dat
similarity index 100%
rename from games/project-x-zone-2/game.dat
rename to games/project-x-zone-2-update-ver-12/game.dat
diff --git a/games/project-x-zone-2/icon.png b/games/project-x-zone-2-update-ver-12/icon.png
similarity index 100%
rename from games/project-x-zone-2/icon.png
rename to games/project-x-zone-2-update-ver-12/icon.png
diff --git a/games/project-x-zone-2/screenshots/battle.png b/games/project-x-zone-2-update-ver-12/screenshots/battle.png
similarity index 100%
rename from games/project-x-zone-2/screenshots/battle.png
rename to games/project-x-zone-2-update-ver-12/screenshots/battle.png
diff --git a/games/project-x-zone-2/screenshots/in-battle.png b/games/project-x-zone-2-update-ver-12/screenshots/in-battle.png
similarity index 100%
rename from games/project-x-zone-2/screenshots/in-battle.png
rename to games/project-x-zone-2-update-ver-12/screenshots/in-battle.png
diff --git a/games/project-x-zone-2/screenshots/in-field.png b/games/project-x-zone-2-update-ver-12/screenshots/in-field.png
similarity index 100%
rename from games/project-x-zone-2/screenshots/in-field.png
rename to games/project-x-zone-2-update-ver-12/screenshots/in-field.png
diff --git a/games/project-x-zone-2/screenshots/intro.png b/games/project-x-zone-2-update-ver-12/screenshots/intro.png
similarity index 100%
rename from games/project-x-zone-2/screenshots/intro.png
rename to games/project-x-zone-2-update-ver-12/screenshots/intro.png
diff --git a/games/rhythm-thief/boxart.png b/games/rhythm-thief-and-the-emperors-treasure/boxart.png
similarity index 100%
rename from games/rhythm-thief/boxart.png
rename to games/rhythm-thief-and-the-emperors-treasure/boxart.png
diff --git a/games/rhythm-thief/game.dat b/games/rhythm-thief-and-the-emperors-treasure/game.dat
similarity index 100%
rename from games/rhythm-thief/game.dat
rename to games/rhythm-thief-and-the-emperors-treasure/game.dat
diff --git a/games/rhythm-thief/icon.png b/games/rhythm-thief-and-the-emperors-treasure/icon.png
similarity index 100%
rename from games/rhythm-thief/icon.png
rename to games/rhythm-thief-and-the-emperors-treasure/icon.png
diff --git a/games/shovel-knight/boxart.png b/games/shovel-knight-treasure-trove-update-ver-32/boxart.png
similarity index 100%
rename from games/shovel-knight/boxart.png
rename to games/shovel-knight-treasure-trove-update-ver-32/boxart.png
diff --git a/games/shovel-knight/game.dat b/games/shovel-knight-treasure-trove-update-ver-32/game.dat
similarity index 100%
rename from games/shovel-knight/game.dat
rename to games/shovel-knight-treasure-trove-update-ver-32/game.dat
diff --git a/games/shovel-knight/icon.png b/games/shovel-knight-treasure-trove-update-ver-32/icon.png
similarity index 100%
rename from games/shovel-knight/icon.png
rename to games/shovel-knight-treasure-trove-update-ver-32/icon.png
diff --git a/games/shovel-knight/screenshots/citra-qt_2017-10-24_01-54-53.png b/games/shovel-knight-treasure-trove-update-ver-32/screenshots/citra-qt_2017-10-24_01-54-53.png
similarity index 100%
rename from games/shovel-knight/screenshots/citra-qt_2017-10-24_01-54-53.png
rename to games/shovel-knight-treasure-trove-update-ver-32/screenshots/citra-qt_2017-10-24_01-54-53.png
diff --git a/games/shovel-knight/screenshots/citra-qt_2017-10-24_01-55-36.png b/games/shovel-knight-treasure-trove-update-ver-32/screenshots/citra-qt_2017-10-24_01-55-36.png
similarity index 100%
rename from games/shovel-knight/screenshots/citra-qt_2017-10-24_01-55-36.png
rename to games/shovel-knight-treasure-trove-update-ver-32/screenshots/citra-qt_2017-10-24_01-55-36.png
diff --git a/games/shovel-knight/screenshots/citra-qt_2017-10-24_01-56-48.png b/games/shovel-knight-treasure-trove-update-ver-32/screenshots/citra-qt_2017-10-24_01-56-48.png
similarity index 100%
rename from games/shovel-knight/screenshots/citra-qt_2017-10-24_01-56-48.png
rename to games/shovel-knight-treasure-trove-update-ver-32/screenshots/citra-qt_2017-10-24_01-56-48.png
diff --git a/games/sonic-all-stars-racing-transformed/boxart.png b/games/sonic-and-all-stars-racing-transformed/boxart.png
similarity index 100%
rename from games/sonic-all-stars-racing-transformed/boxart.png
rename to games/sonic-and-all-stars-racing-transformed/boxart.png
diff --git a/games/sonic-all-stars-racing-transformed/game.dat b/games/sonic-and-all-stars-racing-transformed/game.dat
similarity index 100%
rename from games/sonic-all-stars-racing-transformed/game.dat
rename to games/sonic-and-all-stars-racing-transformed/game.dat
diff --git a/games/sonic-all-stars-racing-transformed/icon.png b/games/sonic-and-all-stars-racing-transformed/icon.png
similarity index 100%
rename from games/sonic-all-stars-racing-transformed/icon.png
rename to games/sonic-and-all-stars-racing-transformed/icon.png
diff --git a/games/sonic-all-stars-racing-transformed/screenshots/stuck-menu.png b/games/sonic-and-all-stars-racing-transformed/screenshots/stuck-menu.png
similarity index 100%
rename from games/sonic-all-stars-racing-transformed/screenshots/stuck-menu.png
rename to games/sonic-and-all-stars-racing-transformed/screenshots/stuck-menu.png
diff --git a/games/smb-the-lost-levels/boxart.png b/games/super-mario-bros-the-lost-levels/boxart.png
similarity index 100%
rename from games/smb-the-lost-levels/boxart.png
rename to games/super-mario-bros-the-lost-levels/boxart.png
diff --git a/games/smb-the-lost-levels/game.dat b/games/super-mario-bros-the-lost-levels/game.dat
similarity index 100%
rename from games/smb-the-lost-levels/game.dat
rename to games/super-mario-bros-the-lost-levels/game.dat
diff --git a/games/smb-the-lost-levels/icon.png b/games/super-mario-bros-the-lost-levels/icon.png
similarity index 100%
rename from games/smb-the-lost-levels/icon.png
rename to games/super-mario-bros-the-lost-levels/icon.png
diff --git a/games/smb-the-lost-levels/savefiles/World-3-2.dat b/games/super-mario-bros-the-lost-levels/savefiles/World-3-2.dat
similarity index 100%
rename from games/smb-the-lost-levels/savefiles/World-3-2.dat
rename to games/super-mario-bros-the-lost-levels/savefiles/World-3-2.dat
diff --git a/games/smb-the-lost-levels/savefiles/World-3-2.zip b/games/super-mario-bros-the-lost-levels/savefiles/World-3-2.zip
similarity index 100%
rename from games/smb-the-lost-levels/savefiles/World-3-2.zip
rename to games/super-mario-bros-the-lost-levels/savefiles/World-3-2.zip
diff --git a/games/smb-the-lost-levels/screenshots/Lost-Live.png b/games/super-mario-bros-the-lost-levels/screenshots/Lost-Live.png
similarity index 100%
rename from games/smb-the-lost-levels/screenshots/Lost-Live.png
rename to games/super-mario-bros-the-lost-levels/screenshots/Lost-Live.png
diff --git a/games/smb-the-lost-levels/screenshots/Lvl-W3.png b/games/super-mario-bros-the-lost-levels/screenshots/Lvl-W3.png
similarity index 100%
rename from games/smb-the-lost-levels/screenshots/Lvl-W3.png
rename to games/super-mario-bros-the-lost-levels/screenshots/Lvl-W3.png
diff --git a/games/smb-the-lost-levels/screenshots/Restore-Point.png b/games/super-mario-bros-the-lost-levels/screenshots/Restore-Point.png
similarity index 100%
rename from games/smb-the-lost-levels/screenshots/Restore-Point.png
rename to games/super-mario-bros-the-lost-levels/screenshots/Restore-Point.png
diff --git a/games/smb-the-lost-levels/screenshots/Title-Screen.png b/games/super-mario-bros-the-lost-levels/screenshots/Title-Screen.png
similarity index 100%
rename from games/smb-the-lost-levels/screenshots/Title-Screen.png
rename to games/super-mario-bros-the-lost-levels/screenshots/Title-Screen.png
diff --git a/games/super-smash-bros/boxart.png b/games/super-smash-bros-update-ver-117/boxart.png
similarity index 100%
rename from games/super-smash-bros/boxart.png
rename to games/super-smash-bros-update-ver-117/boxart.png
diff --git a/games/super-smash-bros/game.dat b/games/super-smash-bros-update-ver-117/game.dat
similarity index 100%
rename from games/super-smash-bros/game.dat
rename to games/super-smash-bros-update-ver-117/game.dat
diff --git a/games/super-smash-bros/icon.png b/games/super-smash-bros-update-ver-117/icon.png
similarity index 100%
rename from games/super-smash-bros/icon.png
rename to games/super-smash-bros-update-ver-117/icon.png
diff --git a/games/super-smash-bros/screenshots/Character-select.png b/games/super-smash-bros-update-ver-117/screenshots/Character-select.png
similarity index 100%
rename from games/super-smash-bros/screenshots/Character-select.png
rename to games/super-smash-bros-update-ver-117/screenshots/Character-select.png
diff --git a/games/super-smash-bros/screenshots/Fight.png b/games/super-smash-bros-update-ver-117/screenshots/Fight.png
similarity index 100%
rename from games/super-smash-bros/screenshots/Fight.png
rename to games/super-smash-bros-update-ver-117/screenshots/Fight.png
diff --git a/games/super-smash-bros/screenshots/Run.png b/games/super-smash-bros-update-ver-117/screenshots/Run.png
similarity index 100%
rename from games/super-smash-bros/screenshots/Run.png
rename to games/super-smash-bros-update-ver-117/screenshots/Run.png
diff --git a/games/super-smash-bros/screenshots/Title.png b/games/super-smash-bros-update-ver-117/screenshots/Title.png
similarity index 100%
rename from games/super-smash-bros/screenshots/Title.png
rename to games/super-smash-bros-update-ver-117/screenshots/Title.png
diff --git a/games/super-street-fighter-4-3d-edition/boxart.png b/games/super-street-fighter-iv-3d-edition/boxart.png
similarity index 100%
rename from games/super-street-fighter-4-3d-edition/boxart.png
rename to games/super-street-fighter-iv-3d-edition/boxart.png
diff --git a/games/super-street-fighter-4-3d-edition/game.dat b/games/super-street-fighter-iv-3d-edition/game.dat
similarity index 100%
rename from games/super-street-fighter-4-3d-edition/game.dat
rename to games/super-street-fighter-iv-3d-edition/game.dat
diff --git a/games/super-street-fighter-4-3d-edition/icon.png b/games/super-street-fighter-iv-3d-edition/icon.png
similarity index 100%
rename from games/super-street-fighter-4-3d-edition/icon.png
rename to games/super-street-fighter-iv-3d-edition/icon.png
diff --git a/games/tales-of-the-abyss/boxart.png b/games/tales-of-the-abyss-3d/boxart.png
similarity index 100%
rename from games/tales-of-the-abyss/boxart.png
rename to games/tales-of-the-abyss-3d/boxart.png
diff --git a/games/tales-of-the-abyss/game.dat b/games/tales-of-the-abyss-3d/game.dat
similarity index 100%
rename from games/tales-of-the-abyss/game.dat
rename to games/tales-of-the-abyss-3d/game.dat
diff --git a/games/tales-of-the-abyss/icon.png b/games/tales-of-the-abyss-3d/icon.png
similarity index 100%
rename from games/tales-of-the-abyss/icon.png
rename to games/tales-of-the-abyss-3d/icon.png
diff --git a/games/zero-time-dilemma/boxart.png b/games/zero-escape-zero-time-dilemma/boxart.png
similarity index 100%
rename from games/zero-time-dilemma/boxart.png
rename to games/zero-escape-zero-time-dilemma/boxart.png
diff --git a/games/zero-time-dilemma/game.dat b/games/zero-escape-zero-time-dilemma/game.dat
similarity index 100%
rename from games/zero-time-dilemma/game.dat
rename to games/zero-escape-zero-time-dilemma/game.dat
diff --git a/games/zero-time-dilemma/icon.png b/games/zero-escape-zero-time-dilemma/icon.png
similarity index 100%
rename from games/zero-time-dilemma/icon.png
rename to games/zero-escape-zero-time-dilemma/icon.png
diff --git a/games/zero-time-dilemma/screenshots/in-game.png b/games/zero-escape-zero-time-dilemma/screenshots/in-game.png
similarity index 100%
rename from games/zero-time-dilemma/screenshots/in-game.png
rename to games/zero-escape-zero-time-dilemma/screenshots/in-game.png
diff --git a/games/zero-time-dilemma/screenshots/menu.png b/games/zero-escape-zero-time-dilemma/screenshots/menu.png
similarity index 100%
rename from games/zero-time-dilemma/screenshots/menu.png
rename to games/zero-escape-zero-time-dilemma/screenshots/menu.png
diff --git a/games/zero-time-dilemma/screenshots/title-screen.png b/games/zero-escape-zero-time-dilemma/screenshots/title-screen.png
similarity index 100%
rename from games/zero-time-dilemma/screenshots/title-screen.png
rename to games/zero-escape-zero-time-dilemma/screenshots/title-screen.png