diff --git a/games/pokemon-alpha-sapphire/boxart.png b/games/pokemon-alpha-sapphire/boxart.png
new file mode 100644
index 0000000..655546e
Binary files /dev/null and b/games/pokemon-alpha-sapphire/boxart.png differ
diff --git a/games/pokemon-alpha-sapphire/game.dat b/games/pokemon-alpha-sapphire/game.dat
new file mode 100644
index 0000000..1e29414
--- /dev/null
+++ b/games/pokemon-alpha-sapphire/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon Alpha Sapphire"
+description = "Pokémon Alpha Sapphire is a 2014 role-playing video game developed by Game Freak and published by Nintendo for the Nintendo 3DS family of systems. It is part of the sixth generation of the Pokémon series, serving as enhanced remake of the 2002 Game Boy Advance title Pokémon Sapphire."
+github_issues = [2419, 3703]
+needs_system_files = true
+needs_shared_font = true
+wiki_override = "pokemon-omega-ruby-alpha-sapphire"
+
+[[ releases ]]
+title = "000400000011C500"
+region = "all"
+release_date = "2014-11-21"
diff --git a/games/pokemon-alpha-sapphire/icon.png b/games/pokemon-alpha-sapphire/icon.png
new file mode 100644
index 0000000..28bbe92
Binary files /dev/null and b/games/pokemon-alpha-sapphire/icon.png differ
diff --git a/games/pokemon-omega-ruby-alpha-sapphire/screenshots/1.png b/games/pokemon-alpha-sapphire/screenshots/1.png
similarity index 100%
rename from games/pokemon-omega-ruby-alpha-sapphire/screenshots/1.png
rename to games/pokemon-alpha-sapphire/screenshots/1.png
diff --git a/games/pokemon-omega-ruby-alpha-sapphire/screenshots/2.png b/games/pokemon-alpha-sapphire/screenshots/2.png
similarity index 100%
rename from games/pokemon-omega-ruby-alpha-sapphire/screenshots/2.png
rename to games/pokemon-alpha-sapphire/screenshots/2.png
diff --git a/games/pokemon-omega-ruby-alpha-sapphire/screenshots/3.png b/games/pokemon-alpha-sapphire/screenshots/3.png
similarity index 100%
rename from games/pokemon-omega-ruby-alpha-sapphire/screenshots/3.png
rename to games/pokemon-alpha-sapphire/screenshots/3.png
diff --git a/games/pokemon-moon/boxart.png b/games/pokemon-moon/boxart.png
new file mode 100644
index 0000000..1780b2a
Binary files /dev/null and b/games/pokemon-moon/boxart.png differ
diff --git a/games/pokemon-moon/game.dat b/games/pokemon-moon/game.dat
new file mode 100644
index 0000000..ab60260
--- /dev/null
+++ b/games/pokemon-moon/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon  Moon"
+description = "Pokémon Moon is a role-playing video game developed by Game Freak and published by Nintendo for the Nintendo 3DS. It is the first installment in the seventh generation of Pokémon games."
+github_issues = [2190, 3703]
+needs_system_files = false
+needs_shared_font = false
+wiki_override = "pokemon-sun-moon"
+
+[[ releases ]]
+title = "0004000000175E00"
+region = "all"
+release_date = "2016-11-18"
diff --git a/games/pokemon-moon/icon.png b/games/pokemon-moon/icon.png
new file mode 100644
index 0000000..1b40906
Binary files /dev/null and b/games/pokemon-moon/icon.png differ
diff --git a/games/pokemon-sun-moon/screenshots/1.png b/games/pokemon-moon/screenshots/1.png
similarity index 100%
rename from games/pokemon-sun-moon/screenshots/1.png
rename to games/pokemon-moon/screenshots/1.png
diff --git a/games/pokemon-sun-moon/screenshots/2.png b/games/pokemon-moon/screenshots/2.png
similarity index 100%
rename from games/pokemon-sun-moon/screenshots/2.png
rename to games/pokemon-moon/screenshots/2.png
diff --git a/games/pokemon-sun-moon/screenshots/3.png b/games/pokemon-moon/screenshots/3.png
similarity index 100%
rename from games/pokemon-sun-moon/screenshots/3.png
rename to games/pokemon-moon/screenshots/3.png
diff --git a/games/pokemon-omega-ruby-alpha-sapphire/game.dat b/games/pokemon-omega-ruby-alpha-sapphire/game.dat
deleted file mode 100644
index 7ba7269..0000000
--- a/games/pokemon-omega-ruby-alpha-sapphire/game.dat
+++ /dev/null
@@ -1,25 +0,0 @@
-title = "Pokémon Omega Ruby and Alpha Sapphire"
-description = "Pokémon Omega Ruby and Alpha Sapphire are two 2014 role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS family of systems. They are part of the sixth generation of the Pokémon series, serving as enhanced remakes of the 2002 Game Boy Advance titles Pokémon Ruby and Sapphire."
-github_issues = [2419, 3703]
-needs_system_files = true
-needs_shared_font = true
-
-[[ releases ]]
-title = "000400000011C400"
-region = "all"
-release_date = "2014-11-21"
-
-[[ releases ]]
-title = "000400000011C500"
-region = "all"
-release_date = "2014-11-21"
-
-[[ testcases ]]
-title = "000400000011C400"
-compatibility = "1"
-date = "2017-05-31"
-version = "HEAD-4857eb4"
-author = "Flamboyant_Ham"
-cpu = "Intel Core i7-4720HQ"
-gpu = "GeForce GTX 960M"
-os = "Windows 10 14393"
diff --git a/games/pokemon-omega-ruby-alpha-sapphire/boxart.png b/games/pokemon-omega-ruby/boxart.png
similarity index 100%
rename from games/pokemon-omega-ruby-alpha-sapphire/boxart.png
rename to games/pokemon-omega-ruby/boxart.png
diff --git a/games/pokemon-omega-ruby/game.dat b/games/pokemon-omega-ruby/game.dat
new file mode 100644
index 0000000..b101422
--- /dev/null
+++ b/games/pokemon-omega-ruby/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon Omega Ruby"
+description = "Pokémon Omega Ruby is a 2014 role-playing video game developed by Game Freak and published by Nintendo for the Nintendo 3DS family of systems. It is part of the sixth generation of the Pokémon series, serving as an enhanced remake of the 2002 Game Boy Advance title Pokémon Ruby."
+github_issues = [2419, 3703]
+needs_system_files = true
+needs_shared_font = true
+wiki_override = "pokemon-omega-ruby-alpha-sapphire"
+
+[[ releases ]]
+title = "000400000011C400"
+region = "all"
+release_date = "2014-11-21"
diff --git a/games/pokemon-omega-ruby-alpha-sapphire/icon.png b/games/pokemon-omega-ruby/icon.png
similarity index 100%
rename from games/pokemon-omega-ruby-alpha-sapphire/icon.png
rename to games/pokemon-omega-ruby/icon.png
diff --git a/games/pokemon-omega-ruby/screenshots/1.png b/games/pokemon-omega-ruby/screenshots/1.png
new file mode 100644
index 0000000..618ab7b
Binary files /dev/null and b/games/pokemon-omega-ruby/screenshots/1.png differ
diff --git a/games/pokemon-omega-ruby/screenshots/2.png b/games/pokemon-omega-ruby/screenshots/2.png
new file mode 100644
index 0000000..f174077
Binary files /dev/null and b/games/pokemon-omega-ruby/screenshots/2.png differ
diff --git a/games/pokemon-omega-ruby/screenshots/3.png b/games/pokemon-omega-ruby/screenshots/3.png
new file mode 100644
index 0000000..7f5f927
Binary files /dev/null and b/games/pokemon-omega-ruby/screenshots/3.png differ
diff --git a/games/pokemon-sun-moon/game.dat b/games/pokemon-sun-moon/game.dat
deleted file mode 100644
index 8ec0f2b..0000000
--- a/games/pokemon-sun-moon/game.dat
+++ /dev/null
@@ -1,25 +0,0 @@
-title = "Pokémon Sun and Moon"
-description = "Pokémon Sun and Pokémon Moon are role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS. They are the first installments in the seventh generation of Pokémon games."
-github_issues = [2190, 3703]
-needs_system_files = false
-needs_shared_font = false
-
-[[ releases ]]
-title = "0004000000164800"
-region = "all"
-release_date = "2016-11-18"
-
-[[ releases ]]
-title = "0004000000175E00"
-region = "all"
-release_date = "2016-11-18"
-
-[[ testcases ]]
-title = "0004000000164800"
-compatibility = "1"
-date = "2017-05-31"
-version = "HEAD-4857eb4"
-author = "Flamboyant_Ham"
-cpu = "Intel Core i7-4720HQ"
-gpu = "GeForce GTX 960M"
-os = "Windows 10 14393"
diff --git a/games/pokemon-sun-moon/boxart.png b/games/pokemon-sun/boxart.png
similarity index 100%
rename from games/pokemon-sun-moon/boxart.png
rename to games/pokemon-sun/boxart.png
diff --git a/games/pokemon-sun/game.dat b/games/pokemon-sun/game.dat
new file mode 100644
index 0000000..6301fe0
--- /dev/null
+++ b/games/pokemon-sun/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon Sun"
+description = "Pokémon Sun is a role-playing video game developed by Game Freak and published by Nintendo for the Nintendo 3DS. It is the first installment in the seventh generation of Pokémon games."
+github_issues = [2190, 3703]
+needs_system_files = false
+needs_shared_font = false
+wiki_override = "pokemon-sun-moon"
+
+[[ releases ]]
+title = "0004000000164800"
+region = "all"
+release_date = "2016-11-18"
diff --git a/games/pokemon-sun-moon/icon.png b/games/pokemon-sun/icon.png
similarity index 100%
rename from games/pokemon-sun-moon/icon.png
rename to games/pokemon-sun/icon.png
diff --git a/games/pokemon-sun/screenshots/1.png b/games/pokemon-sun/screenshots/1.png
new file mode 100644
index 0000000..51ec169
Binary files /dev/null and b/games/pokemon-sun/screenshots/1.png differ
diff --git a/games/pokemon-sun/screenshots/2.png b/games/pokemon-sun/screenshots/2.png
new file mode 100644
index 0000000..c019d72
Binary files /dev/null and b/games/pokemon-sun/screenshots/2.png differ
diff --git a/games/pokemon-sun/screenshots/3.png b/games/pokemon-sun/screenshots/3.png
new file mode 100644
index 0000000..5ef94a1
Binary files /dev/null and b/games/pokemon-sun/screenshots/3.png differ
diff --git a/games/pokemon-ultra-sun-ultra-moon/boxart.png b/games/pokemon-ultra-moon/boxart.png
similarity index 100%
rename from games/pokemon-ultra-sun-ultra-moon/boxart.png
rename to games/pokemon-ultra-moon/boxart.png
diff --git a/games/pokemon-ultra-moon/game.dat b/games/pokemon-ultra-moon/game.dat
new file mode 100644
index 0000000..96dc057
--- /dev/null
+++ b/games/pokemon-ultra-moon/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon Ultra Moon"
+description = "Pokémon Ultra Moon is a role-playing video game developed by Game Freak, published by The Pokémon Company, and distributed by Nintendo for the Nintendo 3DS. Announced in June 2017, the title is an enhanced version of Pokémon Moon with a modified storyline, similar to previous enhanced versions like Platinum, Emerald and Yellow. The game is the second installment in the seventh generation of the main series and the last planned installment of the main series Pokémon games for Nintendo 3DS."
+github_issues = [2190, 3128, 3133, 3703]
+needs_system_files = true
+needs_shared_font = false
+wiki_override = "pokemon-ultra-sun-ultra-moon"
+
+[[ releases ]]
+title = "00040000001B5100"
+region = "all"
+release_date = "2017-11-17"
diff --git a/games/pokemon-ultra-sun-ultra-moon/icon.png b/games/pokemon-ultra-moon/icon.png
similarity index 100%
rename from games/pokemon-ultra-sun-ultra-moon/icon.png
rename to games/pokemon-ultra-moon/icon.png
diff --git a/games/pokemon-ultra-sun-ultra-moon/screenshots/1.png b/games/pokemon-ultra-moon/screenshots/1.png
similarity index 100%
rename from games/pokemon-ultra-sun-ultra-moon/screenshots/1.png
rename to games/pokemon-ultra-moon/screenshots/1.png
diff --git a/games/pokemon-ultra-sun-ultra-moon/screenshots/2.png b/games/pokemon-ultra-moon/screenshots/2.png
similarity index 100%
rename from games/pokemon-ultra-sun-ultra-moon/screenshots/2.png
rename to games/pokemon-ultra-moon/screenshots/2.png
diff --git a/games/pokemon-ultra-sun-ultra-moon/screenshots/3.png b/games/pokemon-ultra-moon/screenshots/3.png
similarity index 100%
rename from games/pokemon-ultra-sun-ultra-moon/screenshots/3.png
rename to games/pokemon-ultra-moon/screenshots/3.png
diff --git a/games/pokemon-ultra-sun-ultra-moon/game.dat b/games/pokemon-ultra-sun-ultra-moon/game.dat
deleted file mode 100644
index 950c5ff..0000000
--- a/games/pokemon-ultra-sun-ultra-moon/game.dat
+++ /dev/null
@@ -1,25 +0,0 @@
-title = "Pokémon Ultra Sun and Ultra Moon"
-description = "Pokémon Ultra Sun and Pokémon Ultra Moon are role-playing video games developed by Game Freak, published by The Pokémon Company, and distributed by Nintendo for the Nintendo 3DS. Announced in June 2017, the titles are enhanced versions of Pokémon Sun and Moon with a modified storyline, similar to previous enhanced versions like Platinum, Emerald and Yellow. The games are the second installments in the seventh generation of the main series and the last planned installment of the main series Pokémon games for Nintendo 3DS."
-github_issues = [2190, 3128, 3133, 3703]
-needs_system_files = true
-needs_shared_font = false
-
-[[ releases ]]
-title = "00040000001B5000"
-region = "all"
-release_date = "2017-11-17"
-
-[[ releases ]]
-title = "00040000001B5100"
-region = "all"
-release_date = "2017-11-17"
-
-[[ testcases ]]
-title = "00040000001B5100"
-compatibility = "1"
-date = "2017-11-17"
-version = "HEAD-c810a3f"
-author = "Hexagon12"
-cpu = "Intel Core i3-6100"
-gpu = "Nvidia GeForce GTX 750 Ti"
-os = "Windows 10 16299"
diff --git a/games/pokemon-ultra-sun/boxart.png b/games/pokemon-ultra-sun/boxart.png
new file mode 100644
index 0000000..7a46879
Binary files /dev/null and b/games/pokemon-ultra-sun/boxart.png differ
diff --git a/games/pokemon-ultra-sun/game.dat b/games/pokemon-ultra-sun/game.dat
new file mode 100644
index 0000000..90bee1e
--- /dev/null
+++ b/games/pokemon-ultra-sun/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon Ultra Sun"
+description = "Pokémon Ultra Sun is a role-playing video game developed by Game Freak, published by The Pokémon Company, and distributed by Nintendo for the Nintendo 3DS. Announced in June 2017, the title is an enhanced version of Pokémon Sun with a modified storyline, similar to previous enhanced versions like Platinum, Emerald and Yellow. The game is the second installment in the seventh generation of the main series and the last planned installment of the main series Pokémon games for Nintendo 3DS."
+github_issues = [2190, 3128, 3133, 3703]
+needs_system_files = true
+needs_shared_font = false
+wiki_override = "pokemon-ultra-sun-ultra-moon"
+
+[[ releases ]]
+title = "00040000001B5000"
+region = "all"
+release_date = "2017-11-17"
diff --git a/games/pokemon-ultra-sun/icon.png b/games/pokemon-ultra-sun/icon.png
new file mode 100644
index 0000000..f2d315a
Binary files /dev/null and b/games/pokemon-ultra-sun/icon.png differ
diff --git a/games/pokemon-ultra-sun/screenshots/1.png b/games/pokemon-ultra-sun/screenshots/1.png
new file mode 100644
index 0000000..6e2ec2a
Binary files /dev/null and b/games/pokemon-ultra-sun/screenshots/1.png differ
diff --git a/games/pokemon-ultra-sun/screenshots/2.png b/games/pokemon-ultra-sun/screenshots/2.png
new file mode 100644
index 0000000..2e063ea
Binary files /dev/null and b/games/pokemon-ultra-sun/screenshots/2.png differ
diff --git a/games/pokemon-ultra-sun/screenshots/3.png b/games/pokemon-ultra-sun/screenshots/3.png
new file mode 100644
index 0000000..188314c
Binary files /dev/null and b/games/pokemon-ultra-sun/screenshots/3.png differ
diff --git a/games/pokemon-x-y/game.dat b/games/pokemon-x-y/game.dat
deleted file mode 100644
index e437833..0000000
--- a/games/pokemon-x-y/game.dat
+++ /dev/null
@@ -1,25 +0,0 @@
-title = "Pokémon X and Y"
-description = "Pokémon X and Pokémon Y are role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS. They are the first installments in the sixth generation of the Pokémon series of role-playing games."
-github_issues = [2263, 2551, 2262, 2133, 2084, 3703]
-needs_system_files = true
-needs_shared_font = true
-
-[[ releases ]]
-title = "0004000000055D00"
-region = "all"
-release_date = "2013-10-12"
-
-[[ releases ]]
-title = "0004000000055E00"
-region = "all"
-release_date = "2013-10-12"
-
-[[ testcases ]]
-title = "0004000000055D00"
-compatibility = "3"
-date = "2017-05-31"
-version = "HEAD-4857eb4"
-author = "Flamboyant_Ham"
-cpu = "Intel Core i7-4720HQ"
-gpu = "GeForce GTX 960M"
-os = "Windows 10 14393"
diff --git a/games/pokemon-x/boxart.png b/games/pokemon-x/boxart.png
new file mode 100644
index 0000000..79eea0c
Binary files /dev/null and b/games/pokemon-x/boxart.png differ
diff --git a/games/pokemon-x/game.dat b/games/pokemon-x/game.dat
new file mode 100644
index 0000000..06039bf
--- /dev/null
+++ b/games/pokemon-x/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon X"
+description = "Pokémon X is a role-playing video game developed by Game Freak and published by Nintendo for the Nintendo 3DS. It is the first installment in the sixth generation of the Pokémon series of role-playing games."
+github_issues = [2263, 2551, 2262, 2133, 2084, 3703]
+needs_system_files = true
+needs_shared_font = true
+wiki_override = "pokemon-x-y"
+
+[[ releases ]]
+title = "0004000000055D00"
+region = "all"
+release_date = "2013-10-12"
diff --git a/games/pokemon-x/icon.png b/games/pokemon-x/icon.png
new file mode 100644
index 0000000..e869cf5
Binary files /dev/null and b/games/pokemon-x/icon.png differ
diff --git a/games/pokemon-x-y/screenshots/intro-1.png b/games/pokemon-x/screenshots/intro-1.png
similarity index 100%
rename from games/pokemon-x-y/screenshots/intro-1.png
rename to games/pokemon-x/screenshots/intro-1.png
diff --git a/games/pokemon-x-y/screenshots/intro-2.png b/games/pokemon-x/screenshots/intro-2.png
similarity index 100%
rename from games/pokemon-x-y/screenshots/intro-2.png
rename to games/pokemon-x/screenshots/intro-2.png
diff --git a/games/pokemon-x-y/screenshots/title-screen.png b/games/pokemon-x/screenshots/title-screen.png
similarity index 100%
rename from games/pokemon-x-y/screenshots/title-screen.png
rename to games/pokemon-x/screenshots/title-screen.png
diff --git a/games/pokemon-x-y/boxart.png b/games/pokemon-y/boxart.png
similarity index 100%
rename from games/pokemon-x-y/boxart.png
rename to games/pokemon-y/boxart.png
diff --git a/games/pokemon-y/game.dat b/games/pokemon-y/game.dat
new file mode 100644
index 0000000..639d33c
--- /dev/null
+++ b/games/pokemon-y/game.dat
@@ -0,0 +1,11 @@
+title = "Pokémon Y"
+description = "Pokémon Y is a role-playing video game developed by Game Freak and published by Nintendo for the Nintendo 3DS. It is the first installment in the sixth generation of the Pokémon series of role-playing games."
+github_issues = [2263, 2551, 2262, 2133, 2084, 3703]
+needs_system_files = true
+needs_shared_font = true
+wiki_override = "pokemon-x-y"
+
+[[ releases ]]
+title = "0004000000055E00"
+region = "all"
+release_date = "2013-10-12"
diff --git a/games/pokemon-x-y/icon.png b/games/pokemon-y/icon.png
similarity index 100%
rename from games/pokemon-x-y/icon.png
rename to games/pokemon-y/icon.png
diff --git a/games/pokemon-y/screenshots/intro-1.png b/games/pokemon-y/screenshots/intro-1.png
new file mode 100644
index 0000000..c5820fa
Binary files /dev/null and b/games/pokemon-y/screenshots/intro-1.png differ
diff --git a/games/pokemon-y/screenshots/intro-2.png b/games/pokemon-y/screenshots/intro-2.png
new file mode 100644
index 0000000..cea70f5
Binary files /dev/null and b/games/pokemon-y/screenshots/intro-2.png differ
diff --git a/games/pokemon-y/screenshots/title-screen.png b/games/pokemon-y/screenshots/title-screen.png
new file mode 100644
index 0000000..66aaa96
Binary files /dev/null and b/games/pokemon-y/screenshots/title-screen.png differ